Changeset 8005 for OpenSceneGraph/trunk/examples/osgmultitexturecontrol/osgmultitexturecontrol.cpp

Timestamp:

03/28/08 16:28:03 (5 years ago)

Author:

robert

Message:

Reordered set up of scene and event handlers to prevent warning

Files:

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

OpenSceneGraph/trunk/examples/osgmultitexturecontrol/osgmultitexturecontrol.cpp

@@ -190 +190 @@
     osgViewer::Viewer viewer(arguments);
 
-    // load the nodes from the commandline arguments.
-    osg::Node* rootnode = osgDB::readNodeFiles(arguments);
-
-    if (!rootnode)
-    {
-        osg::notify(osg::NOTICE)<<"Warning: no valid data loaded, please specify a database on the command line."<<std::endl;
-        return 1;
-    }
-    
-    osgTerrain::Terrain* terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode);
-    if (!terrain)
-    {
-        terrain = new osgTerrain::Terrain;
-        terrain->addChild(rootnode);
-        
-        rootnode = terrain;
-    }    
-    
-    osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(rootnode);
-
-    unsigned int numLayers = 1;
-    osgFX::MultiTextureControl* mtc = findTopMostNodeOfType<osgFX::MultiTextureControl>(rootnode);
-    if (mtc)
-    {
-        numLayers = mtc->getNumTextureWeights();
-    }
-    
-    if (numLayers<2)
-    {
-        osg::notify(osg::NOTICE)<<"Warning: scene must have MultiTextureControl node with at least 2 texture units defined."<<std::endl;
-        return 1;
-    }
-    
-    double maxElevationTransition = 1e6;
-    ElevationLayerBlendingCallback::Elevations elevations;
-    for(unsigned int i=0; i<numLayers; ++i)
-    {
-        elevations.push_back(maxElevationTransition);
-        maxElevationTransition /= 2.0;
-    }
-    
-    ElevationLayerBlendingCallback* elbc = new ElevationLayerBlendingCallback(mtc, elevations);
-
-    // assign to the most appropriate node (the CoordinateSystemNode is best as it provides the elevation on the globe.)
-    if (csn) csn->setCullCallback(elbc);    
-    else if (mtc) mtc->setCullCallback(elbc);
-    else rootnode->setCullCallback(elbc);
 
     // add all the event handlers to the viewer
@@ -262 +215 @@
     }
 
+    // add all the camera manipulators
     {
         osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
@@ -290 +244 @@
     }
 
-    // add a viewport to the viewer and attach the scene graph.
-    viewer.setSceneData( rootnode );
+    // set up the scene graph
+    {
+        // load the nodes from the commandline arguments.
+        osg::Node* rootnode = osgDB::readNodeFiles(arguments);
+
+        if (!rootnode)
+        {
+            osg::notify(osg::NOTICE)<<"Warning: no valid data loaded, please specify a database on the command line."<<std::endl;
+            return 1;
+        }
+
+        osgTerrain::Terrain* terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode);
+        if (!terrain)
+        {
+            terrain = new osgTerrain::Terrain;
+            terrain->addChild(rootnode);
+
+            rootnode = terrain;
+        }    
+
+        osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(rootnode);
+
+        unsigned int numLayers = 1;
+        osgFX::MultiTextureControl* mtc = findTopMostNodeOfType<osgFX::MultiTextureControl>(rootnode);
+        if (mtc)
+        {
+            numLayers = mtc->getNumTextureWeights();
+        }
+
+        if (numLayers<2)
+        {
+            osg::notify(osg::NOTICE)<<"Warning: scene must have MultiTextureControl node with at least 2 texture units defined."<<std::endl;
+            return 1;
+        }
+
+        double maxElevationTransition = 1e6;
+        ElevationLayerBlendingCallback::Elevations elevations;
+        for(unsigned int i=0; i<numLayers; ++i)
+        {
+            elevations.push_back(maxElevationTransition);
+            maxElevationTransition /= 2.0;
+        }
+
+        ElevationLayerBlendingCallback* elbc = new ElevationLayerBlendingCallback(mtc, elevations);
+
+        // assign to the most appropriate node (the CoordinateSystemNode is best as it provides the elevation on the globe.)
+        if (csn) csn->setCullCallback(elbc);    
+        else if (mtc) mtc->setCullCallback(elbc);
+        else rootnode->setCullCallback(elbc);
+
+        // add a viewport to the viewer and attach the scene graph.
+        viewer.setSceneData( rootnode );
+    }
     
     // create the windows and run the threads.