Changeset 5757 for OpenSceneGraph/trunk/examples/osghud/osghud.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/osghud/osghud.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osghud/osghud.cpp

@@ -22 +22 @@
 #include <osg/PolygonOffset>
 #include <osg/MatrixTransform>
-#include <osg/CameraNode>
+#include <osg/Camera>
 
 #include <osgText/Text>
@@ -70 +70 @@
         text->setFont(timesFont);
         text->setPosition(position);
-        text->setText("Then place an osg::CameraNode above the subgraph\n"
+        text->setText("Then place an osg::Camera above the subgraph\n"
                       "to create an orthographic projection.\n");
         
@@ -82 +82 @@
         text->setFont(timesFont);
         text->setPosition(position);
-        text->setText("Set the CameraNode's ReferenceFrame to ABSOLUTE_RF to ensure\n"
+        text->setText("Set the Camera's ReferenceFrame to ABSOLUTE_RF to ensure\n"
                       "it remains independent from any external model view matrices.");
         
@@ -94 +94 @@
         text->setFont(timesFont);
         text->setPosition(position);
-        text->setText("And set the CameraNode's clear mask to just clear the depth buffer.");
-        
-        position += delta;
-    }    
-
-    {
-        osgText::Text* text = new  osgText::Text;
-        geode->addDrawable( text );
-
-        text->setFont(timesFont);
-        text->setPosition(position);
-        text->setText("And finally set the CameraNode's RenderOrder to POST_RENDER\n"
+        text->setText("And set the Camera's clear mask to just clear the depth buffer.");
+        
+        position += delta;
+    }    
+
+    {
+        osgText::Text* text = new  osgText::Text;
+        geode->addDrawable( text );
+
+        text->setFont(timesFont);
+        text->setPosition(position);
+        text->setText("And finally set the Camera's RenderOrder to POST_RENDER\n"
                       "to make sure its drawn last.");
         
@@ -149 +149 @@
     }
 
-    osg::CameraNode* camera = new osg::CameraNode;
+    osg::Camera* camera = new osg::Camera;
 
     // set the projection matrix
@@ -162 +162 @@
 
     // draw subgraph after main camera view.
-    camera->setRenderOrder(osg::CameraNode::POST_RENDER);
+    camera->setRenderOrder(osg::Camera::POST_RENDER);
 
     camera->addChild(geode);