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

From Riccardo Corsi, introduced CameraManipulator::updateCamera() method that allows more Camera properties to be controlled by the CameraManipulator.

Browse Source
This commit is contained in:
Robert Osfield
2012-07-09 17:32:13 +00:00
parent f784884fd1
commit 65ab874143
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgViewer/CompositeViewer.cpp
View File

@@ -1158,8 +1158,9 @@ void CompositeViewer::updateTraversal()
{
view->setFusionDistance( view->getCameraManipulator()->getFusionDistanceMode(),
view->getCameraManipulator()->getFusionDistanceValue() );
view->getCamera()->setViewMatrix( view->getCameraManipulator()->getInverseMatrix());
view->getCameraManipulator()->updateCamera(view->getCamera());
}
view->updateSlaves();

2
src/osgViewer/Viewer.cpp
View File

@@ -1038,7 +1038,7 @@ void Viewer::updateTraversal()
setFusionDistance( getCameraManipulator()->getFusionDistanceMode(),
getCameraManipulator()->getFusionDistanceValue() );
_camera->setViewMatrix(_cameraManipulator->getInverseMatrix());
_cameraManipulator->updateCamera(_camera);
}
updateSlaves();