Changeset 167 in flair-src for trunk/lib/FlairSensorActuator/src/unexported

Timestamp:

Apr 12, 2017, 1:59:38 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

Location:

trunk/lib/FlairSensorActuator/src/unexported

Files:

• VrpnClient_impl.h (modified) (2 diffs)
• VrpnObject_impl.h (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/unexported/VrpnClient_impl.h

@@ -21 +21 @@
 #include <string>
 #include <vector>
+#include "Vector3D.h"
 
 namespace flair {
 namespace core {
 class OneAxisRotation;
-class Vector3D;
 class Quaternion;
 class Mutex;
@@ -54 +54 @@
   void AddTrackable(VrpnObject_impl *obj, uint8_t id);  // xbee
   void RemoveTrackable(VrpnObject_impl *obj);           // normal+xbee
-  void ComputeRotations(flair::core::Vector3D &point);
+  void ComputeRotations(flair::core::Vector3Df &point);
   void ComputeRotations(flair::core::Quaternion &quat);
   bool UseXbee(void);

trunk/lib/FlairSensorActuator/src/unexported/VrpnObject_impl.h

@@ -24 +24 @@
 #include <vrpn_Tracker.h>
 #include "Quaternion.h"
+#include "Vector3D.h"
 
 namespace flair {
         namespace core {
                 class cvmatrix;
-                class Vector3D;
         }
         namespace gui {
@@ -51 +51 @@
 
   void GetQuaternion(flair::core::Quaternion &quaternion);
-  void GetPosition(flair::core::Vector3D &point);
+  void GetPosition(flair::core::Vector3Df &point);
   bool IsTracked(unsigned int timeout_ms);