Changeset 8299

Timestamp:

05/10/08 19:04:02

Author:

robert

Message:

Moved compile setup from osgViewer::ViewerBase? into osgViewer::Renderer to
avoid threading issues associated with compile running in a parallel with
update/cull on the first frame.

Also added automatic recompile when a new SceneData? is applied to a View.

Files:

• OpenSceneGraph/trunk/include/osgViewer/Renderer (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp (modified) (4 diffs)
• OpenSceneGraph/trunk/src/osgViewer/View.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgViewer/ViewerBase.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgViewer/Renderer

@@ -67 +67 @@
-        bool getGraphicsThreadDoesCull() const { return _graphicsThreadDoesCull; }
-
+
-        virtual void cull();
-        virtual void draw();
-        virtual void cull_draw();
+
+        virtual void compile();
+        
+        void setCompileOnNextDraw(bool flag) { _compileOnNextDraw = flag; }
+        bool getCompileOnNextDraw() const { return _compileOnNextDraw; }
-
-        virtual void operator () (osg::Object* object);
@@ -137 +143 @@
-        bool                                                _done;
-        bool                                                _graphicsThreadDoesCull;
+        bool                                                _compileOnNextDraw;
-        
-        osg::ref_ptr<osgUtil::SceneView>                    _sceneView[2];

OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp

@@ -168 +168 @@
-    _camera(camera),
-    _done(false),
-
+
+
-{
-
@@ -252 +253 @@
-}
-
+void Renderer::compile()
+{
+    DEBUG_MESSAGE<<"Renderer::compile()"<<std::endl;
+
+    _compileOnNextDraw = false;
+    
+    osgUtil::SceneView* sceneView = _sceneView[0].get();
+    if (!sceneView || _done) return;
+
+    if (sceneView->getSceneData()) 
+    {
+        osgUtil::GLObjectsVisitor glov;
+        glov.setState(sceneView->getState());
+        sceneView->getSceneData()->accept(glov);
+    }
+}
-
-void Renderer::cull()
@@ -323 +340 @@
-    osg::GraphicsThread* compileThread = compileContext ? compileContext->getGraphicsThread() : 0;
-
-
-
+
+
+
+
+
+
+
-        osgViewer::View* view = dynamic_cast<osgViewer::View*>(_camera->getView());
-        osgDB::DatabasePager* databasePager = view ? view->getDatabasePager() : 0;
@@ -431 +453 @@
-    osgUtil::SceneView* sceneView = _sceneView[0].get();
-    if (!sceneView || _done) return;
+
+    if (_compileOnNextDraw)
+    {
+        compile();
+    }
-
-    updateSceneView(sceneView);

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -1635 +1635 @@
-        _camera->removeChildren(0,_camera->getNumChildren());
-        if (sceneData) _camera->addChild(sceneData);
+        
+        Renderer* renderer = dynamic_cast<Renderer*>(_camera->getRenderer());
+        if (renderer) renderer->setCompileOnNextDraw(true);
+
-    }
-
@@ -1644 +1648 @@
-            slave._camera->removeChildren(0,slave._camera->getNumChildren());
-            if (sceneData) slave._camera->addChild(sceneData);
+        
+            Renderer* renderer = dynamic_cast<Renderer*>(slave._camera->getRenderer());
+            if (renderer) renderer->setCompileOnNextDraw(true);
-        }
-    }    

OpenSceneGraph/trunk/src/osgViewer/ViewerBase.cpp

@@ -27 +27 @@
-#include <osgUtil/Optimizer>
-#include <osgUtil/IntersectionVisitor>
-#include <osgUtil/GLObjectsVisitor>
-#include <osgUtil/RenderLeaf>
-
-static osg::ApplicationUsageProxy ViewerBase_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_CONFIG_FILE <filename>","Specify a viewer configuration file to load by default.");
@@ -282 +280 @@
-    osg::Referenced::setThreadSafeReferenceCounting(true);
-
-
-    Scenes scenes;
-    getScenes(scenes);
@@ -375 +372 @@
-        if (affinity) gc->getGraphicsThread()->setProcessorAffinity(processNum % numProcessors);
-        threadAffinityMap[gc->getGraphicsThread()] = processNum % numProcessors;
-
-        gc->getGraphicsThread()->add(new osgUtil::GLObjectsOperation());
-
-        // add the startRenderingBarrier