Changeset 161 in flair-src

Timestamp:

Mar 6, 2017, 12:45:57 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs

Location:

trunk

Files:

• demos/CircleFollower/uav/build_x86_64/bin/x4.sh (modified) (1 diff)
• lib/FlairCore/src/Quaternion.cpp (modified) (1 diff)
• lib/FlairCore/src/Vector2D.cpp (modified) (2 diffs)
• lib/FlairCore/src/Vector2D.h (modified) (2 diffs)

trunk/demos/CircleFollower/uav/build_x86_64/bin/x4.sh

@@ -9 +9 @@
 fi
 
-$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu
+$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu 

trunk/lib/FlairCore/src/Quaternion.cpp

@@ -168 +168 @@
           quaterniontA.q2 * quaterniontB.q0 + quaterniontA.q3 * quaterniontB.q1,
       quaterniontA.q0 * quaterniontB.q3 + quaterniontA.q1 * quaterniontB.q2 -
-          quaterniontA.q2 * quaterniontB.q1 +
-          quaterniontA.q3 * quaterniontB.q0);
+          quaterniontA.q2 * quaterniontB.q1 + quaterniontA.q3 * quaterniontB.q0);
 }
 

trunk/lib/FlairCore/src/Vector2D.cpp

@@ -33 +33 @@
 }
 
+Vector2D &Vector2D::operator+=(const Vector2D &vector) {
+  x += vector.x;
+  y += vector.y;
+  return (*this);
+}
+
+Vector2D &Vector2D::operator-=(const Vector2D &vector) {
+  x -= vector.x;
+  y -= vector.y;
+  return (*this);
+}
+
 Vector2D operator+(const Vector2D &vectorA, const Vector2D &vectorB) {
   return Vector2D(vectorA.x + vectorB.x, vectorA.y + vectorB.y);
@@ -39 +51 @@
 Vector2D operator-(const Vector2D &vectorA, const Vector2D &vectorB) {
   return Vector2D(vectorA.x - vectorB.x, vectorA.y - vectorB.y);
+}
+
+Vector2D operator-(const Vector2D &vectorA) {
+ return Vector2D(-vectorA.x, -vectorA.y);
 }
 

trunk/lib/FlairCore/src/Vector2D.h

@@ -114 +114 @@
 
   Vector2D &operator=(const Vector2D &vector);
+  Vector2D &operator+=(const Vector2D &vector);
+  Vector2D &operator-=(const Vector2D &vector);
 };
 
@@ -133 +135 @@
 */
 Vector2D operator-(const Vector2D &vectorA, const Vector2D &vectorB);
+
+/*! Opposite
+*
+* \brief Opposite
+*
+* \param vectorA vector
+* 
+* \return -vectorA
+*/
+Vector2D operator-(const Vector2D &vectorA);
 
 /*! Divid