Changeset 20120

Timestamp:

05/03/07 06:41:24 (1 year ago)

Author:

patrick

Message:

Improved stability in multi-pipe/multi-threaded configurations by ensuring
that osgUtil::SceneView::setSceneData() is invoked only once per context
and in a serialized fashion.

Submitted by: Doug McCorkle? < mccdo at iastate dot edu >

Files:

• juggler/trunk/modules/vrjuggler/vrj/Draw/OSG/OsgApp.h (modified) (4 diffs)

juggler/trunk/modules/vrjuggler/vrj/Draw/OSG/OsgApp.h

@@ -35 +35 @@
-
-#include <vrj/Display/CameraProjection.h>
+
+#include <vpr/Sync/Mutex.h>
+#include <vpr/Sync/Guard.h>
-
-#include <osg/Vec3>
@@ -361 +364 @@
-   int mFrameNumber;
-   gadget::PositionInterface mHead;
+   vpr::Mutex mSceneViewLock;
-};
-
@@ -371 +375 @@
-   this->configSceneView(new_sv.get());            // Configure the new viewer
-   new_sv->getState()->setContextID(unique_context_id);
+   // Add the tree to the scene viewer and set properties
+   {
+      vpr::Guard<vpr::Mutex> sv_guard(mSceneViewLock);
+      new_sv->setSceneData(getScene());
+   }
-
-   (*sceneViewer) = new_sv;
@@ -446 +455 @@
-   unsigned y_size = unsigned(vp_sy*float(w_height));
-
-   // Add the tree to the scene viewer and set properties
-   sv->setSceneData(getScene());
-   //sv->setCalcNearFar(false);
-   sv->setComputeNearFarMode(osgUtil::CullVisitor::DO_NOT_COMPUTE_NEAR_FAR);