Changeset 19804

Timestamp:

02/08/07 11:15:44 (2 years ago)

Author:

dshipton

Message:

OpenSG2 uses Thread::getCurrentAspect() instead of getAspect() so recognize when

we are compiling against OpenSG2 and act accordingly. This may not be needed i

n the future when OpenSG2 is used and built with OSG_1_COMPAT, but this change w
ill be more reliable for all OpenSG2 builds.

Files:

• juggler/trunk/modules/vrjuggler/vrj/Draw/OpenSG/OpenSGApp.h (modified) (1 diff)

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

@@ -174 +174 @@
-#endif
-
+#if OSG_MAJOR_VERSION >= 2
+   OSG_MAIN_ASPECT_ID = OSG::Thread::getCurrentAspect();   // Gets the base aspect id to use
+#else
-   OSG_MAIN_ASPECT_ID = OSG::Thread::getAspect();   // Gets the base aspect id to use
+#endif
-}
-