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

Fix for setting scene data after slaves have been added.

Browse Source
This commit is contained in:
Robert Osfield
2007-10-19 08:42:44 +00:00
parent 60052a0488
commit cc2a0290a4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osg/View.cpp
View File

@@ -156,7 +156,7 @@ void View::updateSlave(unsigned int i)
slave._camera->setProjectionMatrix(_camera->getProjectionMatrix() * slave._projectionOffset);
slave._camera->setViewMatrix(_camera->getViewMatrix() * slave._viewOffset);
}
slave._camera->inheritCullSettings(*_camera);
if (slave._camera->getInheritanceMask() & osg::CullSettings::CLEAR_COLOR) slave._camera->setClearColor(_camera->getClearColor());
}
@@ -169,6 +169,19 @@ bool View::addSlave(osg::Camera* camera, const osg::Matrix& projectionOffset, co
unsigned int i = _slaves.size();
if (useMastersSceneData)
{
camera->removeChildren(0,camera->getNumChildren());
if (_camera.valid())
{
for(unsigned int i=0; _camera->getNumChildren(); ++i)
{
camera->addChild(_camera->getChild(i));
}
}
}
_slaves.push_back(Slave(camera, projectionOffset, viewOffset, useMastersSceneData));
updateSlave(i);