FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgUtil/CullVisitor
View File

@@ -25,7 +25,7 @@
#include <osg/StateSet>
#include <osg/State>
#include <osg/ClearNode>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osg/Notify>
#include <osg/CullStack>
@@ -76,7 +76,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor, public osg::CullStac
virtual void apply(osg::Switch& node);
virtual void apply(osg::LOD& node);
virtual void apply(osg::ClearNode& node);
virtual void apply(osg::CameraNode& node);
virtual void apply(osg::Camera& node);
virtual void apply(osg::OccluderNode& node);
void setClearNode(const osg::ClearNode* earthSky) { _clearNode = earthSky; }

2
include/osgUtil/IntersectVisitor
View File

@@ -213,7 +213,7 @@ class OSGUTIL_EXPORT PickVisitor : public osgUtil::IntersectVisitor
void apply(osg::Projection& projection);
void apply(osg::CameraNode& camera);
void apply(osg::Camera& camera);
protected:

2
include/osgUtil/IntersectionVisitor
View File

@@ -323,7 +323,7 @@ class OSGUTIL_EXPORT IntersectionVisitor : public osg::NodeVisitor
virtual void apply(osg::PagedLOD& lod);
virtual void apply(osg::Transform& transform);
virtual void apply(osg::Projection& projection);
virtual void apply(osg::CameraNode& camera);
virtual void apply(osg::Camera& camera);
protected:

14
include/osgUtil/RenderStage
View File

@@ -18,7 +18,7 @@
#include <osg/Viewport>
#include <osg/Texture>
#include <osg/FrameBufferObject>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osgUtil/RenderBin>
#include <osgUtil/PositionalStateContainer>
@@ -119,9 +119,9 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
/** Get the clear color.*/
int getClearStencil() const { return _clearStencil; }
void setCameraNode(osg::CameraNode* camera) { if (_camera!=camera) { _camera = camera; _cameraRequiresSetUp = true; } }
osg::CameraNode* getCameraNode() { return _camera; }
const osg::CameraNode* getCameraNode() const { return _camera; }
void setCamera(osg::Camera* camera) { if (_camera!=camera) { _camera = camera; _cameraRequiresSetUp = true; } }
osg::Camera* getCamera() { return _camera; }
const osg::Camera* getCamera() const { return _camera; }
void setCameraRequiresSetUp(bool flag) { _cameraRequiresSetUp = flag; }
bool getCameraRequiresSetUp() const { return _cameraRequiresSetUp; }
@@ -210,7 +210,7 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
GLenum _imageReadPixelDataType;
};
void attach(osg::CameraNode::BufferComponent buffer, osg::Image* image);
void attach(osg::Camera::BufferComponent buffer, osg::Image* image);
protected:
@@ -236,7 +236,7 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
int _clearStencil;
bool _cameraRequiresSetUp;
osg::CameraNode* _camera;
osg::Camera* _camera;
osg::ref_ptr<osg::Texture> _texture;
unsigned int _level;
@@ -246,7 +246,7 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
GLenum _imageReadPixelFormat;
GLenum _imageReadPixelDataType;
std::map< osg::CameraNode::BufferComponent, Attachment> _bufferAttachmentMap;
std::map< osg::Camera::BufferComponent, Attachment> _bufferAttachmentMap;
osg::ref_ptr<osg::FrameBufferObject> _fbo;
osg::ref_ptr<osg::GraphicsContext> _graphicsContext;

10
include/osgUtil/SceneView
View File

@@ -21,7 +21,7 @@
#include <osg/DisplaySettings>
#include <osg/CollectOccludersVisitor>
#include <osg/CullSettings>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osgUtil/CullVisitor>
@@ -56,13 +56,13 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced, public osg::CullSetting
void setDefaults(unsigned int options = STANDARD_SETTINGS);
/** Set the camera used to represent the camera view of this SceneView.*/
void setCamera(osg::CameraNode* camera);
void setCamera(osg::Camera* camera);
/** Get the camera used to represent the camera view of this SceneView.*/
osg::CameraNode* getCamera() { return _camera.get(); }
osg::Camera* getCamera() { return _camera.get(); }
/** Get the const camera used to represent the camera view of this SceneView.*/
const osg::CameraNode* getCamera() const { return _camera.get(); }
const osg::Camera* getCamera() const { return _camera.get(); }
/** Set the data to view. The data will typically be
* an osg::Scene but can be any osg::Node type.
@@ -500,7 +500,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced, public osg::CullSetting
osg::ref_ptr<osg::FrameStamp> _frameStamp;
osg::ref_ptr<osg::CameraNode> _camera;
osg::ref_ptr<osg::Camera> _camera;
osg::ref_ptr<osg::StateSet> _globalStateSet;
osg::ref_ptr<osg::Light> _light;