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

Timestamp:

10/28/05 15:11:56 (8 years ago)

Author:

robert

Message:

Moved SceneView? across to use an osg::CameraNode? to store the projection and view matrices,
the viewport, the clear colour and the subgraph needing rendered. This is done
transparently so all existing functionality will behave as before. What it does
add is the ability to set a SceneView? directly by a single osg::CameraNode? when required.

Files:

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

OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp

@@ -59 +59 @@
 struct CullOperation : public osg::GraphicsThread::Operation
 {
-    CullOperation(osg::CameraNode* camera, osgUtil::SceneView* sceneView):
+    CullOperation(osgUtil::SceneView* sceneView):
         osg::GraphicsThread::Operation("Cull",true),
-        _camera(camera),
         _sceneView(sceneView)
     {
@@ -69 +68 @@
     {
         _sceneView->setState(context->getState());
-        _sceneView->setProjectionMatrix(_camera->getProjectionMatrix());
-        _sceneView->setViewMatrix(_camera->getViewMatrix());
-        _sceneView->setViewport(_camera->getViewport());
-        
         _sceneView->cull();
     }
     
-    osg::CameraNode*                 _camera;
     osg::ref_ptr<osgUtil::SceneView> _sceneView;
 };
@@ -274 +268 @@
     {
         osg::CameraNode* camera = citr->get();
+        osg::GraphicsThread* graphicsThread = camera->getGraphicsContext()->getGraphicsThread();
         
         // create a scene view to do the cull and draw
@@ -279 +274 @@
         sceneView->setDefaults();
         sceneView->setFrameStamp(frameStamp.get());
-            
-        if (camera->getNumChildren()>=1)
-        {
-            sceneView->setSceneData(camera->getChild(0));
-        }
+        sceneView->setCamera(camera);    
 
         // cull traversal operation
-        camera->getGraphicsContext()->getGraphicsThread()->add( new CullOperation(camera, sceneView), false); 
+        graphicsThread->add( new CullOperation(sceneView), false); 
 
         // optionally add glFinish barrier to ensure that all OpenGL commands are completed before we start dispatching a new frame
-        if (doFinishBeforeNewDraw) camera->getGraphicsContext()->getGraphicsThread()->add( glFinishBarrierOp.get(), false); 
+        if (doFinishBeforeNewDraw) graphicsThread->add( glFinishBarrierOp.get(), false); 
 
         // draw traversal operation.
-        camera->getGraphicsContext()->getGraphicsThread()->add( new DrawOperation(sceneView), false); 
+        graphicsThread->add( new DrawOperation(sceneView), false); 
     }