Changeset 273

Timestamp:

Mar 19, 2011, 5:39:16 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/util/visual_util.h (modified) (1 diff)
• src/core/visual_core.cpp (modified) (3 diffs)

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -15 +15 @@
   
   <scenery>
-    <terrain filename="D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive" filename2="J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive"></terrain>
-    <animationpath filename="salzburg.path"></animationpath>
+    <terrain filename="D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive" filename2="J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive.terrainmod"></terrain>
+    <animationpath filename="airport_muc.path"></animationpath>
     <models>
       <model objectname="TestObject" trackingid="1" label="TestText!" dynamic="no">

osgVisual/trunk/include/util/visual_util.h

@@ -296 +296 @@
         static bool strToBool(std::string s);
 
+        template<class T>
+        class FindTopMostNodeOfTypeVisitor : public osg::NodeVisitor
+        {
+        public:
+                FindTopMostNodeOfTypeVisitor():
+                        osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
+                        _foundNode(0)
+                {}
+
+                void apply(osg::Node& node)
+                {
+                        T* result = dynamic_cast<T*>(&node);
+                        if (result)
+                        {
+                                _foundNode = result;
+                        }
+                        else
+                        {
+                                traverse(node);
+                        }
+                }
+
+                T* _foundNode;
+        };
+
+        template<class T>
+        static T* findTopMostNodeOfType(osg::Node* node)
+        {
+                if (!node) return 0;
+
+                FindTopMostNodeOfTypeVisitor<T> fnotv;
+                node->accept(fnotv);
+
+                return fnotv._foundNode;
+        }
+
 private: 
         /**

osgVisual/trunk/src/core/visual_core.cpp

@@ -17 +17 @@
 
 #include <visual_core.h>
+#include <visual_util.h>
+#include <osgTerrain/Terrain>
 
 using namespace osgVisual;
@@ -172 +174 @@
         if( model.valid() )
         {
-        rootNode->addChild( model.get() );
+        osgTerrain::Terrain* terrain = util::findTopMostNodeOfType<osgTerrain::Terrain>(model.get());
+                if (!terrain)
+                {
+                        terrain = new osgTerrain::Terrain;
+                        terrain->addChild(model.get());
+
+                        model = terrain;                        
+                }
+                rootNode->addChild( terrain );
                 return true;
         }
@@ -353 +363 @@
         }
 
+        osgTerrain::Terrain* terrain = util::findTopMostNodeOfType<osgTerrain::Terrain>(rootNode);
+    if (!terrain)
+    {
+        OSG_ALWAYS << "No TerrainNode found!" << std::endl;
+    }
+        else
+        {
+                OSG_ALWAYS << "BorderEqual activated" << std::endl;
+                terrain->setEqualizeBoundaries(true);
+        }
 
         //testObj = new visual_object( rootNode, "testStab", objectMountedCameraManip );