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

Added bool View::Slave::_useMastersSceneData to help manage HUD's and RTT

Browse Source 
cameras that are embedded in the Viewer's View
This commit is contained in:
Robert Osfield
2007-02-23 11:53:45 +00:00
parent 67a9ac2055
commit 96f567eff3
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/View.cpp
View File

@@ -86,7 +86,7 @@ void View::updateSlave(unsigned int i)
if (slave._camera->getInheritanceMask() & osg::CullSettings::CLEAR_COLOR) slave._camera->setClearColor(_camera->getClearColor());
}
bool View::addSlave(osg::Camera* camera, const osg::Matrix& projectionOffset, const osg::Matrix& viewOffset)
bool View::addSlave(osg::Camera* camera, const osg::Matrix& projectionOffset, const osg::Matrix& viewOffset, bool useMastersSceneData)
{
if (!camera) return false;
@@ -94,7 +94,7 @@ bool View::addSlave(osg::Camera* camera, const osg::Matrix& projectionOffset, co
unsigned int i = _slaves.size();
_slaves.push_back(Slave(camera, projectionOffset, viewOffset));
_slaves.push_back(Slave(camera, projectionOffset, viewOffset, useMastersSceneData));
updateSlave(i);

2
src/osgViewer/View.cpp
View File

@@ -281,7 +281,7 @@ void View::assignSceneDataToCameras()
for(unsigned i=0; i<getNumSlaves(); ++i)
{
Slave& slave = getSlave(i);
if (slave._camera.valid())
if (slave._camera.valid() && slave._useMastersSceneData)
{
slave._camera->removeChildren(0,slave._camera->getNumChildren());
if (sceneData) slave._camera->addChild(sceneData);