Changeset 167 in flair-src for trunk/lib/FlairSimulator

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

Location:

trunk/lib/FlairSimulator/src

Files:

• FixedCamera.cpp (modified) (3 diffs)
• FixedCamera.h (modified) (1 diff)
• Gui.cpp (modified) (2 diffs)
• Gui.h (modified) (4 diffs)
• Man.cpp (modified) (1 diff)
• Model.cpp (modified) (1 diff)
• Model.h (modified) (2 diffs)
• Model_impl.cpp (modified) (1 diff)
• Parser.cpp (modified) (1 diff)
• Parser.h (modified) (2 diffs)
• SimuUsGL.cpp (modified) (1 diff)
• Simulator.cpp (modified) (1 diff)
• Simulator.h (modified) (3 diffs)
• X4.cpp (modified) (2 diffs)
• X8.cpp (modified) (1 diff)
• unexported/Model_impl.h (modified) (1 diff)

trunk/lib/FlairSimulator/src/FixedCamera.cpp

@@ -35 +35 @@
 namespace simulator {
 
-FixedCamera::FixedCamera(std::string name,core::Vector3D position,core::Vector3D lookat,float inRotateSpeed,float inZoomSpeed):VisualizationCamera(name)  {
+FixedCamera::FixedCamera(std::string name,core::Vector3Df position,core::Vector3Df lookat,float inRotateSpeed,float inZoomSpeed):VisualizationCamera(name)  {
   Rotating = false;
   rotateSpeed=inRotateSpeed;
@@ -62 +62 @@
 
       //normal between target and up vector
-      cameraAxeY=target.crossProduct(irr::core::vector3df(0,0,1));
+      cameraAxeY=target.crossProduct(vector3df(0,0,1));
       cameraAxeY.normalize();
 
@@ -81 +81 @@
 
       //check angle
-      irr::core::vector3df newTarget(q3.X,q3.Y,q3.Z);
-      float angle=acos(newTarget.dotProduct(irr::core::vector3df(0,0,1))/newTarget.getLength());
-      irr::core::vector3df cross = newTarget.crossProduct(irr::core::vector3df(0,0,1));
+      vector3df newTarget(q3.X,q3.Y,q3.Z);
+      float angle=acos(newTarget.dotProduct(vector3df(0,0,1))/newTarget.getLength());
+      vector3df cross = newTarget.crossProduct(vector3df(0,0,1));
       if (cross.dotProduct(cameraAxeY) > 0) {
         newTarget += camera->getAbsolutePosition();

trunk/lib/FlairSimulator/src/FixedCamera.h

@@ -26 +26 @@
 class FixedCamera : public VisualizationCamera {
 public:
-  FixedCamera(std::string name,core::Vector3D position,core::Vector3D lookat=core::Vector3D(0,0,0),float rotateSpeed = -3.0f, float zoomSpeed = .05f);
+  FixedCamera(std::string name,core::Vector3Df position,core::Vector3Df lookat=core::Vector3Df(0,0,0),float rotateSpeed = -3.0f, float zoomSpeed = .05f);
   ~FixedCamera();
 

trunk/lib/FlairSimulator/src/Gui.cpp

@@ -109 +109 @@
 }
 
-vector3df ToIrrlichtCoordinates(Vector3D vect) {
+template<typename T> vector3df ToIrrlichtCoordinates(Vector3D<T> vect) {
   return ToIrrlichtScale(1) * vector3df(vect.x, vect.y, -vect.z);
 }
 
-Vector3D ToSimulatorCoordinates(vector3df vect) {
-  return ToSimulatorScale(1) * Vector3D(vect.X, vect.Y, -vect.Z);
+Vector3Df ToSimulatorCoordinates(vector3df vect) {
+  return ToSimulatorScale(1) * Vector3Df(vect.X, vect.Y, -vect.Z);
 }
 
@@ -132 +132 @@
   return Quaternion(quat.q0, -quat.q1, -quat.q2, quat.q3);
 }
+
+
+template irr::core::vector3df ToIrrlichtCoordinates(core::Vector3D<double>);
+template irr::core::vector3df ToIrrlichtCoordinates(core::Vector3D<float>);
 
 Gui::Gui(std::string name, int app_width,

trunk/lib/FlairSimulator/src/Gui.h

@@ -19 +19 @@
 
 #include <Object.h>
+#include <Vector3D.h>
 #include <EDriverTypes.h>
 #include <vector3d.h>
@@ -36 +37 @@
 namespace core {
 class Object;
-class Vector3D;
 class Euler;
 class Quaternion;
@@ -125 +125 @@
 * \return vector in irrlicht coordinates
 */
-irr::core::vector3df ToIrrlichtCoordinates(core::Vector3D vect);
+template<typename T>  irr::core::vector3df ToIrrlichtCoordinates(core::Vector3D<T> vect);
 
 /*!
@@ -136 +136 @@
 * \return vector in simulator coordinates
 */
-core::Vector3D ToSimulatorCoordinates(irr::core::vector3df vect);
+core::Vector3Df ToSimulatorCoordinates(irr::core::vector3df vect);
 
 /*!

trunk/lib/FlairSimulator/src/Man.cpp

@@ -73 +73 @@
   state[0].Quat.Normalize();
 
-  Vector3D dir = state[0].Vel;
+  Vector3D<double> dir = state[0].Vel;
   dir.Rotate(state[0].Quat);
   state[0].Pos = state[-1].Pos + dT() * dir;

trunk/lib/FlairSimulator/src/Model.cpp

@@ -69 +69 @@
 TabWidget *Model::GetTabWidget(void) const { return pimpl_->tabwidget; }
 
-float Model::dT(void) const { return pimpl_->dT->Value(); }
+double Model::dT(void) const { return pimpl_->dT->Value(); }
 
 int Model::GetId(void) const {

trunk/lib/FlairSimulator/src/Model.h

@@ -69 +69 @@
   typedef struct simu_state {
     core::Quaternion Quat;
-    core::Vector3D W;
-    core::Vector3D Pos;
-    core::Vector3D Vel;
+    core::Vector3Df W;
+    core::Vector3D<double> Pos;
+    core::Vector3D<double> Vel;
   } simu_state_t;
 
@@ -96 +96 @@
 protected:
   DiscreteTimeVariable<simu_state_t, 3> state;
-  float dT(void) const;
+  double dT(void) const;
   virtual void CalcModel(void) = 0;
 #ifdef GL

trunk/lib/FlairSimulator/src/Model_impl.cpp

@@ -160 +160 @@
   states_mutex->GetMutex();
   Quaternion quat = getSimulator()->ToVRPNReference(self->state[0].Quat);
-  Vector3D position = getSimulator()->ToVRPNReference(self->state[0].Pos);
+  Vector3D<double> position = getSimulator()->ToVRPNReference(self->state[0].Pos);
   states_mutex->ReleaseMutex();
 

trunk/lib/FlairSimulator/src/Parser.cpp

@@ -210 +210 @@
 }
 
-Vector3D Parser::getMeshVector3D(xmlNode *mesh_node, xmlChar *param) {
+Vector3Df Parser::getMeshVector3D(xmlNode *mesh_node, xmlChar *param) {
   xmlNode *cur_node = NULL;
   for (cur_node = mesh_node; cur_node; cur_node = cur_node->next) {
     if (xmlStrEqual(cur_node->name, param)) {
-      return Vector3D(atof((char *)xmlGetProp(cur_node, (xmlChar *)"x")),
+      return Vector3Df(atof((char *)xmlGetProp(cur_node, (xmlChar *)"x")),
                        atof((char *)xmlGetProp(cur_node, (xmlChar *)"y")),
                        atof((char *)xmlGetProp(cur_node, (xmlChar *)"z")));
     }
   }
-  return Vector3D(0, 0, 0);
+  return Vector3Df(0, 0, 0);
 }
 

trunk/lib/FlairSimulator/src/Parser.h

@@ -19 +19 @@
 
 #include <Gui.h>
+#include <Vector3D.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <SColor.h>
-
-namespace flair {
-  namespace core {
-    class Vector3D;
-  }
-}
 
 namespace flair {
@@ -53 +48 @@
   irr::core::vector3df getSceneVect(xmlNode *mesh_node, xmlChar *param,
                                     bool isScale = false);
-  core::Vector3D getMeshVector3D(xmlNode *mesh_node, xmlChar *param);
+  core::Vector3Df getMeshVector3D(xmlNode *mesh_node, xmlChar *param);
 };
 }

trunk/lib/FlairSimulator/src/SimuUsGL.cpp

@@ -43 +43 @@
   position = new Vector3DSpinBox(setup_tab->NewRow(), "position", -2, 2, .01);
   direction = new Vector3DSpinBox(setup_tab->NewRow(), "direction", -2, 2, .01);
-  range = new DoubleSpinBox(setup_tab->NewRow(), "range:", 0, 6, 1);
+  range = new DoubleSpinBox(setup_tab->NewRow(), "range:", 0, 1000, 1,0,6.);
 }
 

trunk/lib/FlairSimulator/src/Simulator.cpp

@@ -56 +56 @@
 }
 
-Vector3D Simulator::ToVRPNReference(Vector3D point_in) {
+Vector3D<double> Simulator::ToVRPNReference(Vector3D<double> point_in) {
   Quaternion yaw_rot_quat;
   Euler yaw_rot_euler(

trunk/lib/FlairSimulator/src/Simulator.h

@@ -19 +19 @@
 
 #include <FrameworkManager.h>
+#include <Vector3D.h>
 #include <stdint.h>
 
@@ -27 +28 @@
 namespace core {
 class Quaternion;
-class Vector3D;
 }
 }
@@ -53 +53 @@
   // coordinate, around z axis
   core::Quaternion ToVRPNReference(core::Quaternion quat_in);
-  core::Vector3D ToVRPNReference(core::Vector3D point_in);
+  core::Vector3D<double> ToVRPNReference(core::Vector3D<double> point_in);
 
 private:

trunk/lib/FlairSimulator/src/X4.cpp

@@ -282 +282 @@
   u_thrust = k_mot->Value() * (fl_speed * fl_speed + fr_speed * fr_speed +
                                rl_speed * rl_speed + rr_speed * rr_speed);
-  Vector3D vect(0, 0, -u_thrust);
+  Vector3D<double> vect(0, 0, -u_thrust);
   vect.Rotate(state[0].Quat);
 
@@ -291 +291 @@
       ** ===================================================================
       */
+      
   state[0].Pos.x =
       (dT() * dT() / m->Value()) *
-          (vect.x -
-           f_air_lat->Value() * (state[-1].Pos.x - state[-2].Pos.x) / dT()) +
+          (vect.x - f_air_lat->Value() * (state[-1].Pos.x - state[-2].Pos.x) / dT()) +
       2 * state[-1].Pos.x - state[-2].Pos.x;
   state[0].Vel.x = (state[0].Pos.x - state[-1].Pos.x) / dT();
-
+ 
   /*
   ** ===================================================================

trunk/lib/FlairSimulator/src/X8.cpp

@@ -339 +339 @@
        sigma->Value() * trr_speed * trr_speed + bfl_speed * bfl_speed +
        bfr_speed * bfr_speed + brl_speed * brl_speed + brr_speed * brr_speed);
-  Vector3D vect(0, 0, -u_thrust);
+  Vector3D<double> vect(0, 0, -u_thrust);
   vect.Rotate(state[0].Quat);
 

trunk/lib/FlairSimulator/src/unexported/Model_impl.h

@@ -120 +120 @@
   flair::core::Mutex *collision_mutex;
   bool collision_occured;
-  flair::core::Vector3D collision_point;
+  flair::core::Vector3D<double> collision_point;
 #endif
 };