From 441b0c34bd0bf48843bab7a5c4b61880ae427440 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 2 Oct 2007 21:24:23 +0000 Subject: [PATCH] Updated to reflect new CompositeViewer threading models --- examples/osgcompositeviewer/osgcompositeviewer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/osgcompositeviewer/osgcompositeviewer.cpp b/examples/osgcompositeviewer/osgcompositeviewer.cpp index 798caca75..cecf10997 100644 --- a/examples/osgcompositeviewer/osgcompositeviewer.cpp +++ b/examples/osgcompositeviewer/osgcompositeviewer.cpp @@ -137,7 +137,7 @@ int main( int argc, char **argv ) if (!scene) return 1; // construct the viewer. - osgViewer::CompositeViewer viewer; + osgViewer::CompositeViewer viewer(arguments); @@ -285,8 +285,8 @@ int main( int argc, char **argv ) while (arguments.read("-s")) { viewer.setThreadingModel(osgViewer::CompositeViewer::SingleThreaded); } - while (arguments.read("-g")) { viewer.setThreadingModel(osgViewer::CompositeViewer::ThreadPerContext); } - while (arguments.read("-c")) { viewer.setThreadingModel(osgViewer::CompositeViewer::ThreadPerCamera); } + while (arguments.read("-g")) { viewer.setThreadingModel(osgViewer::CompositeViewer::CullDrawThreadPerContext); } + while (arguments.read("-c")) { viewer.setThreadingModel(osgViewer::CompositeViewer::CullThreadPerCameraDrawThreadPerContext); } // run the viewer's main frame loop return viewer.run();