diff --git a/include/osg/View b/include/osg/View index c52de029b..0aeea8a3d 100644 --- a/include/osg/View +++ b/include/osg/View @@ -71,6 +71,15 @@ class OSG_EXPORT View : public virtual osg::Object /** Get the const master camera of the view. */ const osg::Camera* getCamera() const { return _camera.get(); } + /** Set the frame stamp of the view. */ + void setFrameStamp(osg::FrameStamp* fs) { _frameStamp = fs; } + + /** Get the frame stamp of the view. */ + osg::FrameStamp* getFrameStamp() { return _frameStamp.get(); } + + /** Get the frame stamp of the view. */ + const osg::FrameStamp* getFrameStamp() const { return _frameStamp.get(); } + /** Slave allows one to up a camera that follows the master with a local offset to the project and view matrices.*/ struct Slave { @@ -130,13 +139,15 @@ class OSG_EXPORT View : public virtual osg::Object virtual osg::GraphicsOperation* createRenderer(osg::Camera*) { return 0; } - LightingMode _lightingMode; - osg::ref_ptr _light; + LightingMode _lightingMode; + osg::ref_ptr _light; - osg::ref_ptr _camera; + osg::ref_ptr _camera; - typedef std::vector Slaves; - Slaves _slaves; + typedef std::vector Slaves; + Slaves _slaves; + + osg::ref_ptr _frameStamp; }; } diff --git a/include/osgViewer/View b/include/osgViewer/View index 780a320eb..fe1a0af31 100644 --- a/include/osgViewer/View +++ b/include/osgViewer/View @@ -56,10 +56,6 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter virtual void setStartTick(osg::Timer_t tick); osg::Timer_t getStartTick() const { return _startTick; } - void setFrameStamp(osg::FrameStamp* fs) { _frameStamp = fs; } - osg::FrameStamp* getFrameStamp() { return _frameStamp.get(); } - const osg::FrameStamp* getFrameStamp() const { return _frameStamp.get(); } - Scene* getScene() { return _scene.get(); } const Scene* getScene() const { return _scene.get(); } @@ -207,7 +203,6 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter osg::Timer_t _startTick; - osg::ref_ptr _frameStamp; osg::ref_ptr _scene; osg::ref_ptr _eventQueue;