Changeset 158 in flair-src for trunk/lib/FlairSimulator/src/X8.cpp

Timestamp:

03/05/17 10:50:56 (6 years ago)

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

File:

• trunk/lib/FlairSimulator/src/X8.cpp (modified) (4 diffs)

trunk/lib/FlairSimulator/src/X8.cpp

@@ -16 +16 @@
 
 #include "X8.h"
-#include "Simulator.h"
 #include <SimuBldc.h>
 #include <TabWidget.h>
@@ -46 +45 @@
 namespace simulator {
 
-X8::X8(const Simulator *parent, std::string name, int dev_id)
-    : Model(parent, name) {
+X8::X8(std::string name, uint32_t modelId): Model( name,modelId) {
   Tab *setup_tab = new Tab(GetTabWidget(), "model");
   m = new DoubleSpinBox(setup_tab->NewRow(), "mass (kg):", 0, 20, 0.1);
@@ -84 +82 @@
       0.1); // coefficient de forme des helices 1<S=1+Ss/Sprop<2 (sans unite)
 
-  motors = new SimuBldc(this, name, 8, dev_id);
+  motors = new SimuBldc(this, name, 8, modelId,0);
   
   SetIsReady(true);
@@ -101 +99 @@
 
   // cylinders are aligned with y axis
-  red_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, 255, 0, 0));
-  black_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, 128, 128, 128));
-  motor = geo->createCylinderMesh(7.5, 15, 16); //,SColor(0, 128, 128, 128));
+  IMesh *red_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, 255, 0, 0));
+  IMesh *black_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, 128, 128, 128));
+  IMesh *motor = geo->createCylinderMesh(7.5, 15, 16); //,SColor(0, 128, 128, 128));
   // geo->drop();
 
   ITexture *texture = getGui()->getTexture("carbone.jpg");
-  fl_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
+  MeshSceneNode *fl_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, -135));
-  fr_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
+  MeshSceneNode *fr_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, -45));
-  rl_arm = new MeshSceneNode(this, black_arm, vector3df(0, 0, 0),
+  MeshSceneNode *rl_arm = new MeshSceneNode(this, black_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, 135), texture);
-  rr_arm = new MeshSceneNode(this, black_arm, vector3df(0, 0, 0),
+  MeshSceneNode *rr_arm = new MeshSceneNode(this, black_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, 45), texture);
 
   texture = getGui()->getTexture("metal047.jpg");
-  tfl_motor = new MeshSceneNode(this, motor, vector3df(70.71, -70.71, 2.5),
-                                vector3df(90, 0, 0), texture);
-  tfr_motor = new MeshSceneNode(this, motor, vector3df(70.71, 70.71, 2.5),
-                                vector3df(90, 0, 0), texture);
-  trl_motor = new MeshSceneNode(this, motor, vector3df(-70.71, -70.71, 2.5),
-                                vector3df(90, 0, 0), texture);
-  trr_motor = new MeshSceneNode(this, motor, vector3df(-70.71, 70.71, 2.5),
-                                vector3df(90, 0, 0), texture);
-
-  bfl_motor = new MeshSceneNode(this, motor, vector3df(70.71, -70.71, -17.5),
-                                vector3df(90, 0, 0), texture);
-  bfr_motor = new MeshSceneNode(this, motor, vector3df(70.71, 70.71, -17.5),
-                                vector3df(90, 0, 0), texture);
-  brl_motor = new MeshSceneNode(this, motor, vector3df(-70.71, -70.71, -17.5),
-                                vector3df(90, 0, 0), texture);
-  brr_motor = new MeshSceneNode(this, motor, vector3df(-70.71, 70.71, -17.5),
+  MeshSceneNode *tfl_motor = new MeshSceneNode(this, motor, vector3df(70.71, -70.71, 2.5),
+                                vector3df(90, 0, 0), texture);
+  MeshSceneNode *tfr_motor = new MeshSceneNode(this, motor, vector3df(70.71, 70.71, 2.5),
+                                vector3df(90, 0, 0), texture);
+  MeshSceneNode *trl_motor = new MeshSceneNode(this, motor, vector3df(-70.71, -70.71, 2.5),
+                                vector3df(90, 0, 0), texture);
+  MeshSceneNode *trr_motor = new MeshSceneNode(this, motor, vector3df(-70.71, 70.71, 2.5),
+                                vector3df(90, 0, 0), texture);
+
+  MeshSceneNode *bfl_motor = new MeshSceneNode(this, motor, vector3df(70.71, -70.71, -17.5),
+                                vector3df(90, 0, 0), texture);
+  MeshSceneNode *bfr_motor = new MeshSceneNode(this, motor, vector3df(70.71, 70.71, -17.5),
+                                vector3df(90, 0, 0), texture);
+  MeshSceneNode *brl_motor = new MeshSceneNode(this, motor, vector3df(-70.71, -70.71, -17.5),
+                                vector3df(90, 0, 0), texture);
+  MeshSceneNode *brr_motor = new MeshSceneNode(this, motor, vector3df(-70.71, 70.71, -17.5),
                                 vector3df(90, 0, 0), texture);