Changeset 9868 for OpenSceneGraph/trunk/include/osgViewer/ViewerBase

Timestamp:

03/08/09 13:00:36 (4 years ago)

Author:

robert

Message:

Preliminary work on general purpose incremental compile support in osgViewer.

Files:

• OpenSceneGraph/trunk/include/osgViewer/ViewerBase (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgViewer/ViewerBase

@@ -18 +18 @@
 
 #include <osgUtil/UpdateVisitor>
+#include <osgUtil/GLObjectsVisitor>
 
 #include <osgGA/MatrixManipulator>
@@ -185 +186 @@
         /** Get the graphics operation to call on realization of the viewers graphics windows.*/
         osg::Operation* getRealizeOperation() { return _realizeOperation.get(); }
+        
+        
+        /** Set the incremental compile operation.
+          * Used to manage the OpenGL object compilation and merging of subgraphs in a way that avoids overloading
+          * the rendering of frame with too many new objects in one frame. */
+        void setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation* ico);
+
+        /** Get the incremental compile operation. */
+        osgUtil::IncrementalCompileOperation* getIncrementalCompileOperation() { return _incrementalCompileOperation.get(); }
 
 
@@ -261 +271 @@
         virtual void viewerInit() = 0;
 
-        bool                                        _firstFrame;
-        bool                                        _done;
-        int                                         _keyEventSetsDone;
-        bool                                        _quitEventSetsDone;
-        bool                                        _releaseContextAtEndOfFrameHint;
-        
-        ThreadingModel                              _threadingModel;
-        bool                                        _threadsRunning;
-
-        BarrierPosition                             _endBarrierPosition;
-
-        osg::ref_ptr<osg::BarrierOperation>         _startRenderingBarrier;
-        osg::ref_ptr<osg::BarrierOperation>         _endRenderingDispatchBarrier;
-        osg::ref_ptr<osg::EndOfDynamicDrawBlock>    _endDynamicDrawBlock;
-        
-        osg::ref_ptr<osgGA::EventVisitor>           _eventVisitor;
-        
-        osg::ref_ptr<osg::OperationQueue>           _updateOperations;
-        osg::ref_ptr<osgUtil::UpdateVisitor>        _updateVisitor;
-        
-        osg::ref_ptr<osg::Operation>                _realizeOperation;
-
-        osg::observer_ptr<osg::GraphicsContext>     _currentContext;
+        bool                                                _firstFrame;
+        bool                                                _done;
+        int                                                 _keyEventSetsDone;
+        bool                                                _quitEventSetsDone;
+        bool                                                _releaseContextAtEndOfFrameHint;
+        
+        ThreadingModel                                      _threadingModel;
+        bool                                                _threadsRunning;
+
+        BarrierPosition                                     _endBarrierPosition;
+
+        osg::ref_ptr<osg::BarrierOperation>                 _startRenderingBarrier;
+        osg::ref_ptr<osg::BarrierOperation>                 _endRenderingDispatchBarrier;
+        osg::ref_ptr<osg::EndOfDynamicDrawBlock>            _endDynamicDrawBlock;
+        
+        osg::ref_ptr<osgGA::EventVisitor>                   _eventVisitor;
+        
+        osg::ref_ptr<osg::OperationQueue>                   _updateOperations;
+        osg::ref_ptr<osgUtil::UpdateVisitor>                _updateVisitor;
+        
+        osg::ref_ptr<osg::Operation>                        _realizeOperation;
+        osg::ref_ptr<osgUtil::IncrementalCompileOperation>  _incrementalCompileOperation;
+
+        osg::observer_ptr<osg::GraphicsContext>             _currentContext;
 };