Changeset 339 in flair-src for trunk

Timestamp:

Nov 28, 2019, 8:59:49 AM (5 years ago)

Author:

Sanahuja Guillaume

Message:

allow all blade rotations

Location:

trunk/lib/FlairSimulator/src

Files:

• Blade.cpp (modified) (3 diffs)
• Blade.h (modified) (2 diffs)
• UavVrpnObject_impl.cpp (modified) (1 diff)
• X4.cpp (modified) (2 diffs)
• X8.cpp (modified) (2 diffs)

trunk/lib/FlairSimulator/src/Blade.cpp

@@ -36 +36 @@
 namespace simulator {
 
-Blade::Blade(Model *parent, const vector3df &position, bool inverted, s32 id)
+Blade::Blade(Model *parent, const vector3df &position,const vector3df &rotation, bool inverted, s32 id)
     : ISceneNode(parent->getSceneNode(), getGui()->getSceneManager(), id,
-                 position) {
+                 position,rotation) {
   ISceneManager *mgr = getGui()->getSceneManager();
 
@@ -64 +64 @@
 }
 
-Blade::Blade(ISceneNode *parent, const vector3df &position, bool inverted, s32 id)
+Blade::Blade(ISceneNode *parent, const vector3df &position,const vector3df &rotation, bool inverted, s32 id)
     : ISceneNode(parent, getGui()->getSceneManager(), id,
-                 position) {
+                 position,rotation) {
   ISceneManager *mgr = getGui()->getSceneManager();
 
@@ -99 +99 @@
 }
 
-void Blade::SetRotationSpeed(float value) {
+void Blade::SetRotationSpeed(const vector3df &value) {
   IAttributes *attribs =
       getSceneManager()->getFileSystem()->createEmptyAttributes();
 
   attribs->setAttribute("Type", "rotation");
-  attribs->setAttribute("Rotation", vector3df(0.f, 0.f, value));
+  attribs->setAttribute("Rotation", value);
   anim->deserializeAttributes(attribs);
 

trunk/lib/FlairSimulator/src/Blade.h

@@ -35 +35 @@
   Blade(Model *parent,
         const irr::core::vector3df &position = irr::core::vector3df(0, 0, 0),
+        const irr::core::vector3df &rotation = irr::core::vector3df(0, 0, 0),
         bool inverted = false, irr::s32 id = -1);
 
   Blade(irr::scene::ISceneNode *parent,
         const irr::core::vector3df &position = irr::core::vector3df(0, 0, 0),
+        const irr::core::vector3df &rotation = irr::core::vector3df(0, 0, 0),
         bool inverted = false, irr::s32 id = -1);
   
@@ -46 +48 @@
     return Box;
   }
-  void SetRotationSpeed(float value);
+  void SetRotationSpeed(const irr::core::vector3df &value);
 
 private:

trunk/lib/FlairSimulator/src/UavVrpnObject_impl.cpp

@@ -150 +150 @@
 
   fl_blade = new Blade(this, vector3df(70.71, -70.71, 17.5));
-  fr_blade = new Blade(this, vector3df(70.71, 70.71, 17.5), true);
-  rl_blade = new Blade(this, vector3df(-70.71, -70.71, 17.5), true);
+  fr_blade = new Blade(this, vector3df(70.71, 70.71, 17.5),  vector3df(0, 0, 0),true);
+  rl_blade = new Blade(this, vector3df(-70.71, -70.71, 17.5),  vector3df(0, 0, 0),true);
   rr_blade = new Blade(this, vector3df(-70.71, 70.71, 17.5));
   
-  fl_blade->SetRotationSpeed(MOTOR_SPEED);
-  fr_blade->SetRotationSpeed(-MOTOR_SPEED);
-  rl_blade->SetRotationSpeed(-MOTOR_SPEED);
-  rr_blade->SetRotationSpeed(MOTOR_SPEED);
+  fl_blade->SetRotationSpeed(vector3df(0, 0,MOTOR_SPEED));
+  fr_blade->SetRotationSpeed(vector3df(0, 0,-MOTOR_SPEED));
+  rl_blade->SetRotationSpeed(vector3df(0, 0,-MOTOR_SPEED));
+  rr_blade->SetRotationSpeed(vector3df(0, 0,MOTOR_SPEED));
   
   setScale(vector3df(arm_length->Value(), arm_length->Value(), arm_length->Value()));

trunk/lib/FlairSimulator/src/X4.cpp

@@ -124 +124 @@
 
   fl_blade = new Blade(this, vector3df(70.71, -70.71, 17.5));
-  fr_blade = new Blade(this, vector3df(70.71, 70.71, 17.5), true);
-  rl_blade = new Blade(this, vector3df(-70.71, -70.71, 17.5), true);
+  fr_blade = new Blade(this, vector3df(70.71, 70.71, 17.5), vector3df(0, 0, 0),true);
+  rl_blade = new Blade(this, vector3df(-70.71, -70.71, 17.5),  vector3df(0, 0, 0),true);
   rr_blade = new Blade(this, vector3df(-70.71, 70.71, 17.5));
 
@@ -136 +136 @@
 void X4::AnimateModel(void) {
   motor_speed_mutex->GetMutex();
-  fl_blade->SetRotationSpeed(K_MOT * motor_speed[0]);
-  fr_blade->SetRotationSpeed(-K_MOT * motor_speed[1]);
-  rl_blade->SetRotationSpeed(-K_MOT * motor_speed[2]);
-  rr_blade->SetRotationSpeed(K_MOT * motor_speed[3]);
+  fl_blade->SetRotationSpeed(K_MOT *vector3df(0, 0, motor_speed[0]));
+  fr_blade->SetRotationSpeed(-K_MOT *vector3df(0, 0, motor_speed[1]));
+  rl_blade->SetRotationSpeed(-K_MOT *vector3df(0, 0, motor_speed[2]));
+  rr_blade->SetRotationSpeed(K_MOT *vector3df(0, 0, motor_speed[3]));
   motor_speed_mutex->ReleaseMutex();
 

trunk/lib/FlairSimulator/src/X8.cpp

@@ -137 +137 @@
 
   tfl_blade = new Blade(this, vector3df(70.71, -70.71, 17.5));
-  tfr_blade = new Blade(this, vector3df(70.71, 70.71, 17.5), true);
-  trl_blade = new Blade(this, vector3df(-70.71, -70.71, 17.5), true);
+  tfr_blade = new Blade(this, vector3df(70.71, 70.71, 17.5), vector3df(0, 0, 0), true);
+  trl_blade = new Blade(this, vector3df(-70.71, -70.71, 17.5), vector3df(0, 0, 0), true);
   trr_blade = new Blade(this, vector3df(-70.71, 70.71, 17.5));
 
   bfl_blade = new Blade(this, vector3df(70.71, -70.71, -17.5));
-  bfr_blade = new Blade(this, vector3df(70.71, 70.71, -17.5), true);
-  brl_blade = new Blade(this, vector3df(-70.71, -70.71, -17.5), true);
+  bfr_blade = new Blade(this, vector3df(70.71, 70.71, -17.5), vector3df(0, 0, 0), true);
+  brl_blade = new Blade(this, vector3df(-70.71, -70.71, -17.5),  vector3df(0, 0, 0),true);
   brr_blade = new Blade(this, vector3df(-70.71, 70.71, -17.5));
 
@@ -161 +161 @@
 void X8::AnimateModel(void) {
   motor_speed_mutex->GetMutex();
-  tfl_blade->SetRotationSpeed(K_MOT * motor_speed[0]);
-  tfr_blade->SetRotationSpeed(-K_MOT * motor_speed[1]);
-  trl_blade->SetRotationSpeed(-K_MOT * motor_speed[2]);
-  trr_blade->SetRotationSpeed(K_MOT * motor_speed[3]);
-
-  bfl_blade->SetRotationSpeed(-K_MOT * motor_speed[4]);
-  bfr_blade->SetRotationSpeed(K_MOT * motor_speed[5]);
-  brl_blade->SetRotationSpeed(K_MOT * motor_speed[6]);
-  brr_blade->SetRotationSpeed(-K_MOT * motor_speed[7]);
+  tfl_blade->SetRotationSpeed(K_MOT * vector3df(0, 0,motor_speed[0]));
+  tfr_blade->SetRotationSpeed(-K_MOT * vector3df(0, 0,motor_speed[1]));
+  trl_blade->SetRotationSpeed(-K_MOT * vector3df(0, 0,motor_speed[2]));
+  trr_blade->SetRotationSpeed(K_MOT * vector3df(0, 0,motor_speed[3]));
+
+  bfl_blade->SetRotationSpeed(-K_MOT * vector3df(0, 0,motor_speed[4]));
+  bfr_blade->SetRotationSpeed(K_MOT * vector3df(0, 0,motor_speed[5]));
+  brl_blade->SetRotationSpeed(K_MOT * vector3df(0, 0,motor_speed[6]));
+  brr_blade->SetRotationSpeed(-K_MOT * vector3df(0, 0,motor_speed[7]));
   motor_speed_mutex->ReleaseMutex();