From aebf0de6f21cfedfec9ce9087173651d06c6fa2e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 4 Jan 2007 21:51:10 +0000 Subject: [PATCH] Removed now redundent calls to set up view --- examples/osgcamera/osgcamera.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/examples/osgcamera/osgcamera.cpp b/examples/osgcamera/osgcamera.cpp index 6294a681b..33f8a122b 100644 --- a/examples/osgcamera/osgcamera.cpp +++ b/examples/osgcamera/osgcamera.cpp @@ -62,9 +62,6 @@ void singleWindowMultipleCameras(osgViewer::Viewer& viewer) viewer.addSlave(camera.get(), osg::Matrixd(), osg::Matrixd::scale(aspectRatioScale,1.0,1.0)); } - - viewer.setUpRenderingSupport(); - viewer.assignSceneDataToCameras(); } void multipleWindowMultipleCameras(osgViewer::Viewer& viewer) @@ -122,9 +119,6 @@ void multipleWindowMultipleCameras(osgViewer::Viewer& viewer) viewer.addSlave(camera.get(), osg::Matrix::scale(aspectRatioScale, 1.0, 1.0)*osg::Matrix::translate(translate_x, 0.0, 0.0), osg::Matrix() ); } - - viewer.setUpRenderingSupport(); - viewer.assignSceneDataToCameras(); } int main( int argc, char **argv ) @@ -164,27 +158,24 @@ int main( int argc, char **argv ) while (arguments.read("-g")) { viewer.setThreadingModel(osgViewer::Viewer::ThreadPerContext); } while (arguments.read("-c")) { viewer.setThreadingModel(osgViewer::Viewer::ThreadPerCamera); } - viewer.setSceneData(loadedModel.get()); +// viewer.setSceneData(loadedModel.get()); if (apm.valid()) viewer.setCameraManipulator(apm.get()); else viewer.setCameraManipulator( new osgGA::TrackballManipulator() ); -#if 0 +#if 1 // singleWindowMultipleCameras(viewer); multipleWindowMultipleCameras(viewer); - - -#else - - viewer.setUpViewAcrossAllScreens(); #endif - + + viewer.setSceneData(loadedModel.get()); + viewer.realize(); - bool limitNumberOfFrames = true; + bool limitNumberOfFrames = false; unsigned int numFrames = 0; unsigned int maxFrames = 10;