Changeset 11848 for OpenSceneGraph/trunk/examples/osganalysis/osganalysis.cpp

Timestamp:

10/22/10 14:28:50 (3 years ago)

Author:

robert

Message:

Cleaned up main loop, so it's more readable, seperating out the paging and non paging implementations

Files:

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

OpenSceneGraph/trunk/examples/osganalysis/osganalysis.cpp

@@ -233 +233 @@
     }
 
-    typedef std::vector< osg::ref_ptr<osg::Node> > Models;
-    unsigned int modelIndex = 0;
-    Models models;
-
-    osg::ref_ptr<osg::Group> group = new osg::Group;
-    viewer.setSceneData(group);
-
-    osg::ref_ptr<osg::OperationThread> databasePagingThread;
-    osg::ref_ptr<DatabasePagingOperation> databasePagingOperation;
+
     if (readDatabasesInPagingThread)
     {
+        // load the models using a paging thread and use the incremental compile operation to
+        // manage the compilation of GL objects without breaking frame.
+
+        unsigned int modelIndex = 0;
+
+        osg::ref_ptr<osg::OperationThread> databasePagingThread;
+        osg::ref_ptr<DatabasePagingOperation> databasePagingOperation;
+
         databasePagingThread = new osg::OperationThread;
         databasePagingThread->startThread();
@@ -254 +254 @@
         databasePagingThread->add(databasePagingOperation.get());
 
-    }
-    else
-    {
-        for(FileNames::iterator itr = fileNames.begin();
-            itr != fileNames.end();
-            ++itr)
-        {
-            // not an option so assume string is a filename.
-            osg::ref_ptr<osg::Node> node = osgDB::readNodeFile( *itr );
-            if(node.valid())
-            {
-                if (node->getName().empty()) node->setName( *itr );
-
-                node = sceneGraphProcessor->process(node.get());
-
-                models.push_back(node.get());
-            }
-        }
-
-        group->addChild(models[modelIndex++].get());
-
-    }
-
-    viewer.realize();
-
-    double timeOfLastMerge = viewer.getFrameStamp()->getReferenceTime();
-
-    osg::ref_ptr<CustomCompileCompletedCallback> compileCompletedCallback;
-
-    while(!viewer.done())
-    {
-        viewer.frame();
-
-        double currentTime = viewer.getFrameStamp()->getReferenceTime();
-
-        if (readDatabasesInPagingThread)
-        {
+        osg::ref_ptr<osg::Group> group = new osg::Group;
+        viewer.setSceneData(group);
+
+        viewer.realize();
+
+        double timeOfLastMerge = viewer.getFrameStamp()->getReferenceTime();
+
+        while(!viewer.done())
+        {
+            viewer.frame();
+
+            double currentTime = viewer.getFrameStamp()->getReferenceTime();
+
             if (!databasePagingOperation &&
                 modelIndex<fileNames.size() &&
@@ -319 +295 @@
             }
         }
-        else
-        {
+
+    }
+    else
+    {
+        // load the models directly and then just use the IncrementalCompileOperation to
+        // compile the GL objects for us.
+        typedef std::vector< osg::ref_ptr<osg::Node> > Models;
+        Models models;
+        unsigned int modelIndex = 0;
+
+        for(FileNames::iterator itr = fileNames.begin();
+            itr != fileNames.end();
+            ++itr)
+        {
+            // not an option so assume string is a filename.
+            osg::ref_ptr<osg::Node> node = osgDB::readNodeFile( *itr );
+            if(node.valid())
+            {
+                if (node->getName().empty()) node->setName( *itr );
+
+                node = sceneGraphProcessor->process(node.get());
+
+                models.push_back(node.get());
+            }
+        }
+
+        osg::ref_ptr<osg::Group> group = new osg::Group;
+        group->addChild(models[modelIndex++].get());
+
+        viewer.setSceneData(group);
+
+        viewer.realize();
+
+        double timeOfLastMerge = viewer.getFrameStamp()->getReferenceTime();
+
+        osg::ref_ptr<CustomCompileCompletedCallback> compileCompletedCallback;
+
+        while(!viewer.done())
+        {
+            viewer.frame();
+
+            double currentTime = viewer.getFrameStamp()->getReferenceTime();
+
             if (!compileCompletedCallback &&
                 modelIndex<fileNames.size() &&