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

Introduce Camera::s/getRenderer().

Browse Source
This commit is contained in:
Robert Osfield
2007-07-28 10:28:40 +00:00
parent f38be8c7a8
commit 6dec61842d
9 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/osg/Camera
View File

@@ -373,13 +373,13 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
/** Set the Rendering object that is used to implement rendering of the subgraph.*/
void setRenderingCache(unsigned int contextID, osg::Object* rc) { _renderingCache[contextID] = rc; }
void setRenderer(osg::Object* rc) { _renderer = rc; }
/** Get the Rendering object that is used to implement rendering of the subgraph.*/
osg::Object* getRenderingCache(unsigned int contextID) { return _renderingCache[contextID].get(); }
osg::Object* getRenderer() { return _renderer.get(); }
/** Get the const Rendering object that is used to implement rendering of the subgraph.*/
const osg::Object* getRenderingCache(unsigned int contextID) const { return _renderingCache[contextID].get(); }
const osg::Object* getRenderer() const { return _renderer.get(); }
/** Draw callback for custom operations.*/
@@ -467,11 +467,11 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
RenderTargetImplementation _renderTargetFallback;
BufferAttachmentMap _bufferAttachmentMap;
ref_ptr<OperationThread> _cameraThread;
ref_ptr<OperationThread> _cameraThread;
ref_ptr<GraphicsContext> _graphicsContext;
buffered_object< ref_ptr<Object> > _renderingCache;
ref_ptr<Object> _renderer;
ref_ptr<DrawCallback> _preDrawCallback;
ref_ptr<DrawCallback> _postDrawCallback;

5
include/osgUtil/SceneView
View File

@@ -61,7 +61,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
virtual void setDefaults(unsigned int options);
/** Set the camera used to represent the camera view of this SceneView.*/
void setCamera(osg::Camera* camera);
void setCamera(osg::Camera* camera, bool assumeOwnershipOfCamera = true);
/** Get the camera used to represent the camera view of this SceneView.*/
osg::Camera* getCamera() { return _camera.get(); }
@@ -502,7 +502,8 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
osg::ref_ptr<osg::FrameStamp> _frameStamp;
osg::ref_ptr<osg::Camera> _camera;
osg::observer_ptr<osg::Camera> _camera;
osg::ref_ptr<osg::Camera> _cameraWithOwnership;
osg::ref_ptr<osg::StateSet> _globalStateSet;
osg::ref_ptr<osg::Light> _light;