Changeset 7990 for OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

Timestamp:

03/25/08 12:50:28 (5 years ago)

Author:

robert

Message:

From Wojciech Leandowski, "I removed few lines of code that were setting Threading mode and Screen mode. I believe they are now not neccessary because the same does osgViewer::Viewer argument parser. In fact argument list does not contain these args after they were parsed by osgViewer::Viewer constructor.

I also allowed myself to add ThreadingHandler? to the example."

Files:

• OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp

@@ -515 +515 @@
     arguments.getApplicationUsage()->addCommandLineOption("--two-pass", "Use two-pass stencil for shadow volumes.");
 
-
     // construct the viewer.
     osgViewer::Viewer viewer(arguments);
@@ -525 +524 @@
         return 1;
     }
-
-    // default to single threaded during dev work.
-    viewer.setThreadingModel(osgViewer::Viewer::SingleThreaded);
-
-    while (arguments.read("--SingleThreaded")) viewer.setThreadingModel(osgViewer::Viewer::SingleThreaded);
-    while (arguments.read("--CullDrawThreadPerContext")) viewer.setThreadingModel(osgViewer::Viewer::CullDrawThreadPerContext);
-    while (arguments.read("--DrawThreadPerContext")) viewer.setThreadingModel(osgViewer::Viewer::DrawThreadPerContext);
-    while (arguments.read("--CullThreadPerCameraDrawThreadPerContext")) viewer.setThreadingModel(osgViewer::Viewer::CullThreadPerCameraDrawThreadPerContext);
-
 
     bool postionalLight = true;
@@ -541 +531 @@
     bool updateLightPosition = true;
     while (arguments.read("--noUpdate")) updateLightPosition = false;
-
-
-    int screenNum = -1;
-    while (arguments.read("--screen", screenNum)) viewer.setUpViewOnSingleScreen(screenNum);
 
     // set up the camera manipulators.
@@ -581 +567 @@
     viewer.addEventHandler(new osgViewer::RecordCameraPathHandler);
 
+    // add the threading handler
+    viewer.addEventHandler( new osgViewer::ThreadingHandler() );
 
     osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene = new osgShadow::ShadowedScene;
@@ -586 +574 @@
     shadowedScene->setReceivesShadowTraversalMask(ReceivesShadowTraversalMask);
     shadowedScene->setCastsShadowTraversalMask(CastsShadowTraversalMask);
-
 
     if (arguments.read("--sv"))