Changeset 19942

Timestamp:

04/11/07 18:38:48 (2 years ago)

Author:

patrick

Message:

Updated for Gadgeteer 1.1.24 and VR Juggler 2.1.21. Bumped PyJuggler? version
to 1.1.14.

Files:

• PyJuggler/trunk/ChangeLog (modified) (1 diff)
• PyJuggler/trunk/configure.ac (modified) (1 diff)
• PyJuggler/trunk/dist/__init__.py (modified) (1 diff)
• PyJuggler/trunk/src/gadget/_Event.cpp (modified) (2 diffs)
• PyJuggler/trunk/src/gadget/_KeyEvent.cpp (modified) (6 diffs)
• PyJuggler/trunk/src/gadget/_MouseEvent.cpp (modified) (9 diffs)
• PyJuggler/trunk/src/vrj/_Display.cpp (modified) (3 diffs)
• PyJuggler/trunk/src/vrj/_SimViewport.cpp (modified) (1 diff)
• PyJuggler/trunk/src/vrj/_Viewport.cpp (modified) (1 diff)

PyJuggler/trunk/ChangeLog

@@ -1 +1 @@
-DATE        AUTHOR      CHANGE
------------ ----------- -------------------------------------------------------
+Apr-11-2007 patrick     Updated for Gadgeteer 1.1.24.
+                        NEW VERSION: 1.1.14
-Dec-18-2006 patrick     Exposed vrj::D3dApp (Windows only). This requires
-                        VR Juggler 2.1.16 or newer.

PyJuggler/trunk/configure.ac

@@ -414 +414 @@
-              [AC_MSG_ERROR([*** JCCL is required for PyJuggler ***])])
-SNX_PATH([0.5.0], , [AC_MSG_ERROR([*** Sonix is required for PyJuggler ***])])
-0
+4
-               [AC_MSG_ERROR([*** Gadgeteer is required for PyJuggler ***])])
-12
+21
-               [AC_MSG_ERROR([*** VR Juggler is required for PyJuggler ***])])
-

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/gadget/_Event.cpp

@@ -113 +113 @@
-      )
-      .def("type", &gadget::Event::type,
-           return_value_policy<copy_const_reference>(),
-           "type() -> gadget.EventType object\n"
-           "Returns the type of this event.  This can be used for dynamic\n"
@@ -128 +127 @@
-      )
-      .def("time", &gadget::Event::time,
-           return_value_policy<copy_const_reference>(),
-           "time() -> int\n"
-           "Returns the time at which the event occurred."

PyJuggler/trunk/src/gadget/_KeyEvent.cpp

@@ -27 +27 @@
-   }
-
-& p0, const gadget::Keys&
-& p2, const long unsigned int&
+ p0, const gadget::Keys
+ p2, const long unsigned int
-      : gadget::KeyEvent(p0, p1, p2, p3)
-   {
@@ -34 +34 @@
-   }
-
-
-
+
+
+
-      : gadget::KeyEvent(p0, p1, p2, p3, p4)
+   {
+      /* Do nothing. */ ;
+   }
+
+   gadget_KeyEvent_Wrapper(const gadget::EventType p0, const gadget::Keys p1,
+                           const int p2, const long unsigned int p3,
+                           const char p4, const wchar_t p5)
+      : gadget::KeyEvent(p0, p1, p2, p3, p4, p5)
-   {
-      /* Do nothing. */ ;
@@ -126 +135 @@
-          "Initializes data members.\n"
-          "Arguments:\n"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-       )
-      )
-      .def(init<const gadget::KeyEvent&>())
-
-
+
+
+
+
+
-      .def("writeObject", &gadget::KeyEvent::writeObject,
-           &pyj::gadget_KeyEvent_Wrapper::default_writeObject,
@@ -157 +172 @@
-      )
-      .def("getKey", &gadget::KeyEvent::getKey,
-           return_value_policy<copy_const_reference>(),
-           "getKey() -> gadget.Key object\n"
-           "Gets the key that was pressed while generating this event."
-      )
-      .def("getModifierMask", &gadget::KeyEvent::getModifierMask,
-           return_value_policy<copy_const_reference>(),
-           "getModifierMask() -> int\n"
-           "Returns the modifier mask for this event.  This tells which\n"
@@ -170 +183 @@
-      )
-      .def("getKeyChar", &gadget::KeyEvent::getKeyChar,
-           return_value_policy<copy_const_reference>(),
-           "getKeyChar() -> character\n"
-           "Returns the ASCII character corresponding to the key that was\n"
-           "pressed."
-      )
+      .def("getKeyUnicode", &gadget::KeyEvent::getKeyUnicode,
+           "getKeyUnicode() -> Unicode character\n"
+           "Returns the Unicode character corresponding to the key that was\n"
+           "pressed."
+      )
-      .def("type", &gadget::Event::type,
-           return_value_policy<copy_const_reference>(),
-           "type() -> gadget.EventType object\n"
-           "Returns the type of this event.  This can be used for dynamic\n"
@@ -191 +207 @@
-      )
-      .def("time", &gadget::Event::time,
-           return_value_policy<copy_const_reference>(),
-           "time() -> int\n"
-           "Returns the time at which the event occurred."

PyJuggler/trunk/src/gadget/_MouseEvent.cpp

@@ -29 +29 @@
-   }
-
-&
-& p1, const int&
-& p3, const int& p4, const int&
-& p6, const long unsigned int&
+
+ p1, const int
+ p3, const int p4, const int
+ p6, const long unsigned int
-      : gadget::MouseEvent(p0, p1, p2, p3, p4, p5, p6, p7)
-   {
@@ -147 +147 @@
-      )
-      .def(init<const gadget::MouseEvent&>())
-&, const gadget::Keys&, const int&
-&, const int&, const int&, const int&
-&
+, const gadget::Keys, const int
+, const int, const int, const int
+
-      .def("writeObject", &gadget::MouseEvent::writeObject,
-           &pyj::gadget_MouseEvent_Wrapper::default_writeObject,
@@ -161 +161 @@
-      )
-      .def("getButton", &gadget::MouseEvent::getButton,
-           return_value_policy<copy_const_reference>(),
-           "getButton() -- gadget.Keys value\n"
-      )
-      .def("getX", &gadget::MouseEvent::getX,
-           return_value_policy<copy_const_reference>(),
-           "getX() -> int\n"
-           "Returns the X coordinate of the mouse pointer relative to the\n"
@@ -171 +169 @@
-      )
-      .def("getY", &gadget::MouseEvent::getY,
-           return_value_policy<copy_const_reference>(),
-           "getY() -> int\n"
-           "Returns the Y coordinate of the mouse pointer relative to the\n"
@@ -177 +174 @@
-      )
-      .def("getGlobalX", &gadget::MouseEvent::getGlobalX,
-           return_value_policy<copy_const_reference>(),
-           "getGlobalX() -> int\n"
-           "Returns the X coordinate of the mouse pointer relative to the\n"
@@ -183 +179 @@
-      )
-      .def("getGlobalY", &gadget::MouseEvent::getGlobalY,
-           return_value_policy<copy_const_reference>(),
-           "getGlobalY() -> int\n"
-           "Returns the Y coordinate of the mouse pointer relative to the\n"
@@ -189 +184 @@
-      )
-      .def("getState", &gadget::MouseEvent::getState,
-           return_value_policy<copy_const_reference>(),
-           "getState() -> int\n"
-           "Returns the state of the mouse buttons and keyboard modifier\n"
@@ -195 +189 @@
-      )
-      .def("type", &gadget::Event::type,
-           return_value_policy<copy_const_reference>(),
-           "type() -> gadget.EventType object\n"
-           "Returns the type of this event.  This can be used for dynamic\n"
@@ -210 +203 @@
-      )
-      .def("time", &gadget::Event::time,
-           return_value_policy<copy_const_reference>(),
-           "time() -> int\n"
-           "Returns the time at which the event occurred."

PyJuggler/trunk/src/vrj/_Display.cpp

@@ -20 +20 @@
-struct vrj_Display_Wrapper : vrj::Display, wrapper<vrj::Display>
-{
-   vrj_Display_Wrapper(const vrj::Display& p0)
-      : vrj::Display(p0)
-   {
-      /* Do nothing. */ ;
-   }
-
-   vrj_Display_Wrapper()
-      : vrj::Display()
-   {
-      /* Do nothing. */ ;
-   }
-
-   virtual ~vrj_Display_Wrapper()
-   {
@@ -51 +39 @@
-void _Export_Display()
-{
-
+
+
-       "Container class for viewports and window information.  This stores\n"
-       "the size and location of the window and the viewports contained\n"
-       "within."
-       ,
-init<>()
+no_init
-      )
-
+
+
+
+
-      .def("isActive", &vrj::Display::isActive,
-           "isActive() -> Boolean\n"
@@ -94 +86 @@
-      )
-//      .def(self_ns::str(self))
+      .staticmethod("create")
-   ;
-}

PyJuggler/trunk/src/vrj/_SimViewport.cpp

@@ -89 +89 @@
-           "                 units."
-      )
-
-
+
-   ;
-}

PyJuggler/trunk/src/vrj/_Viewport.cpp

@@ -123 +123 @@
-      )
-      .def("getDisplay", &vrj::Viewport::getDisplay,
-           return_internal_reference<1>(),
-           "getDisplay() -> vrj.Display object\n"
-           "Gets the display contaning this viewprot."