Changeset 187 in flair-src for trunk/lib/FlairCore/src/OneAxisRotation_impl.cpp

Timestamp:

07/04/17 09:38:26 (6 years ago)

Author:

Sanahuja Guillaume

Message:

changement post/pre rotation

File:

• trunk/lib/FlairCore/src/OneAxisRotation_impl.cpp (modified) (4 diffs)

trunk/lib/FlairCore/src/OneAxisRotation_impl.cpp

@@ -17 +17 @@
 
 #include "OneAxisRotation_impl.h"
+#include "OneAxisRotation.h"
 #include "GroupBox.h"
 #include "ComboBox.h"
@@ -31 +32 @@
 template void OneAxisRotation_impl::ComputeRotation(Vector3D<double>&) const;
 
-OneAxisRotation_impl::OneAxisRotation_impl(GroupBox *box) {
+OneAxisRotation_impl::OneAxisRotation_impl(GroupBox *box,int rotationType) {
   rot_value =
       new DoubleSpinBox(box->NewRow(), "value", " deg", -180., 180., 10., 1);
@@ -38 +39 @@
   rot_axe->AddItem("y");
   rot_axe->AddItem("z");
+  this->rotationType=rotationType;
 }
 
@@ -45 +47 @@
   Quaternion rot;
   switch (rot_axe->CurrentIndex()) {
-    case 0:
-      rot=Quaternion(cosf(Euler::ToRadian(rot_value->Value()/2)),sinf(Euler::ToRadian(rot_value->Value()/2)), 0,0);
+    case 0://x
+      rot=Quaternion(cosf(Euler::ToRadian(-rot_value->Value()/2)),sinf(Euler::ToRadian(-rot_value->Value()/2)),0,0);
       break;
-    case 1:
-      rot=Quaternion(cosf(Euler::ToRadian(rot_value->Value()/2)),0,sinf(Euler::ToRadian(rot_value->Value()/2)),0);
+    case 1://y
+      rot=Quaternion(cosf(Euler::ToRadian(-rot_value->Value()/2)),0,sinf(Euler::ToRadian(-rot_value->Value()/2)),0);
       break;
-    case 2:
-      rot=Quaternion(cosf(Euler::ToRadian(rot_value->Value()/2)),0,0,sinf(Euler::ToRadian(rot_value->Value()/2)));
+    case 2://z
+      rot=Quaternion(cosf(Euler::ToRadian(-rot_value->Value()/2)),0,0,sinf(Euler::ToRadian(-rot_value->Value()/2)));
       break;
   }
-  quat=quat*rot;
+  if(rotationType==OneAxisRotation::RotationType_t::PreRotation) {
+    quat=rot*quat;
+  } else { //post rotation
+    quat=quat*rot;
+  }
 }