Changeset 20406

Timestamp:

06/30/07 10:07:57 (1 year ago)

Author:

patrick

Message:

Finished updating for VR Juggler 2.3. Specifically, this revision allows
subclasses of vrj.OsgApp? to override the new getSceneViewDefaults() method.
Bumped the version to 1.3.4.

NOTE: This is a merge of r20223 from the PyJuggler? 1.2 branch.

Files:

• PyJuggler/trunk/ChangeLog (modified) (1 diff)
• PyJuggler/trunk/dist/__init__.py (modified) (1 diff)
• PyJuggler/trunk/src/osgapp/_OsgApp.cpp (modified) (2 diffs)

PyJuggler/trunk/ChangeLog

@@ -1 +1 @@
-DATE        AUTHOR      CHANGE
------------ ----------- -------------------------------------------------------
+Jun-30-2007 patrick     Updated for enhancements to vrj::OsgApp in VR Juggler
+                        2.3.0. This allows subclasses of vrj.OsgApp to override
+                        the getSceneViewDefaults() method.
+                        NEW VERSION: 1.3.4
-Jun-30-2007 patrick     Updated for VPR 1.1.43.
-                        NEW VERSION: 1.3.3

PyJuggler/trunk/dist/__init__.py

@@ -6 +6 @@
-__all__     = ["vrj", "cluster", "gadget", "snx", "jccl", "vpr"]
-__build__   = 1
-3
+4
-__date__    = string.join(string.split('$Date$')[1:3], ' ')
-__author__  = 'Patrick Hartling <patrick@infiscape.com>'

PyJuggler/trunk/src/osgapp/_OsgApp.cpp

@@ -67 +67 @@
-
-      return NULL;
+   }
+
+   osgUtil::SceneView::Options getSceneViewDefaults()
+   {
+      vpr::DebugOutputGuard og(
+         pyjDBG_CXX, vprDBG_VERB_LVL,
+         "vrj_OsgApp_Wrapper::getSceneViewDefaults()\n",
+         "vrj_OsgApp_Wrapper::getSceneViewDefaults() done.\n"
+      );
+      PyJuggler::InterpreterGuard guard;
+
+      try
+      {
+         if ( override getSceneViewDefaults =
+                 this->get_override("getSceneViewDefaults") )
+         {
+            return getSceneViewDefaults();
+         }
+      }
+      catch (error_already_set)
+      {
+         PyErr_Print();
+      }
+
+      return vrj::OsgApp::getSceneViewDefaults();
+   }
+
+   osgUtil::SceneView::Options default_getSceneViewDefaults()
+   {
+      return vrj::OsgApp::getSceneViewDefaults();
-   }
-
@@ -773 +803 @@
-           "get teh current scene to render."
-      )
+      .def("getSceneViewDefaults", &vrj::OsgApp::getSceneViewDefaults,
+           &pyj::vrj_OsgApp_Wrapper::default_getSceneViewDefaults,
+           "getSceneViewDefaults() -> osgUtil.SceneView.Options\n"
+           "Returns the options to be passed to osgUtil.SceneView.setDefaults()\n"
+           "for each scene view that is configured.  This is called by the\n"
+           "default implementation of vrj.OsgApp.configSceneView().  See\n"
+           "osgUtil.SceneView.Options for the available settings."
+      )
-      .def("configSceneView", &vrj::OsgApp::configSceneView,
-           &pyj::vrj_OsgApp_Wrapper::default_configSceneView,