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

Improved the handling of OSG_CONFIG_FILE support.

Browse Source
This commit is contained in:
Robert Osfield
2007-09-22 17:39:15 +00:00
parent da70320707
commit 54c579fcae
2 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgViewer/View.cpp
View File

@@ -168,16 +168,26 @@ void View::take(osg::View& rhs)
{
osg::View::take(rhs);
#if 1
osgViewer::View* rhs_osgViewer = dynamic_cast<osgViewer::View*>(&rhs);
if (rhs_osgViewer)
{
// copy across rhs
_startTick = rhs_osgViewer->_startTick;
_frameStamp = rhs_osgViewer->_frameStamp;
_scene = rhs_osgViewer->_scene;
_cameraManipulator = rhs_osgViewer->_cameraManipulator;
_eventHandlers = rhs_osgViewer->_eventHandlers;
if (rhs_osgViewer->getSceneData())
{
_scene = rhs_osgViewer->_scene;
}
if (rhs_osgViewer->_cameraManipulator.valid())
{
_cameraManipulator = rhs_osgViewer->_cameraManipulator;
}
_eventHandlers.insert(_eventHandlers.end(), rhs_osgViewer->_eventHandlers.begin(), rhs_osgViewer->_eventHandlers.end());
_coordinateSystemNodePath = rhs_osgViewer->_coordinateSystemNodePath;
@@ -196,7 +206,9 @@ void View::take(osg::View& rhs)
rhs_osgViewer->_displaySettings;
}
#endif
computeActiveCoordinateSystemNodePath();
assignSceneDataToCameras();
}
osg::GraphicsOperation* View::createRenderer(osg::Camera* camera)