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

Timestamp:

11/27/06 15:52:07 (7 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/osgprerender/osgprerender.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/examples/osgprerender/osgprerender.cpp

@@ -108 +108 @@
 };
 
-struct MyCameraPostDrawCallback : public osg::CameraNode::DrawCallback
+struct MyCameraPostDrawCallback : public osg::Camera::DrawCallback
 {
     MyCameraPostDrawCallback(osg::Image* image):
@@ -115 +115 @@
     }
 
-    virtual void operator () (const osg::CameraNode& /*camera*/) const
+    virtual void operator () (const osg::Camera& /*camera*/) const
     {
         if (_image && _image->getPixelFormat()==GL_RGBA && _image->getDataType()==GL_UNSIGNED_BYTE)
@@ -178 +178 @@
 
 
-osg::Node* createPreRenderSubGraph(osg::Node* subgraph, unsigned tex_width, unsigned tex_height, osg::CameraNode::RenderTargetImplementation renderImplementation, bool useImage, bool useTextureRectangle, bool useHDR)
+osg::Node* createPreRenderSubGraph(osg::Node* subgraph, unsigned tex_width, unsigned tex_height, osg::Camera::RenderTargetImplementation renderImplementation, bool useImage, bool useTextureRectangle, bool useHDR)
 {
     if (!subgraph) return 0;
@@ -289 +289 @@
     // then create the camera node to do the render to texture
     {    
-        osg::CameraNode* camera = new osg::CameraNode;
+        osg::Camera* camera = new osg::Camera;
 
         // set up the background color and clear mask.
@@ -322 +322 @@
 
         // 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.
@@ -335 +335 @@
 
             // attach the image so its copied on each frame.
-            camera->attach(osg::CameraNode::COLOR_BUFFER, image);
+            camera->attach(osg::Camera::COLOR_BUFFER, image);
             
             camera->setPostDrawCallback(new MyCameraPostDrawCallback(image));
@@ -352 +352 @@
         {
             // attach the texture and use it as the color buffer.
-            camera->attach(osg::CameraNode::COLOR_BUFFER, texture);
+            camera->attach(osg::Camera::COLOR_BUFFER, texture);
         }
 
@@ -405 +405 @@
     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("--pbuffer-rtt")) { renderImplementation = osg::CameraNode::PIXEL_BUFFER_RTT; }
-    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("--pbuffer-rtt")) { renderImplementation = osg::Camera::PIXEL_BUFFER_RTT; }
+    while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; }
+    while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPERATE_WINDOW; }
 
     bool useImage = false;