Changeset 167 in flair-src for trunk/lib/FlairMeta/src/MetaVrpnObject.cpp

Timestamp:

04/12/17 13:59:38 (6 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

File:

• trunk/lib/FlairMeta/src/MetaVrpnObject.cpp (modified) (4 diffs)

trunk/lib/FlairMeta/src/MetaVrpnObject.cpp

@@ -28 +28 @@
 #include <TabWidget.h>
 #include <cvmatrix.h>
-#include <Vector3D.h>
 
 using std::string;
@@ -55 +54 @@
     desc->SetElementName(i, 0, Output()->Name(i, 0));
   }
-  cvmatrix *prev_value = new cvmatrix(this, desc, elementDataType, name);
+  cvmatrix *prev_value = new cvmatrix(this, desc, floatType, name);
   delete desc;
 
@@ -66 +65 @@
     desc->SetElementName(i, 0, "d" + Output()->Name(i, 0));
   }
-  prev_value = new cvmatrix(this, desc, elementDataType, name);
+  prev_value = new cvmatrix(this, desc, floatType, name);
   delete desc;
 
@@ -95 +94 @@
 DataPlot2D *MetaVrpnObject::XyPlot(void) const { return xy_plot; }
 
-void MetaVrpnObject::GetSpeed(Vector3D &speed) const {
+void MetaVrpnObject::GetSpeed(Vector3Df &speed) const {
   speed.x = euler->Output(4, 0);
   speed.y = euler->Output(5, 0);