Changeset 5757 for OpenSceneGraph/trunk/examples/osgprerendercubemap/osgprerendercubemap.cpp

Timestamp:

11/27/06 15:52:07 (6 years ago)

Author:

robert

Message:

Renamed osg::CameraNode? to osg::Camera, cleaned up osg::View.

Added beginnings of new osgViewer::Scene,View,Viewer,CompositeViewer? and GraphicsWindowProxy? files.

Files:

• OpenSceneGraph/trunk/examples/osgprerendercubemap/osgprerendercubemap.cpp (modified) (12 diffs)

OpenSceneGraph/trunk/examples/osgprerendercubemap/osgprerendercubemap.cpp

@@ -19 +19 @@
 #include <osg/PositionAttitudeTransform>
 
-#include <osg/CameraNode>
+#include <osg/Camera>
 #include <osg/TexGenNode>
 
@@ -112 +112 @@
     public:
     
-        typedef std::vector< osg::ref_ptr<osg::CameraNode> >  CameraList;
-
-        UpdateCameraAndTexGenCallback(osg::NodePath& reflectorNodePath, CameraList& cameraNodes):
+        typedef std::vector< osg::ref_ptr<osg::Camera> >  CameraList;
+
+        UpdateCameraAndTexGenCallback(osg::NodePath& reflectorNodePath, CameraList& Cameras):
             _reflectorNodePath(reflectorNodePath),
-            _cameraNodes(cameraNodes)
+            _Cameras(Cameras)
         {
         }
@@ -142 +142 @@
 
             for(unsigned int i=0; 
-                i<6 && i<_cameraNodes.size();
+                i<6 && i<_Cameras.size();
                 ++i)
             {
@@ -150 +150 @@
                 osg::Matrix viewMatrix = worldToLocal*localOffset;
             
-                _cameraNodes[i]->setReferenceFrame(osg::CameraNode::ABSOLUTE_RF);
-                _cameraNodes[i]->setProjectionMatrixAsFrustum(-1.0,1.0,-1.0,1.0,1.0,10000.0);
-                _cameraNodes[i]->setViewMatrix(viewMatrix);
+                _Cameras[i]->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
+                _Cameras[i]->setProjectionMatrixAsFrustum(-1.0,1.0,-1.0,1.0,1.0,10000.0);
+                _Cameras[i]->setViewMatrix(viewMatrix);
             }
         }
@@ -161 +161 @@
         
         osg::NodePath               _reflectorNodePath;        
-        CameraList                  _cameraNodes;
+        CameraList                  _Cameras;
 };
 
@@ -192 +192 @@
 
 
-osg::Group* createShadowedScene(osg::Node* reflectedSubgraph, osg::NodePath reflectorNodePath, unsigned int unit, const osg::Vec4& clearColor, unsigned tex_width, unsigned tex_height, osg::CameraNode::RenderTargetImplementation renderImplementation)
+osg::Group* createShadowedScene(osg::Node* reflectedSubgraph, osg::NodePath reflectorNodePath, unsigned int unit, const osg::Vec4& clearColor, unsigned tex_width, unsigned tex_height, osg::Camera::RenderTargetImplementation renderImplementation)
 {
 
@@ -208 +208 @@
     
     // set up the render to texture cameras.
-    UpdateCameraAndTexGenCallback::CameraList cameraNodes;
+    UpdateCameraAndTexGenCallback::CameraList Cameras;
     for(unsigned int i=0; i<6; ++i)
     {
         // create the camera
-        osg::CameraNode* camera = new osg::CameraNode;
+        osg::Camera* camera = new osg::Camera;
 
         camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -221 +221 @@
 
         // set the camera to render before the main camera.
-        camera->setRenderOrder(osg::CameraNode::PRE_RENDER);
+        camera->setRenderOrder(osg::Camera::PRE_RENDER);
 
         // tell the camera to use OpenGL frame buffer object where supported.
@@ -227 +227 @@
 
         // attach the texture and use it as the color buffer.
-        camera->attach(osg::CameraNode::COLOR_BUFFER, texture, 0, i);
+        camera->attach(osg::Camera::COLOR_BUFFER, texture, 0, i);
 
         // add subgraph to render
@@ -234 +234 @@
         group->addChild(camera);
         
-        cameraNodes.push_back(camera);
+        Cameras.push_back(camera);
     }
    
@@ -265 +265 @@
     
     // set an update callback to keep moving the camera and tex gen in the right direction.
-    group->setUpdateCallback(new UpdateCameraAndTexGenCallback(reflectorNodePath, cameraNodes));
+    group->setUpdateCallback(new UpdateCameraAndTexGenCallback(reflectorNodePath, Cameras));
 
     return group;
@@ -308 +308 @@
     while (arguments.read("--height", tex_height)) {}
 
-    osg::CameraNode::RenderTargetImplementation renderImplementation = osg::CameraNode::FRAME_BUFFER_OBJECT;
-    
-    while (arguments.read("--fbo")) { renderImplementation = osg::CameraNode::FRAME_BUFFER_OBJECT; }
-    while (arguments.read("--pbuffer")) { renderImplementation = osg::CameraNode::PIXEL_BUFFER; }
-    while (arguments.read("--fb")) { renderImplementation = osg::CameraNode::FRAME_BUFFER; }
-    while (arguments.read("--window")) { renderImplementation = osg::CameraNode::SEPERATE_WINDOW; }
+    osg::Camera::RenderTargetImplementation renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT;
+    
+    while (arguments.read("--fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; }
+    while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; }
+    while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; }
+    while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPERATE_WINDOW; }