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

Added support for an View::Slave::UpdateSlaveCallback

Browse Source
This commit is contained in:
Robert Osfield
2011-03-01 14:48:48 +00:00
parent 454e2df32b
commit 1525f3cd4e
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/osg/View
View File

@@ -92,6 +92,7 @@ class OSG_EXPORT View : public virtual osg::Object
/** 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
{
@@ -108,7 +109,8 @@ class OSG_EXPORT View : public virtual osg::Object
_camera(rhs._camera),
_projectionOffset(rhs._projectionOffset),
_viewOffset(rhs._viewOffset),
_useMastersSceneData(rhs._useMastersSceneData) {}
_useMastersSceneData(rhs._useMastersSceneData),
_updateSlaveCallback(rhs._updateSlaveCallback) {}
Slave& operator = (const Slave& rhs)
{
@@ -116,13 +118,28 @@ class OSG_EXPORT View : public virtual osg::Object
_projectionOffset = rhs._projectionOffset;
_viewOffset = rhs._viewOffset;
_useMastersSceneData = rhs._useMastersSceneData;
_updateSlaveCallback = rhs._updateSlaveCallback;
return *this;
}
osg::ref_ptr<osg::Camera> _camera;
osg::Matrixd _projectionOffset;
osg::Matrixd _viewOffset;
bool _useMastersSceneData;
struct UpdateSlaveCallback : public virtual Referenced
{
virtual void updateSlave(osg::View& view, osg::View::Slave& slave) = 0;
};
void updateSlave(View& view)
{
if (_updateSlaveCallback.valid()) _updateSlaveCallback->updateSlave(view, *this);
else updateSlaveImplementation(view);
}
virtual void updateSlaveImplementation(View& view);
osg::ref_ptr<osg::Camera> _camera;
osg::Matrixd _projectionOffset;
osg::Matrixd _viewOffset;
bool _useMastersSceneData;
osg::ref_ptr<UpdateSlaveCallback> _updateSlaveCallback;
};
bool addSlave(osg::Camera* camera, bool useMastersSceneData=true) { return addSlave(camera, osg::Matrix::identity(), osg::Matrix::identity(), useMastersSceneData); }
@@ -142,9 +159,6 @@ class OSG_EXPORT View : public virtual osg::Object
void updateSlaves();
void updateSlave(unsigned int i);
protected :
virtual ~View();