Changeset 10832 for OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp

Timestamp:

11/26/09 11:12:38 (3 years ago)

Author:

robert

Message:

Added check for Geometry pointer being valid

Files:

• OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp

@@ -185 +185 @@
         {
             osg::Geometry* geom = geode.getDrawable(i)->asGeometry();
-            osg::notify(osg::NOTICE)<<"Enabling VBO"<<std::endl;
-            geom->setUseVertexBufferObjects(true);
+            if (geom)
+            {
+                osg::notify(osg::NOTICE)<<"Enabling VBO"<<std::endl;
+                geom->setUseVertexBufferObjects(true);
+            }
         }
     }
@@ -232 +235 @@
             osg::notify(osg::NOTICE)<<"+++++++++++++ New viewer ++++++++++++"<<std::endl;
 
-            osgViewer::Viewer viewer;
-
-            viewer.setThreadingModel(threadingModel);
-
-            if (sharedModel) viewer.setSceneData(model.get());
-            else
             {
-                osg::ref_ptr<osg::Node> node = osgDB::readNodeFiles(arguments);
-                if (!node) return 0;
-
-                if (enableVBO)
+                osgViewer::Viewer viewer;
+
+                viewer.setThreadingModel(threadingModel);
+
+                if (sharedModel) viewer.setSceneData(model.get());
+                else
                 {
-                    EnableVBOVisitor enableVBOs;
-                    node->accept(enableVBOs);
+                    osg::ref_ptr<osg::Node> node = osgDB::readNodeFiles(arguments);
+                    if (!node) return 0;
+
+                    if (enableVBO)
+                    {
+                        EnableVBOVisitor enableVBOs;
+                        node->accept(enableVBOs);
+                    }
+
+                    viewer.setSceneData(node.get());
                 }
 
-                viewer.setSceneData(node.get());
+                viewer.run();
             }
-
-            viewer.run();
 
             osg::notify(osg::NOTICE)<<"------------ Viewer ended ----------"<<std::endl<<std::endl;