Changeset 370 in flair-src for trunk

Timestamp:

Nov 19, 2020, 11:17:30 AM (4 years ago)

Author:

Sanahuja Guillaume

Message:

add abilitiy to change x4 and x8 arm color from ground station

Location:

trunk/lib/FlairSimulator/src

Files:

• X4.cpp (modified) (5 diffs)
• X4.h (modified) (3 diffs)
• X8.cpp (modified) (5 diffs)
• X8.h (modified) (3 diffs)

trunk/lib/FlairSimulator/src/X4.cpp

@@ -25 +25 @@
 #ifdef GL
 #include <ISceneManager.h>
+#include <IMeshManipulator.h>
 #include "Blade.h"
 #include "MeshSceneNode.h"
@@ -76 +77 @@
                             
   motorTimeout = new SpinBox(setup_tab->NewRow(), "motor timeout:","ms", 0, 1000, 100,100);
+  
+  Tab *visual_tab = new Tab(GetTabWidget(), "visual");
+  armColorR = new SpinBox(visual_tab->NewRow(), "arm color (R):", 0, 255, 1,255);
+  armColorG = new SpinBox(visual_tab->LastRowLastCol(), "arm color (G):", 0, 255, 1,0);
+  armColorB = new SpinBox(visual_tab->LastRowLastCol(), "arm color (B):", 0, 255, 1,0);
 
   motors = new SimuBldc(this, name, 4, modelId,0);
@@ -98 +104 @@
 
   // cylinders are aligned with y axis
-  IMesh *red_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, 255, 0, 0));
+  colored_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, armColorR->Value(), armColorG->Value(), armColorB->Value()));
   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));
@@ -104 +110 @@
 
   ITexture *texture = getGui()->getTexture("carbone.jpg");
-  MeshSceneNode *fl_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
+  MeshSceneNode *fl_arm = new MeshSceneNode(this, colored_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, -135));
-  MeshSceneNode *fr_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
+  MeshSceneNode *fr_arm = new MeshSceneNode(this, colored_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, -45));
   MeshSceneNode *rl_arm = new MeshSceneNode(this, black_arm, vector3df(0, 0, 0),
@@ -141 +147 @@
   rr_blade->SetRotationSpeed(K_MOT *vector3df(0, 0, motor_speed[3]));
   motor_speed_mutex->ReleaseMutex();
+  
+  if (armColorR->ValueChanged() == true || armColorG->ValueChanged() == true || armColorB->ValueChanged() == true) {
+    getGui()->getSceneManager()->getMeshManipulator()->setVertexColors(colored_arm, SColor(0,armColorR->Value(), armColorG->Value(), armColorB->Value()));
+  }
 
   // adapt UAV size

trunk/lib/FlairSimulator/src/X4.h

@@ -33 +33 @@
 }
 
+#ifdef GL
+namespace irr {
+namespace scene {
+class IMesh;
+}
+}
+#endif
+
 namespace flair {
 namespace simulator {
@@ -55 +63 @@
   Blade *fl_blade, *fr_blade, *rl_blade, *rr_blade;
   core::Mutex *motor_speed_mutex;
+  irr::scene::IMesh *colored_arm;
 #endif
 
@@ -64 +73 @@
   gui::DoubleSpinBox *j_roll, *j_pitch, *j_yaw;
   gui::SpinBox *motorTimeout;
+  gui::SpinBox *armColorR,*armColorG,*armColorB;
 };
 } // end namespace simulator

trunk/lib/FlairSimulator/src/X8.cpp

@@ -25 +25 @@
 #ifdef GL
 #include <ISceneManager.h>
+#include <IMeshManipulator.h>
 #include "Blade.h"
 #include "MeshSceneNode.h"
@@ -85 +86 @@
   motorTimeout = new SpinBox(setup_tab->NewRow(), "motor timeout:","ms", 0, 1000, 100,100);
 
+  Tab *visual_tab = new Tab(GetTabWidget(), "visual");
+  armColorR = new SpinBox(visual_tab->NewRow(), "arm color (R):", 0, 255, 1,255);
+  armColorG = new SpinBox(visual_tab->LastRowLastCol(), "arm color (G):", 0, 255, 1,0);
+  armColorB = new SpinBox(visual_tab->LastRowLastCol(), "arm color (B):", 0, 255, 1,0);
+  
   motors = new SimuBldc(this, name, 8, modelId,0);
   
@@ -102 +108 @@
 
   // cylinders are aligned with y axis
-  IMesh *red_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, 255, 0, 0));
+  colored_arm = geo->createCylinderMesh(2.5, 100, 16, SColor(0, armColorR->Value(), armColorG->Value(), armColorB->Value()));
   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));
@@ -108 +114 @@
 
   ITexture *texture = getGui()->getTexture("carbone.jpg");
-  MeshSceneNode *fl_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
+  MeshSceneNode *fl_arm = new MeshSceneNode(this, colored_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, -135));
-  MeshSceneNode *fr_arm = new MeshSceneNode(this, red_arm, vector3df(0, 0, 0),
+  MeshSceneNode *fr_arm = new MeshSceneNode(this, colored_arm, vector3df(0, 0, 0),
                              vector3df(0, 0, -45));
   MeshSceneNode *rl_arm = new MeshSceneNode(this, black_arm, vector3df(0, 0, 0),
@@ -171 +177 @@
   brr_blade->SetRotationSpeed(-K_MOT * vector3df(0, 0,motor_speed[7]));
   motor_speed_mutex->ReleaseMutex();
+
+  if (armColorR->ValueChanged() == true || armColorG->ValueChanged() == true || armColorB->ValueChanged() == true) {
+    getGui()->getSceneManager()->getMeshManipulator()->setVertexColors(colored_arm, SColor(0,armColorR->Value(), armColorG->Value(), armColorB->Value()));
+  }
+
 
   // adapt UAV size

trunk/lib/FlairSimulator/src/X8.h

@@ -33 +33 @@
 }
 
+#ifdef GL
+namespace irr {
+namespace scene {
+class IMesh;
+}
+}
+#endif
+
 namespace flair {
 namespace simulator {
@@ -56 +64 @@
   Blade *tfl_blade, *tfr_blade, *trl_blade, *trr_blade;
   Blade *bfl_blade, *bfr_blade, *brl_blade, *brr_blade;
+  irr::scene::IMesh *colored_arm;
 #endif
 
@@ -66 +75 @@
   gui::DoubleSpinBox *j_r, *sigma, *S;
   gui::SpinBox *motorTimeout;
+  gui::SpinBox *armColorR,*armColorG,*armColorB;
 };
 } // end namespace simulator