X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScenery%2Ftilemgr.cxx;h=912aa2994fa4227a51e3ba2faebb532a32a0b98c;hb=6d1c383814c5f7d4c137cbc5f319060e5dbc9696;hp=3b1f4315e4441bad5e8f6a606d6d932dfdbdec15;hpb=182fd42b4017fa54d680508c092ea1b216398a00;p=flightgear.git diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx index 3b1f4315e..912aa2994 100644 --- a/src/Scenery/tilemgr.cxx +++ b/src/Scenery/tilemgr.cxx @@ -41,6 +41,7 @@ #include #include
+#include
#include #ifndef FG_OLD_WEATHER @@ -57,22 +58,26 @@ extern ssgRoot *scene; extern ssgBranch *terrain; +extern ssgBranch *ground; // the tile manager FGTileMgr global_tile_mgr; -// a temporary hack until we get everything rewritten with sgdVec3 -static inline Point3D operator + (const Point3D& a, const sgdVec3 b) -{ - return Point3D(a.x()+b[0], a.y()+b[1], a.z()+b[2]); -} +#ifdef ENABLE_THREADS +SGLockedQueue FGTileMgr::attach_queue; +SGLockedQueue FGTileMgr::model_queue; +#else +queue FGTileMgr::attach_queue; +queue FGTileMgr::model_queue; +#endif // ENABLE_THREADS // Constructor FGTileMgr::FGTileMgr(): state( Start ), - vis( 16000 ) + vis( 16000 ), + counter_hack(0) { } @@ -86,15 +91,30 @@ FGTileMgr::~FGTileMgr() { int FGTileMgr::init() { SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." ); - if ( state != Start ) { - SG_LOG( SG_TERRAIN, SG_INFO, - "... Reinitializing." ); - destroy_queue(); - } else { - SG_LOG( SG_TERRAIN, SG_INFO, - "... First time through." ); - global_tile_cache.init(); + tile_cache.init(); + +#if 0 + + // instead it's just a lot easier to let any pending work flush + // through, rather than trying to arrest the queue and nuke all + // the various work at all the various stages and get everything + // cleaned up properly. + + while ( ! attach_queue.empty() ) { + attach_queue.pop(); + } + + while ( ! model_queue.empty() ) { +#ifdef ENABLE_THREADS + FGDeferredModel* dm = model_queue.pop(); +#else + FGDeferredModel* dm = model_queue.front(); + model_queue.pop(); +#endif + delete dm; } + loader.reinit(); +#endif hit_list.clear(); @@ -113,94 +133,22 @@ int FGTileMgr::init() { // schedule a tile for loading void FGTileMgr::sched_tile( const SGBucket& b ) { // see if tile already exists in the cache - FGTileEntry *t = global_tile_cache.get_tile( b ); - - if ( t == NULL ) { - // register a load request - load_queue.push_back( b ); - } -} - - -// load a tile -void FGTileMgr::load_tile( const SGBucket& b ) { - // see if tile already exists in the cache - FGTileEntry *t = global_tile_cache.get_tile( b ); + FGTileEntry *t = tile_cache.get_tile( b ); if ( t == NULL ) { - SG_LOG( SG_TERRAIN, SG_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 { - SG_LOG( SG_TERRAIN, SG_DEBUG, "Tile already in cache " << b ); - } -} - - -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] ); -} - + // create a new entry + FGTileEntry *e = new FGTileEntry( b ); -// Determine scenery altitude via ssg. Normally this just happens -// when we render the scene, but we'd also like to be able to do this -// 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 ); - - sgdVec3 orig, dir; - sgdCopyVec3(orig, view_pos ); - sgdCopyVec3(dir, abs_view_pos ); - - hit_list.Intersect( terrain, orig, dir ); - - int this_hit=0; - Point3D geoc; - double result = -9999; - - int hitcount = hit_list.num_hits(); - for ( int i = 0; i < hitcount; ++i ) { - geoc = sgCartToPolar3d( scenery.center + hit_list.get_point(i) ); - double lat_geod, alt, sea_level_r; - sgGeocToGeod(geoc.lat(), geoc.radius(), &lat_geod, - &alt, &sea_level_r); - if ( alt > result && alt < 10000 ) { - result = alt; - this_hit = i; + // insert the tile into the cache + if ( tile_cache.insert_tile( e ) ) { + // Schedule tile for loading + loader.add( e ); + } else { + // insert failed (cache full with no available entries to + // delete.) Try again later + delete e; } } - - if ( result > -9000 ) { - *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(); - CurrentNormalInLocalPlane(tmp, tmp); - sgdSetVec3( scenery.cur_normal, tmp ); - // cout << "NED: " << tmp[0] << " " << tmp[1] << " " << tmp[2] << endl; - return true; - } else { - SG_LOG( SG_TERRAIN, SG_INFO, "no terrain intersection" ); - *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; - } } @@ -215,20 +163,20 @@ void FGTileMgr::schedule_needed() { #else vis = current_weather.get_visibility(); #endif - cout << "visibility = " << vis << endl; + // 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; + // 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; + // cout << "xrange = " << xrange << " yrange = " << yrange << endl; - global_tile_cache.set_max_cache_size( (2*xrange + 2) * (2*yrange + 2) ); + tile_cache.set_max_cache_size( (2*xrange + 2) * (2*yrange + 2) ); SGBucket b; @@ -243,9 +191,7 @@ void FGTileMgr::schedule_needed() { for ( 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 ); - } + sched_tile( b ); } } } @@ -255,9 +201,7 @@ void FGTileMgr::schedule_needed() { for ( 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 ); - } + sched_tile( b ); } } } @@ -270,12 +214,10 @@ void FGTileMgr::initialize_queue() // system and load all relavant tiles SG_LOG( SG_TERRAIN, SG_INFO, "Updating Tile list for " << current_bucket ); - cout << "tile cache size = " << global_tile_cache.get_size() << endl; - - int i; + // cout << "tile cache size = " << tile_cache.get_size() << endl; // wipe/initialize tile cache - // global_tile_cache.init(); + // tile_cache.init(); previous_bucket.make_bad(); // build the local area list and schedule tiles for loading @@ -285,8 +227,11 @@ void FGTileMgr::initialize_queue() schedule_needed(); + // do we really want to lose this? CLO +#if 0 // Now force a load of the center tile and inner ring so we // have something to see in our first frame. + int i; for ( i = 0; i < 9; ++i ) { if ( load_queue.size() ) { SG_LOG( SG_TERRAIN, SG_DEBUG, @@ -297,15 +242,7 @@ void FGTileMgr::initialize_queue() load_tile( pending ); } } -} - - -// forced emptying of the queue -// This is necessay to keep bookeeping straight for the -// tile_cache -- which actually handles all the -// (de)allocations -void FGTileMgr::destroy_queue() { - load_queue.clear(); +#endif } @@ -328,8 +265,8 @@ int FGTileMgr::update( double lon, double lat ) { current_bucket.set_bucket( longitude, latitude ); // SG_LOG( SG_TERRAIN, SG_DEBUG, "Updating Tile list for " << current_bucket ); - if ( global_tile_cache.exists( current_bucket ) ) { - current_tile = global_tile_cache.get_tile( current_bucket ); + if ( tile_cache.exists( current_bucket ) ) { + current_tile = tile_cache.get_tile( current_bucket ); scenery.next_center = current_tile->center; } else { SG_LOG( SG_TERRAIN, SG_WARN, "Tile not found (Ok if initializing)" ); @@ -346,20 +283,64 @@ int FGTileMgr::update( double lon, double lat ) { state = Running; } - if ( load_queue.size() ) { - SG_LOG( SG_TERRAIN, SG_INFO, "Load queue size = " << load_queue.size() - << " loading a tile" ); + // load the next tile in the load queue (or authorize the next + // load in the case of the threaded tile pager) + loader.update(); + + // load the next model in the load queue. Currently this must + // happen in the render thread because model loading can trigger + // texture loading which involves use of the opengl api. + if ( !model_queue.empty() ) { + cout << "loading next model ..." << endl; + // load the next tile in the queue +#ifdef ENABLE_THREADS + FGDeferredModel* dm = model_queue.pop(); +#else + FGDeferredModel* dm = model_queue.front(); + model_queue.pop(); +#endif + + ssgTexturePath( (char *)(dm->get_texture_path().c_str()) ); + ssgEntity *obj_model + = ssgLoad( (char *)(dm->get_model_path().c_str()) ); + if ( obj_model != NULL ) { + dm->get_obj_trans()->addKid( obj_model ); + } + dm->get_tile()->dec_pending_models(); + + delete dm; + } + + // cout << "current elevation (ssg) == " << scenery.cur_elev << endl; + + previous_bucket = current_bucket; + last_longitude = longitude; + last_latitude = latitude; + + // activate loader thread one out of every 5 frames + if ( counter_hack == 0 ) { + // Notify the tile loader that it can load another tile + // loader.update(); - SGBucket pending = load_queue.front(); - load_queue.pop_front(); - load_tile( pending ); + if ( !attach_queue.empty() ) { +#ifdef ENABLE_THREADS + FGTileEntry* e = attach_queue.pop(); +#else + FGTileEntry* e = attach_queue.front(); + attach_queue.pop(); +#endif + e->add_ssg_nodes( terrain, ground ); + // cout << "Adding ssg nodes for " + } } + counter_hack = (counter_hack + 1) % 5; + sgdVec3 sc; + sgdSetVec3( sc, scenery.center[0], scenery.center[1], scenery.center[2] ); if ( scenery.center == Point3D(0.0) ) { // initializing - cout << "initializing scenery current elevation ... " << endl; + cout << "initializing scenery current elevation ... " << endl; sgdVec3 tmp_abs_view_pos; - sgVec3 tmp_view_pos; Point3D geod_pos = Point3D( longitude * SGD_DEGREES_TO_RADIANS, latitude * SGD_DEGREES_TO_RADIANS, @@ -370,9 +351,11 @@ 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 ); + double tmp_elev; - if ( current_elev_ssg(tmp_abs_view_pos, &tmp_elev) ) { + if ( fgCurrentElev(tmp_abs_view_pos, sc, &hit_list, + &tmp_elev, &scenery.cur_radius, scenery.cur_normal) ) + { scenery.cur_elev = tmp_elev; } else { scenery.cur_elev = 0.0; @@ -382,8 +365,9 @@ int FGTileMgr::update( double lon, double lat ) { // cout << "abs view pos = " << current_view.abs_view_pos // << " view pos = " << current_view.view_pos << endl; double tmp_elev; - if ( current_elev_ssg(globals->get_current_view()->get_abs_view_pos(), - &tmp_elev) ) + if ( fgCurrentElev(globals->get_current_view()->get_abs_view_pos(), + sc, &hit_list, + &tmp_elev, &scenery.cur_radius, scenery.cur_normal) ) { scenery.cur_elev = tmp_elev; } else { @@ -391,12 +375,6 @@ int FGTileMgr::update( double lon, double lat ) { } } - // cout << "current elevation (ssg) == " << scenery.cur_elev << endl; - - previous_bucket = current_bucket; - last_longitude = longitude; - last_latitude = latitude; - return 1; } @@ -419,15 +397,15 @@ void FGTileMgr::prep_ssg_nodes() { // selector and transform FGTileEntry *e; - global_tile_cache.reset_traversal(); + tile_cache.reset_traversal(); - while ( ! global_tile_cache.at_end() ) { + while ( ! tile_cache.at_end() ) { // cout << "processing a tile" << endl; - if ( (e = global_tile_cache.get_current()) ) { + if ( (e = tile_cache.get_current()) ) { e->prep_ssg_node( scenery.center, vis); } else { cout << "warning ... empty tile in cache" << endl; } - global_tile_cache.next(); + tile_cache.next(); } }