Changeset 144 in flair-src for trunk/lib/FlairCore/src

Timestamp:

Feb 27, 2017, 10:59:54 AM (8 years ago)

Author:

Bayard Gildas

Message:

Go!

Location:

trunk/lib/FlairCore/src

Files:

• OneAxisRotation.cpp (modified) (1 diff)
• OneAxisRotation.h (modified) (1 diff)
• OneAxisRotation_impl.cpp (modified) (1 diff)
• unexported/OneAxisRotation_impl.h (modified) (1 diff)

trunk/lib/FlairCore/src/OneAxisRotation.cpp

@@ -56 +56 @@
 }
 
+float OneAxisRotation::GetAngle() const {
+  return pimpl_->GetAngle();
+}
+
+int OneAxisRotation::GetAxis() const {
+  return pimpl_->GetAxis();
+}
+
 } // end namespace core
 } // end namespace flair

trunk/lib/FlairCore/src/OneAxisRotation.h

@@ -82 +82 @@
   void ComputeRotation(core::RotationMatrix &matrix) const;
 
+  float GetAngle() const;
+  int GetAxis() const;
+
 private:
   const class OneAxisRotation_impl *pimpl_;

trunk/lib/FlairCore/src/OneAxisRotation_impl.cpp

@@ -74 +74 @@
   quat.ToEuler(euler);
 }
+
+int OneAxisRotation_impl::GetAxis() const {
+  return rot_axe->CurrentIndex();
+}
+
+float OneAxisRotation_impl::GetAngle() const {
+  return rot_value->Value();
+}
+

trunk/lib/FlairCore/src/unexported/OneAxisRotation_impl.h

@@ -40 +40 @@
   void ComputeRotation(flair::core::RotationMatrix &matrix) const;
   void ComputeRotation(flair::core::Euler &euler) const;
-
+  int GetAxis() const;
+  float GetAngle() const;
+  
 private:
   flair::gui::ComboBox *rot_axe;