Changeset 20202

Timestamp:

05/11/07 09:26:14 (2 years ago)

Author:

dshipton

Message:

Changes needed for OpenSG 2. OpenSG2 uses a RenderTraversalAction? instead
of a RenderAction?.

Files:

• juggler/trunk/modules/vrjuggler/vrj/Draw/OpenSG/OpenSGApp.h (modified) (5 diffs)

juggler/trunk/modules/vrjuggler/vrj/Draw/OpenSG/OpenSGApp.h

@@ -37 +37 @@
-#include <OpenSG/OSGConfig.h>
-#include <OpenSG/OSGThread.h>
-#include <OpenSG/OSGRenderAction.h>
-#include <OpenSG/OSGMatrixCamera.h>
-#include <OpenSG/OSGPassiveWindow.h>
@@ -43 +42 @@
-#include <OpenSG/OSGPassiveBackground.h>
-#include <OpenSG/OSGMatrixUtility.h>
+
+#if OSG_MAJOR_VERSION >= 2
+#include <OpenSG/OSGRenderTraversalAction.h>
+#else
+#include <OpenSG/OSGRenderAction.h>
+#endif
-
-/*----------------------------------------------------------------------------*/
@@ -67 +72 @@
-         ;
-      }
-
+
+
+
-      OSG::RenderAction*         mRenderAction;    /**< The render action for the scene */
+#endif
+
-      OSG::PassiveWindowPtr      mWin;             /**< passive window to render with (the context) */
-      OSG::PassiveViewportPtr    mViewport;        /**< passive viewport to render with (the context) */
@@ -253 +262 @@
-
-   // Could actually make one of these per thread instead of context.
+#if OSG_MAJOR_VERSION >= 2
+   c_data->mRenderAction = OSG::RenderTraversalAction::create();
+#else
-   c_data->mRenderAction = OSG::RenderAction::create();
+#endif
-   // c_data->mRenderAction->setAutoFrustum(false);         // Turn off auto frustum
-
@@ -336 +349 @@
-
-   glPopAttrib();    // Pop the attribute store
-
+
-   FINFO(("Frame done on Window %lx.\n", c_data->mWin.getCPtr() ));
+#endif
-}
-