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

From Pjotr Svetachov, introduced use of osg::observer_ptr<osg::Camera> in place of osg::Camera*

Browse Source
This commit is contained in:
Robert Osfield
2013-06-21 13:59:18 +00:00
parent da134aa8ed
commit 9d9543ca0a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgUtil/RenderStage
View File

@@ -137,8 +137,8 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
void setCamera(osg::Camera* camera) { if (_camera!=camera) { _camera = camera; _cameraRequiresSetUp = true; } }
osg::Camera* getCamera() { return _camera; }
const osg::Camera* getCamera() const { return _camera; }
osg::Camera* getCamera() { return _camera.get(); }
const osg::Camera* getCamera() const { return _camera.get(); }
void setCameraRequiresSetUp(bool flag) { _cameraRequiresSetUp = flag; }
bool getCameraRequiresSetUp() const { return _cameraRequiresSetUp; }
@@ -288,7 +288,7 @@ protected:
int _clearStencil;
bool _cameraRequiresSetUp;
osg::Camera* _camera;
osg::observer_ptr<osg::Camera> _camera;
osg::ref_ptr<osg::Texture> _texture;
unsigned int _level;