Changeset 285 for experimental

Timestamp:

May 26, 2011, 8:51:45 AM (14 years ago)

Author:

Torben Dannhauer

Message:

KdTree? Issue fixed

Location:

experimental/TerrainTest

Files:

• ModificationManager/ModificationManager.vcproj (modified) (3 diffs)
• ReaderWriterTerrainMod.cpp (modified) (2 diffs)

experimental/TerrainTest/ModificationManager/ModificationManager.vcproj

@@ -59 +59 @@
                         <Tool
                                 Name="VCPreLinkEventTool"
+                                Description=""
+                                CommandLine=""
                         />
                         <Tool
@@ -92 +94 @@
                         <Tool
                                 Name="VCPostBuildEventTool"
+                                Description="Move Library to OSG_ROOT\lib"
+                                CommandLine="move $(OSG_ROOT)\bin\$(ProjectName)d.lib $(OSG_ROOT)\lib"
                         />
                 </Configuration>
@@ -137 +141 @@
                         <Tool
                                 Name="VCPreLinkEventTool"
+                                Description="Move Library to OSG_ROOT\lib"
+                                CommandLine="move $(OSG_ROOT)\bin\$(ProjectName).lib $(OSG_ROOT)\lib"
                         />
                         <Tool

experimental/TerrainTest/ReaderWriterTerrainMod.cpp

@@ -28 +28 @@
                 options->getBuildKdTreesHint() == Options::BUILD_KDTREES :
                                 osgDB::Registry::instance()->getBuildKdTreesHint() == Options::BUILD_KDTREES;
-        // TODO: Modify passed option or create option with Options::DO_NOT_BUILD_KDTREES
-        if(!options)
-                options = new osgDB::ReaderWriter::Options();
-        options->setBuildKdTreesHint(Options::DO_NOT_BUILD_KDTREES);
-         
-
+        // Save original KdTree Hint
+        Options::BuildKdTreesHint originalHint = Options::NO_PREFERENCE;
+        if(options)
+        {
+                originalHint = options->getBuildKdTreesHint();
+                const_cast<osgDB::ReaderWriter::Options*>(options)->setBuildKdTreesHint(Options::DO_NOT_BUILD_KDTREES);
+        }
 
         // Load real file
@@ -51 +52 @@
         node->accept( modVisitor );
 
-        // Finally create KdTree
+        // Finally create KdTree and restore options
         if(doKdTreeBuilder)
         {
-                OSG_WARN << "Building KdTree" << std::endl;
                 osg::ref_ptr<osg::KdTreeBuilder> builder = osgDB::Registry::instance()->getKdTreeBuilder();
                 node->accept(*builder);
         }
-        else OSG_WARN << "No KdTree" << std::endl;
-
+        // Restore original KdTree Hint
+        if(options) const_cast<osgDB::ReaderWriter::Options*>(options)->setBuildKdTreesHint(originalHint);
 
         return node;