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

Added beginnings of new osgViewer::Scene,View,Viewer,CompositeViewer and GraphicsWindowProxy files.
This commit is contained in:
Robert Osfield
2006-11-27 14:52:07 +00:00
parent b82e521444
commit fd2ffeb310
110 changed files with 2257 additions and 1466 deletions

View File

@@ -20,7 +20,7 @@
#include <osg/AlphaFunc>
#include <osg/TexEnv>
#include <osg/Texture2D>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osgSim/Export>
@@ -152,13 +152,13 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable
virtual osg::BoundingBox computeBound() const;
/** Set the camera node to use for pre rendering the impostor sprite's texture.*/
void setCameraNode(osg::CameraNode* camera) { _camera = camera; }
void setCamera(osg::Camera* camera) { _camera = camera; }
/** Get the camera node to use for pre rendering the impostor sprite's texture.*/
osg::CameraNode* getCameraNode() { return _camera.get(); }
osg::Camera* getCamera() { return _camera.get(); }
/** Get the const camera node to use for pre rendering the impostor sprite's texture.*/
const osg::CameraNode* getCameraNode() const { return _camera.get(); }
const osg::Camera* getCamera() const { return _camera.get(); }
protected:
@@ -172,7 +172,7 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable
friend class osgSim::ImpostorSpriteManager;
// camera node for doing the pre rendering.
osg::ref_ptr<osg::CameraNode> _camera;
osg::ref_ptr<osg::Camera> _camera;
// support for a double linked list managed by the
// ImposotorSpriteManager.

View File

@@ -15,7 +15,7 @@
#define OSGSIM_OVERLAYNODE 1
#include <osg/buffered_value>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osg/Texture2D>
#include <osg/TexGenNode>
@@ -82,10 +82,10 @@ class OSGSIM_EXPORT OverlayNode : public osg::Group
/** Get the camera used to implement the render to texture of the overlay subgraph.*/
osg::CameraNode* getCamera() { return _camera.get(); }
osg::Camera* getCamera() { return _camera.get(); }
/** Get the const camera used to implement the render to texture of the overlay subgraph.*/
const osg::CameraNode* getCamera() const { return _camera.get(); }
const osg::Camera* getCamera() const { return _camera.get(); }
protected :
@@ -99,7 +99,7 @@ class OSGSIM_EXPORT OverlayNode : public osg::Group
mutable TextureObjectValidList _textureObjectValidList;
osg::ref_ptr<osg::CameraNode> _camera;
osg::ref_ptr<osg::Camera> _camera;
// overlay subgraph is render to a texture
osg::ref_ptr<osg::Node> _overlaySubgraph;