Changeset 11992 for OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp

Timestamp:

12/09/10 13:16:11 (3 years ago)

Author:

robert

Message:

Added handling of CoordinateSystemNode? when they decorate a loaded model, copying the contents of the CoordinateSystemNode? across to the Terrain node

Files:

• OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp

@@ -191 +191 @@
 
     // load the nodes from the commandline arguments.
-    osg::Node* rootnode = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> rootnode = osgDB::readNodeFiles(arguments);
 
     if (!rootnode)
@@ -199 +199 @@
     }
 
-    osgTerrain::Terrain* terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode);
+    osg::ref_ptr<osgTerrain::Terrain> terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode);
     if (!terrain)
     {
+        // no Terrain node present insert one above the loaded model.
         terrain = new osgTerrain::Terrain;
-        terrain->addChild(rootnode);
-
-        rootnode = terrain;
+
+        // if CoordinateSystemNode is present copy it's contents into the Terrain, and discard it.
+        osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(rootnode);;
+        if (csn)
+        {
+            terrain->set(*csn);
+            for(unsigned int i=0; i<csn->getNumChildren();++i)
+            {
+                terrain->addChild(csn->getChild(i));
+            }
+        }
+        else
+        {
+            terrain->addChild(rootnode.get());
+        }
+
+        rootnode = terrain.get();
     }
 
@@ -216 +231 @@
 
     // add a viewport to the viewer and attach the scene graph.
-    viewer.setSceneData( rootnode );
+    viewer.setSceneData( rootnode.get() );