Merge branches 'ehofman/config' and 'ehofman/dlerror'

[simgear.git] / simgear / scene / tgdb / TileEntry.cxx

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 772c6704d6da85f90f5fd0896716be9f1b05ae2d..927829621b46bffa113df80c60169d8c48c32f16 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -23,20 +23,15 @@
 #endif
 
 #include <simgear/compiler.h>
-#include <plib/ul.h>
 
 #include <string>
 #include <sstream>
 #include <istream>
 
-#include <osg/Array>
-#include <osg/Geometry>
-#include <osg/Geode>
 #include <osg/LOD>
 #include <osg/MatrixTransform>
 #include <osg/Math>
 #include <osg/NodeCallback>
-#include <osg/Switch>
 
 #include <osgDB/FileNameUtils>
 #include <osgDB/ReaderWriter>
@@ -55,7 +50,6 @@
 #include <simgear/scene/tgdb/apt_signs.hxx>
 #include <simgear/scene/tgdb/obj.hxx>
 #include <simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx>
-#include <simgear/scene/model/placementtrans.hxx>
 
 #include "ReaderWriterSTG.hxx"
 #include "TileEntry.hxx"
@@ -120,9 +114,9 @@ void TileEntry::set_timestamp(double time_ms)
 // Constructor
 TileEntry::TileEntry ( const SGBucket& b )
     : tile_bucket( b ),
+      tileFileName(b.gen_index_str()),
       _node( new osg::LOD ),
-      is_inner_ring(false),
-      tileFileName(b.gen_index_str())
+      is_inner_ring(false)
 {
     _node->setCullCallback(new TileCullCallback);
     tileFileName += ".stg";
@@ -151,19 +145,6 @@ static void WorldCoordinate(osg::Matrix& obj_pos, double lat,
 }
 
 
-// Clean up the memory used by this tile and delete the arrays used by
-// ssg as well as the whole ssg branch
-bool TileEntry::free_tile() {
-    SG_LOG( SG_TERRAIN, SG_DEBUG,
-            "FREEING TILE = (" << tile_bucket << ")" );
-
-    _node->removeChildren(0, _node->getNumChildren());
-    _node = 0;
-
-    return true;
-}
-
-
 // Update the ssg transform node for this tile so it can be
 // properly drawn relative to our (0,0,0) point
 void TileEntry::prep_ssg_node(float vis) {
@@ -207,9 +188,9 @@ struct Object {
         in >> ::skipeol;
 
         if (type == OBJECT)
-            SG_LOG(SG_TERRAIN, SG_INFO, "    " << token << "  " << name);
+            SG_LOG(SG_TERRAIN, SG_BULK, "    " << token << "  " << name);
         else
-            SG_LOG(SG_TERRAIN, SG_INFO, "    " << token << "  " << name << "  lon=" <<
+            SG_LOG(SG_TERRAIN, SG_BULK, "    " << token << "  " << name << "  lon=" <<
                     lon << "  lat=" << lat << "  elev=" << elev << "  hdg=" << hdg);
     }
     object_type type;
@@ -271,7 +252,7 @@ TileEntry::loadTileByFileName(const string& fileName,
         SGPath basename = tile_path;
         basename.append( index_str );
 
-        SG_LOG( SG_TERRAIN, SG_INFO, "  Trying " << basename.str() );
+        SG_LOG( SG_TERRAIN, SG_DEBUG, "  Trying " << basename.str() );
 
 
         // Check for master .stg (scene terra gear) file
@@ -294,7 +275,7 @@ TileEntry::loadTileByFileName(const string& fileName,
             if ( token == "OBJECT_BASE" ) {
                 string name;
                 in >> name >> ::skipws;
-                SG_LOG( SG_TERRAIN, SG_INFO, "    " << token << " " << name );
+                SG_LOG( SG_TERRAIN, SG_BULK, "    " << token << " " << name );
 
                 if (!found_tile_base) {
                     found_tile_base = true;
@@ -304,7 +285,7 @@ TileEntry::loadTileByFileName(const string& fileName,
                     object_base.append(name);
 
                 } else
-                    SG_LOG(SG_TERRAIN, SG_INFO, "    (skipped)");
+                    SG_LOG(SG_TERRAIN, SG_BULK, "    (skipped)");
 
                             // Load only if base is not in another file
             } else if ( token == "OBJECT" ) {
@@ -313,7 +294,7 @@ TileEntry::loadTileByFileName(const string& fileName,
                 else {
                     string name;
                     in >> name >> ::skipeol;
-                    SG_LOG(SG_TERRAIN, SG_INFO, "    " << token << "  "
+                    SG_LOG(SG_TERRAIN, SG_BULK, "    " << token << "  "
                             << name << "  (skipped)");
                 }
 
@@ -390,6 +371,7 @@ TileEntry::loadTileByFileName(const string& fileName,
             WorldCoordinate( obj_pos, obj->lat, obj->lon, obj->elev, obj->hdg );
 
             osg::MatrixTransform *obj_trans = new osg::MatrixTransform;
+            obj_trans->setDataVariance(osg::Object::STATIC);
             obj_trans->setMatrix( obj_pos );
 
             // wire as much of the scene graph together as we can
@@ -410,6 +392,7 @@ TileEntry::loadTileByFileName(const string& fileName,
             WorldCoordinate( obj_pos, obj->lat, obj->lon, obj->elev, obj->hdg );
 
             osg::MatrixTransform *obj_trans = new osg::MatrixTransform;
+            obj_trans->setDataVariance(osg::Object::STATIC);
             obj_trans->setMatrix( obj_pos );
 
             osg::Node *custom_obj = 0;