Some autopilot fixes

[flightgear.git] / src / Scenery / tilemgr.cxx

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index efdd83856fa77b63d556961cebc1f48899e4fe0b..5d7821307587f6aeb03019837d4ab1276cf8b669 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -76,8 +76,8 @@ private:
 FGTileMgr::FGTileMgr():
     state( Start ),
     vis( 16000 ),
-    _propListener(new LoaderPropertyWatcher(this)),
-    _terra_sync(NULL)
+    _terra_sync(NULL),
+    _propListener(new LoaderPropertyWatcher(this))
 {
     _randomObjects = fgGetNode("/sim/rendering/random-objects", true);
     _randomVegetation = fgGetNode("/sim/rendering/random-vegetation", true);
@@ -87,9 +87,6 @@ FGTileMgr::FGTileMgr():
 
 FGTileMgr::~FGTileMgr()
 {
-    if (_terra_sync)
-        _terra_sync->setTileCache(NULL);
-
     // remove all nodes we might have left behind
     osg::Group* group = globals->get_scenery()->get_terrain_branch();
     group->removeChildren(0, group->getNumChildren());
@@ -171,6 +168,7 @@ bool FGTileMgr::sched_tile( const SGBucket& b, double priority, bool current_vie
         if ( tile_cache.insert_tile( t ) )
         {
             // Attach to scene graph
+
             t->addToSceneGraph(globals->get_scenery()->get_terrain_branch());
         } else
         {
@@ -211,7 +209,7 @@ void FGTileMgr::schedule_needed(const SGBucket& curr_bucket, double vis)
     // cout << "tile width = " << tile_width << "  tile_height = "
     //      << tile_height << endl;
 
-    double tileRangeM = min(vis,_maxTileRangeM->getDoubleValue());
+    double tileRangeM = std::min(vis,_maxTileRangeM->getDoubleValue());
     xrange = (int)(tileRangeM / tile_width) + 1;
     yrange = (int)(tileRangeM / tile_height) + 1;
     if ( xrange < 1 ) { xrange = 1; }
@@ -252,20 +250,22 @@ void FGTileMgr::schedule_needed(const SGBucket& curr_bucket, double vis)
 osg::Node*
 FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
 {
-    SGPath fullPath;
-    if (fgGetBool("/sim/paths/use-custom-scenery-data") == true) {
+    SGPath fullPath = modelPath;
+    if ((fullPath.isRelative())&&
+        (fgGetBool("/sim/paths/use-custom-scenery-data") == true)) {
         string_list sc = globals->get_fg_scenery();
 
         for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) {
-            SGPath tmpPath(*it);
-            tmpPath.append(modelPath);
-            if (tmpPath.exists()) {
-                fullPath = tmpPath;
-                break;
-            } 
+            // fg_senery contains empty strings as "markers" (see FGGlobals::set_fg_scenery)
+            if (!it->empty()) {
+                SGPath tmpPath(*it);
+                tmpPath.append(modelPath);
+                if (tmpPath.exists()) {
+                    fullPath = tmpPath;
+                    break;
+                }
+            }
         }
-    } else {
-         fullPath.append(modelPath);
     }
     osg::Node* result = 0;
     try {
@@ -275,15 +275,15 @@ FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
                                       new FGNasalModelData);
         else
             result=
-                SGModelLib::loadPagedModel(modelPath, globals->get_props(),
+                SGModelLib::loadPagedModel(fullPath.str(), globals->get_props(),
                                            new FGNasalModelData);
     } catch (const sg_io_exception& exc) {
         string m(exc.getMessage());
         m += " ";
         m += exc.getLocation().asString();
-        SG_LOG( SG_ALL, SG_ALERT, m );
+        SG_LOG( SG_TERRAIN, SG_ALERT, m );
     } catch (const sg_exception& exc) { // XXX may be redundant
-        SG_LOG( SG_ALL, SG_ALERT, exc.getMessage());
+        SG_LOG( SG_TERRAIN, SG_ALERT, exc.getMessage());
     }
     return result;
 }
@@ -332,7 +332,7 @@ void FGTileMgr::update_queues()
             }
         } else
         {
-            SG_LOG(SG_INPUT, SG_ALERT, "Warning: empty tile in cache!");
+            SG_LOG(SG_TERRAIN, SG_ALERT, "Warning: empty tile in cache!");
         }
         tile_cache.next();
         sz++;