Changeset 59

Timestamp:

01/20/09 11:32:15 (3 years ago)

Author:

kriege

Message:

added vrpn client to avango-daemon, use VRPN_SUPPORT option to compile

Location:

trunk

Files:

• SConstruct (modified) (1 diff)
• avango-build/src/avango/build/recipes.py (modified) (1 diff)
• avango-daemon/SConscript (modified) (1 diff)
• avango-daemon/include/avango/daemon/Config.h.in (modified) (1 diff)
• avango-daemon/include/avango/daemon/SConscript (modified) (1 diff)
• avango-daemon/include/avango/daemon/VRPNClient.h (added)
• avango-daemon/python/__init__.py (modified) (3 diffs)
• avango-daemon/python/_daemon.cpp (modified) (5 diffs)
• avango-daemon/src/avango/daemon/Init.cpp (modified) (3 diffs)
• avango-daemon/src/avango/daemon/SConscript (modified) (3 diffs)
• avango-daemon/src/avango/daemon/VRPNClient.cpp (added)

trunk/SConstruct

@@ -53 +53 @@
     BoolOption('CONNECT_CSHARP_SUPPORT',
                'Enable C# support for the connect module',
+               False),
+    BoolOption('VRPN_SUPPORT',
+               'Enable VRPN support for the AvangoDaemon module',
                False),
     )

trunk/avango-build/src/avango/build/recipes.py

@@ -74 +74 @@
     #add common libs (plain)
     _config_store.set('xerces', PlainConfig(libraries = ['xerces-c']))
-
+    _config_store.set('vrpn', PlainConfig(libraries = ['vrpn']))
+    
     # Dummy packages
     _config_store.set('osgUtil', PlainConfig(libraries = ['']))

trunk/avango-daemon/SConscript

@@ -33 +33 @@
     'PREFIX': avango.build.get_prefix().abspath,
     'AVANGO_DAEMON_DEBUG': int(daemon_env['DEBUG']),
+    'AVANGO_DAEMON_VRPN_SUPPORT': int(daemon_env['VRPN_SUPPORT']),
     'PKG_CONFIG_REQUIRES': 'avango-core, avango-osg',
     'AVANGO_DAEMON_VERSION': '1.90.0',

trunk/avango-daemon/include/avango/daemon/Config.h.in

@@ -38 +38 @@
 #endif
 
+#if %(AVANGO_DAEMON_VRPN_SUPPORT)s
+#define VRPN_SUPPORT 1
+#else
+#undef VRPN_SUPPORT
+#endif
+
 #define AVANGO_DAEMON_VERSION_MAJOR %(AVANGO_DAEMON_VERSION_MAJOR)s
 #define AVANGO_DAEMON_VERSION_MINOR %(AVANGO_DAEMON_VERSION_MINOR)s

trunk/avango-daemon/include/avango/daemon/SConscript

@@ -44 +44 @@
     WiimoteActuator.h
     ''')
+ 
+if avango.build.Environment()['VRPN_SUPPORT']:
+    headers += Split('''
+        VRPNClient.h
+        ''')
 
 Alias('install-daemon', Install(avango.build.get_include_path('avango/daemon'), headers))

trunk/avango-daemon/python/__init__.py

@@ -59 +59 @@
     To communicate with a Wacom tablet.
 
+VRPNClient
+    A VRPN client consisting of vrpn_Tracker, vrpn_Button and vrpn_Analog devices.
+    Note: This device is linked to the vrpn library.
+    (http://www.cs.unc.edu/Research/vrpn)
+
 
 Examples
 ========
 
-There are some basic examples that show the configuration and usage of
-these input devices in examples/daemon within your Avango NG installation.
+There are some basic examples within your Avango NG installation,
+that show the configuration and usage of these input devices.
 '''
 
@@ -73 +78 @@
 from _daemon import _WiimoteHelper
 from _daemon import _DTrackHelper
+from _daemon import _VRPNClientHelper
 
 import avango.nodefactory
@@ -193 +199 @@
 
     stations = property(StationProxy)
+
+class VRPNClient(_VRPNClientHelper):
+    """Avango NG device for processing data sent by a VRPN server. This
+    client consists of vrpn_Tracker, vrpn_Button and vrpn_Analog devices."""
+    def __init__(self):
+        super(VRPNClient, self).__init__()
+        self._station = None
+
+    def get_station(self):
+        return self._station
+
+    def set_station(self, st):
+        self._station = st
+        self.add_station(0, st.name)
+
+    station = property(get_station, set_station)

trunk/avango-daemon/python/_daemon.cpp

@@ -24 +24 @@
 \************************************************************************/
 
+#include <avango/daemon/Config.h>
 #include <avango/daemon/DeviceDaemon.h>
 #include <avango/daemon/DeviceSensor.h>
@@ -38 +39 @@
 #include <boost/mpl/vector.hpp>
 
+#ifdef VRPN_SUPPORT
+#include <avango/daemon/VRPNClient.h>
+#endif
+
 using namespace boost::python;
 using namespace av::python;
@@ -75 +80 @@
   std::string getPortFeature(av::daemon::Device* self) { return self->queryFeature("port"); }
   std::string getToggleResetFeature(av::daemon::Device* self) { return self->queryFeature("toggle-reset"); }
-
+  std::string getServerFeature(av::daemon::Device* self) { return self->queryFeature("server"); }
+  
   // wrapper for specialized configureFeature calls, required by .add_property
   std::string parseBoolString(std::string value)
@@ -91 +97 @@
   void setPortFeature(av::daemon::Device* self, std::string value) { self->configureFeature("port", value); }
   void setToggleResetFeature(av::daemon::Device* self, std::string value) { self->configureFeature("toggle-reset", parseBoolString(value)); }
-
+  void setServerFeature(av::daemon::Device* self, std::string value) { self->configureFeature("server", value); }
+  
   // set LED states
   void setLED(av::daemon::HIDInput* self, int number, int value)
@@ -199 +206 @@
     ;
 
+  // Avango NG device: VRPNClient
+  class_<av::daemon::VRPNClient, av::Link<av::daemon::VRPNClient>, bases<av::daemon::Device>, boost::noncopyable >("_VRPNClientHelper",
+    "A helper class used to construct a concrete Python VRPN client device representation.")
+    .add_property("server", &::getServerFeature, &::setServerFeature)
+    ;
+  
   // start the daemon
   def("run", &::run);

trunk/avango-daemon/src/avango/daemon/Init.cpp

@@ -28 +28 @@
 #include <avango/Logger.h>
 
+#include <avango/daemon/Config.h>
 #include <avango/daemon/Device.h>
 #include <avango/daemon/DeviceActuator.h>
@@ -38 +39 @@
 #include <avango/daemon/Wiimote.h>
 #include <avango/daemon/WiimoteActuator.h>
+
+#ifdef VRPN_SUPPORT
+#include <avango/daemon/VRPNClient.h>
+#endif
 
 namespace
@@ -62 +67 @@
     av::daemon::WiimoteActuator::initClass();
 
+#ifdef VRPN_SUPPORT
+    av::daemon::VRPNClient::initClass();
+#endif
+
     AV_TYPED_INIT_ABSTRACT(av::Type::badType(), "av::daemon::Init", true);
   }

trunk/avango-daemon/src/avango/daemon/SConscript

@@ -26 +26 @@
 import avango.build
 
+daemon_env = avango.build.Environment()
+
 # Sources section
 lib_sources = Split('''
@@ -46 +48 @@
     ''')
 
+if daemon_env['VRPN_SUPPORT']:
+    lib_sources += Split('''
+        VRPNClient.cpp
+        ''')
+
 # append external sources
 lib_sources.append(Split('''
@@ -54 +61 @@
 
 # Rules section
-daemon_env = avango.build.Environment()
 if 'icpc' in daemon_env['CXX']:
     daemon_env.Append(CXXFLAGS='-wd593')
 avango.build.add_library(daemon_env, 'avango-core')
 avango.build.add_library(daemon_env, 'avango-osg')
+
+if daemon_env['VRPN_SUPPORT']:
+    avango.build.add_library(daemon_env, 'vrpn')
+
 lib = daemon_env.SharedLibrary('avangoDaemon', lib_sources)