X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScenery%2Ftilemgr.cxx;h=12dbb3abd511a09d783d139673061e478530b57b;hb=c3e3e9f5d75de124e9c108da88d3d3d382a34570;hp=094d903d4596972998051ea6e20aa06e92cc0c0a;hpb=470ee55fb7b3a913a14cb4e23ae526e624091822;p=flightgear.git diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx index 094d903d4..12dbb3abd 100644 --- a/src/Scenery/tilemgr.cxx +++ b/src/Scenery/tilemgr.cxx @@ -30,7 +30,8 @@ #endif #include -#include + +#include #include #include @@ -39,7 +40,6 @@ #include #include -// #include #include
#include @@ -49,8 +49,8 @@ # include #endif +#include "newcache.hxx" #include "scenery.hxx" -#include "tilecache.hxx" #include "tilemgr.hxx" #define TEST_LAST_HIT_CACHE @@ -70,19 +70,20 @@ static inline Point3D operator + (const Point3D& a, const sgdVec3 b) // Constructor -FGTileMgr::FGTileMgr ( void ): - state( Start ) +FGTileMgr::FGTileMgr(): + state( Start ), + vis( 16000 ) { } // Destructor -FGTileMgr::~FGTileMgr ( void ) { +FGTileMgr::~FGTileMgr() { } // Initialize the Tile Manager subsystem -int FGTileMgr::init( void ) { +int FGTileMgr::init() { FG_LOG( FG_TERRAIN, FG_INFO, "Initializing Tile Manager subsystem." ); if ( state != Start ) { @@ -92,22 +93,16 @@ int FGTileMgr::init( void ) { } else { FG_LOG( FG_TERRAIN, FG_INFO, "... First time through." ); + global_tile_cache.init(); } - global_tile_cache.init(); hit_list.clear(); state = Inited; - tile_diameter = globals->get_options()->get_tile_diameter(); - FG_LOG( FG_TERRAIN, FG_INFO, "Tile Diameter = " << tile_diameter); - previous_bucket.make_bad(); current_bucket.make_bad(); - scroll_direction = SCROLL_INIT; - tile_index = -9999; - longitude = latitude = -1000.0; last_longitude = last_latitude = -1000.0; @@ -116,40 +111,40 @@ int FGTileMgr::init( void ) { // schedule a tile for loading -int FGTileMgr::sched_tile( const FGBucket& b ) { +void FGTileMgr::sched_tile( const SGBucket& b ) { // see if tile already exists in the cache - int cache_index = global_tile_cache.exists( b ); - - if ( cache_index >= 0 ) { - // tile exists in cache, reenable it. - // cout << "REENABLING DISABLED TILE" << endl; - FGTileEntry *t = global_tile_cache.get_tile( cache_index ); - t->select_ptr->select( 1 ); - t->mark_loaded(); - } else { - // find the next available cache entry and mark it as - // scheduled - cache_index = global_tile_cache.next_avail(); - FGTileEntry *t = global_tile_cache.get_tile( cache_index ); - t->mark_scheduled_for_use(); + FGTileEntry *t = global_tile_cache.get_tile( b ); + if ( t == NULL ) { // register a load request - FGLoadRec request; - request.b = b; - request.cache_index = cache_index; - load_queue.push_back( request ); + load_queue.push_back( b ); } - - return cache_index; } // load a tile -void FGTileMgr::load_tile( const FGBucket& b, int cache_index) { +void FGTileMgr::load_tile( const SGBucket& b ) { + // see if tile already exists in the cache + FGTileEntry *t = global_tile_cache.get_tile( b ); + + if ( t == NULL ) { + FG_LOG( FG_TERRAIN, FG_DEBUG, "Loading tile " << b ); + global_tile_cache.fill_in( b ); + t = global_tile_cache.get_tile( b ); + t->prep_ssg_node( scenery.center, vis); + } else { + FG_LOG( FG_TERRAIN, FG_DEBUG, "Tile already in cache " << b ); + } +} - FG_LOG( FG_TERRAIN, FG_DEBUG, "Loading tile " << b ); - global_tile_cache.fill_in(cache_index, b); - FG_LOG( FG_TERRAIN, FG_DEBUG, "Loaded for cache index: " << cache_index ); + +static void CurrentNormalInLocalPlane(sgVec3 dst, sgVec3 src) { + sgVec3 tmp; + sgSetVec3(tmp, src[0], src[1], src[2] ); + sgMat4 TMP; + sgTransposeNegateMat4 ( TMP, globals->get_current_view()->get_UP() ) ; + sgXformVec3(tmp, tmp, TMP); + sgSetVec3(dst, tmp[2], tmp[1], tmp[0] ); } @@ -158,14 +153,14 @@ void FGTileMgr::load_tile( const FGBucket& b, int cache_index) { // explicitely. lat & lon are in radians. view_pos in current world // coordinate translated near (0,0,0) (in meters.) Returns result in // meters. +bool FGTileMgr::current_elev_ssg( sgdVec3 abs_view_pos, double *terrain_elev ) { + sgdVec3 view_pos; + sgdVec3 sc; + sgdSetVec3( sc, scenery.center.x(), scenery.center.y(), scenery.center.z()); + sgdSubVec3( view_pos, abs_view_pos, sc ); -bool -FGTileMgr::current_elev_ssg( sgdVec3 abs_view_pos, - sgVec3 view_pos ) -{ sgdVec3 orig, dir; - - sgdSetVec3(orig, view_pos ); + sgdCopyVec3(orig, view_pos ); sgdCopyVec3(dir, abs_view_pos ); hit_list.Intersect( terrain, orig, dir ); @@ -187,109 +182,83 @@ FGTileMgr::current_elev_ssg( sgdVec3 abs_view_pos, } if ( result > -9000 ) { - scenery.cur_elev = result; + *terrain_elev = result; scenery.cur_radius = geoc.radius(); sgVec3 tmp; sgSetVec3(tmp, hit_list.get_normal(this_hit)); + // cout << "cur_normal: " << tmp[0] << " " << tmp[1] << " " + // << tmp[2] << endl; ssgState *IntersectedLeafState = ((ssgLeaf*)hit_list.get_entity(this_hit))->getState(); - globals->get_current_view()->CurrentNormalInLocalPlane(tmp, tmp); + CurrentNormalInLocalPlane(tmp, tmp); sgdSetVec3( scenery.cur_normal, tmp ); // cout << "NED: " << tmp[0] << " " << tmp[1] << " " << tmp[2] << endl; return true; } else { FG_LOG( FG_TERRAIN, FG_INFO, "no terrain intersection" ); - scenery.cur_elev = 0.0; - float *up = globals->get_current_view()->get_local_up(); + *terrain_elev = 0.0; + float *up = globals->get_current_view()->get_world_up(); sgdSetVec3(scenery.cur_normal, up[0], up[1], up[2]); return false; } } -FGBucket FGTileMgr::BucketOffset( int dx, int dy ) -{ - double clat, clon, span; - if( scroll_direction == SCROLL_INIT ) { - // use current latitude and longitude - // walk dy units in the lat direction - clat = current_bucket.get_center_lat() + dy * FG_BUCKET_SPAN; - - // find the lon span for the new latitude - span = bucket_span( clat ); - - // walk dx units in the lon direction - clon = longitude + dx * span; - } else { - // use previous latitude and longitude - // walk dy units in the lat direction - clat = previous_bucket.get_center_lat() + dy * FG_BUCKET_SPAN; - - // find the lon span for the new latitude - span = bucket_span( clat ); - - // walk dx units in the lon direction - clon = last_longitude + dx * span; - } - - while ( clon < -180.0 ) clon += 360.0; - while ( clon >= 180.0 ) clon -= 360.0; - pending.set_bucket( clon, clat ); - - FG_LOG( FG_TERRAIN, FG_DEBUG, " fgBucketOffset " << pending ); - return pending; -} - - -// schedule a tile row(column) for loading -void FGTileMgr::scroll( void ) -{ - FG_LOG( FG_TERRAIN, FG_DEBUG, "schedule_row: Scrolling" ); - - int i, dw, dh; - - switch( scroll_direction ) { - case SCROLL_NORTH: - FG_LOG( FG_TERRAIN, FG_DEBUG, - " (North) Loading " << tile_diameter << " tiles" ); - dw = tile_diameter / 2; - dh = dw + 1; - for ( i = 0; i < tile_diameter; i++ ) { - sched_tile( BucketOffset( i - dw, dh ) ); - } - break; - case SCROLL_EAST: - FG_LOG( FG_TERRAIN, FG_DEBUG, - " (East) Loading " << tile_diameter << " tiles" ); - dh = tile_diameter / 2; - dw = dh + 1; - for ( i = 0; i < tile_diameter; i++ ) { - sched_tile( BucketOffset( dw, i - dh ) ); - } - break; - case SCROLL_SOUTH: - FG_LOG( FG_TERRAIN, FG_DEBUG, - " (South) Loading " << tile_diameter << " tiles" ); - dw = tile_diameter / 2; - dh = -dw - 1; - for ( i = 0; i < tile_diameter; i++ ) { - sched_tile( BucketOffset( i - dw, dh ) ); +// schedule a needed buckets for loading +void FGTileMgr::schedule_needed() { +#ifndef FG_OLD_WEATHER + if ( WeatherDatabase != NULL ) { + vis = WeatherDatabase->getWeatherVisibility(); + } else { + vis = 16000; + } +#else + vis = current_weather.get_visibility(); +#endif + cout << "visibility = " << vis << endl; + + double tile_width = current_bucket.get_width_m(); + double tile_height = current_bucket.get_height_m(); + cout << "tile width = " << tile_width << " tile_height = " << tile_height + << endl; + + xrange = (int)(vis / tile_width) + 1; + yrange = (int)(vis / tile_height) + 1; + if ( xrange < 1 ) { xrange = 1; } + if ( yrange < 1 ) { yrange = 1; } + cout << "xrange = " << xrange << " yrange = " << yrange << endl; + + global_tile_cache.set_max_cache_size( (2*xrange + 2) * (2*yrange + 2) ); + + SGBucket b; + + // schedule center tile first so it can be loaded first + b = sgBucketOffset( longitude, latitude, 0, 0 ); + sched_tile( b ); + + // schedule next ring of 8 tiles + for ( int x = -1; x <= 1; ++x ) { + for ( int y = -1; y <= 1; ++y ) { + if ( x != 0 || y != 0 ) { + b = sgBucketOffset( longitude, latitude, x, y ); + if ( ! global_tile_cache.exists( b ) ) { + sched_tile( b ); + } + } } - break; - case SCROLL_WEST: - FG_LOG( FG_TERRAIN, FG_DEBUG, - " (West) Loading " << tile_diameter << " tiles" ); - dh = tile_diameter / 2; - dw = -dh - 1; - for ( i = 0; i < tile_diameter; i++ ) { - sched_tile( BucketOffset( dw, i - dh ) ); + } + + // schedule remaining tiles + for ( int x = -xrange; x <= xrange; ++x ) { + for ( int y = -yrange; y <= yrange; ++y ) { + if ( x < -1 || x > 1 || y < -1 || y > 1 ) { + SGBucket b = sgBucketOffset( longitude, latitude, x, y ); + if ( ! global_tile_cache.exists( b ) ) { + sched_tile( b ); + } + } } - break; - default: - FG_LOG( FG_TERRAIN, FG_WARN, "UNKNOWN SCROLL DIRECTION in schedule_row" ); - ; } - FG_LOG( FG_TERRAIN, FG_DEBUG, "\tschedule_row returns" ); } @@ -299,15 +268,12 @@ void FGTileMgr::initialize_queue() // system and load all relavant tiles FG_LOG( FG_TERRAIN, FG_INFO, "Updating Tile list for " << current_bucket ); - FG_LOG( FG_TERRAIN, FG_INFO, " Updating Tile list for " << current_bucket ); - FG_LOG( FG_TERRAIN, FG_INFO, " Loading " - << tile_diameter * tile_diameter << " tiles" ); + cout << "tile cache size = " << global_tile_cache.get_size() << endl; int i; - scroll_direction = SCROLL_INIT; // wipe/initialize tile cache - global_tile_cache.init(); + // global_tile_cache.init(); previous_bucket.make_bad(); // build the local area list and schedule tiles for loading @@ -315,29 +281,7 @@ void FGTileMgr::initialize_queue() // start with the center tile and work out in concentric // "rings" - sched_tile( current_bucket ); - - for ( i = 3; i <= tile_diameter; i = i + 2 ) { - int j; - int span = i / 2; - - // bottom row - for ( j = -span; j <= span; ++j ) { - sched_tile( BucketOffset( j, -span ) ); - } - - // top row - for ( j = -span; j <= span; ++j ) { - sched_tile( BucketOffset( j, span ) ); - } - - // middle rows - for ( j = -span + 1; j <= span - 1; ++j ) { - sched_tile( BucketOffset( -span, j ) ); - sched_tile( BucketOffset( span, j ) ); - } - - } + schedule_needed(); // Now force a load of the center tile and inner ring so we // have something to see in our first frame. @@ -346,9 +290,9 @@ void FGTileMgr::initialize_queue() FG_LOG( FG_TERRAIN, FG_DEBUG, "Load queue not empty, loading a tile" ); - FGLoadRec pending = load_queue.front(); + SGBucket pending = load_queue.front(); load_queue.pop_front(); - load_tile( pending.b, pending.cache_index ); + load_tile( pending ); } } } @@ -359,19 +303,7 @@ void FGTileMgr::initialize_queue() // tile_cache -- which actually handles all the // (de)allocations void FGTileMgr::destroy_queue() { - while( load_queue.size() ) { - FG_LOG( FG_TERRAIN, FG_INFO, - "Load queue not empty, popping a tile" ); - FGLoadRec pending = load_queue.front(); - load_queue.pop_front(); - FGTileEntry *t = global_tile_cache.get_tile( pending.cache_index ); - // just t->mark_unused() should be enough - // but a little paranoia doesn't hurt us here - if(t->is_scheduled_for_use()) - t->mark_unused(); - else - load_tile( pending.b, pending.cache_index ); - } + load_queue.clear(); } @@ -379,7 +311,7 @@ void FGTileMgr::destroy_queue() { // chunks. If the chunk isn't already in the cache, then read it from // disk. int FGTileMgr::update( double lon, double lat ) { - // FG_LOG( FG_TERRAIN, FG_DEBUG, "FGTileMgr::update()" ); + FG_LOG( FG_TERRAIN, FG_DEBUG, "FGTileMgr::update()" ); // FGInterface *f = current_aircraft.fdm_state; @@ -394,72 +326,36 @@ int FGTileMgr::update( double lon, double lat ) { current_bucket.set_bucket( longitude, latitude ); // FG_LOG( FG_TERRAIN, FG_DEBUG, "Updating Tile list for " << current_bucket ); - tile_index = global_tile_cache.exists(current_bucket); - // FG_LOG( FG_TERRAIN, FG_DEBUG, "tile index " << tile_index ); - - if ( tile_index >= 0 ) { - current_tile = global_tile_cache.get_tile(tile_index); + if ( global_tile_cache.exists( current_bucket ) ) { + current_tile = global_tile_cache.get_tile( current_bucket ); scenery.next_center = current_tile->center; } else { FG_LOG( FG_TERRAIN, FG_WARN, "Tile not found (Ok if initializing)" ); } if ( state == Running ) { - if( current_bucket == previous_bucket) { - FG_LOG( FG_TERRAIN, FG_DEBUG, "Same bucket as last time" ); - scroll_direction = SCROLL_NONE; - } else { - // We've moved to a new bucket, we need to scroll our - // structures, and load in the new tiles - // CURRENTLY THIS ASSUMES WE CAN ONLY MOVE TO ADJACENT TILES. - // AT ULTRA HIGH SPEEDS THIS ASSUMPTION MAY NOT BE VALID IF - // THE AIRCRAFT CAN SKIP A TILE IN A SINGLE ITERATION. - - if ( (current_bucket.get_lon() > previous_bucket.get_lon()) || - ( (current_bucket.get_lon() == previous_bucket.get_lon()) && - (current_bucket.get_x() > previous_bucket.get_x()) ) ) - { - scroll_direction = SCROLL_EAST; - } - else if ( (current_bucket.get_lon() < previous_bucket.get_lon()) || - ( (current_bucket.get_lon() == previous_bucket.get_lon()) && - (current_bucket.get_x() < previous_bucket.get_x()) ) ) - { - scroll_direction = SCROLL_WEST; - } - - if ( (current_bucket.get_lat() > previous_bucket.get_lat()) || - ( (current_bucket.get_lat() == previous_bucket.get_lat()) && - (current_bucket.get_y() > previous_bucket.get_y()) ) ) - { - scroll_direction = SCROLL_NORTH; - } - else if ( (current_bucket.get_lat() < previous_bucket.get_lat()) || - ( (current_bucket.get_lat() == previous_bucket.get_lat()) && - (current_bucket.get_y() < previous_bucket.get_y()) ) ) - { - scroll_direction = SCROLL_SOUTH; - } - - scroll(); + if ( !(current_bucket == previous_bucket) ) { + // We've moved to a new bucket, we need to schedule any + // needed tiles for loading. + schedule_needed(); } - } else if ( state == Start || state == Inited ) { initialize_queue(); state = Running; } if ( load_queue.size() ) { - FG_LOG( FG_TERRAIN, FG_DEBUG, "Load queue not empty, loading a tile" ); + FG_LOG( FG_TERRAIN, FG_INFO, "Load queue size = " << load_queue.size() + << " loading a tile" ); - FGLoadRec pending = load_queue.front(); + SGBucket pending = load_queue.front(); load_queue.pop_front(); - load_tile( pending.b, pending.cache_index ); + load_tile( pending ); } if ( scenery.center == Point3D(0.0) ) { // initializing - // cout << "initializing ... " << endl; + cout << "initializing scenery current elevation ... " << endl; sgdVec3 tmp_abs_view_pos; sgVec3 tmp_view_pos; @@ -473,12 +369,24 @@ int FGTileMgr::update( double lon, double lat ) { // cout << "abs_view_pos = " << tmp_abs_view_pos << endl; prep_ssg_nodes(); sgSetVec3( tmp_view_pos, 0.0, 0.0, 0.0 ); - current_elev_ssg( tmp_abs_view_pos, tmp_view_pos ); + double tmp_elev; + if ( current_elev_ssg(tmp_abs_view_pos, &tmp_elev) ) { + scenery.cur_elev = tmp_elev; + } else { + scenery.cur_elev = 0.0; + } + cout << "result = " << scenery.cur_elev << endl; } else { // cout << "abs view pos = " << current_view.abs_view_pos // << " view pos = " << current_view.view_pos << endl; - current_elev_ssg( globals->get_current_view()->get_abs_view_pos(), - globals->get_current_view()->get_view_pos() ); + double tmp_elev; + if ( current_elev_ssg(globals->get_current_view()->get_abs_view_pos(), + &tmp_elev) ) + { + scenery.cur_elev = tmp_elev; + } else { + scenery.cur_elev = 0.0; + } } // cout << "current elevation (ssg) == " << scenery.cur_elev << endl; @@ -490,20 +398,12 @@ int FGTileMgr::update( double lon, double lat ) { return 1; } -// Prepare the ssg nodes ... for each tile, set it's proper -// transform and update it's range selector based on current -// visibilty -void FGTileMgr::prep_ssg_node( int idx ) { -} -void FGTileMgr::prep_ssg_nodes( void ) { - FGTileEntry *t; - float ranges[2]; - ranges[0] = 0.0f; - double vis = 0.0; +void FGTileMgr::prep_ssg_nodes() { + float vis = 0.0; #ifndef FG_OLD_WEATHER - if ( WeatherDatabase != NULL ) { + if ( WeatherDatabase ) { vis = WeatherDatabase->getWeatherVisibility(); } else { vis = 16000; @@ -515,25 +415,17 @@ void FGTileMgr::prep_ssg_nodes( void ) { // traverse the potentially viewable tile list and update range // selector and transform - for ( int i = 0; i < (int)global_tile_cache.get_size(); i++ ) { - t = global_tile_cache.get_tile( i ); - - if ( t->is_loaded() ) { - // set range selector (LOD trick) to be distance to center - // of tile + bounding radius - ranges[1] = vis + t->bounding_radius; - t->range_ptr->setRanges( ranges, 2 ); + FGTileEntry *e; + global_tile_cache.reset_traversal(); - // calculate tile offset - t->SetOffset( scenery.center ); - - // calculate ssg transform - sgCoord sgcoord; - sgSetCoord( &sgcoord, - t->offset.x(), t->offset.y(), t->offset.z(), - 0.0, 0.0, 0.0 ); - t->transform_ptr->setTransform( &sgcoord ); + while ( ! global_tile_cache.at_end() ) { + // cout << "processing a tile" << endl; + if ( (e = global_tile_cache.get_current()) ) { + e->prep_ssg_node( scenery.center, vis); + } else { + cout << "warning ... empty tile in cache" << endl; } - } + global_tile_cache.next(); + } }