Changeset 15 in flair-src for trunk/lib/FlairCore/src/Euler.cpp

Timestamp:

04/08/16 15:40:57 (8 years ago)

Author:

Bayard Gildas

Message:

sources reformatted with flair-format-dir script

File:

• trunk/lib/FlairCore/src/Euler.cpp (modified) (2 diffs)

trunk/lib/FlairCore/src/Euler.cpp

@@ -23 +23 @@
 #define PI_D ((double)3.14159265358979323846)
 
-namespace flair
-{
-namespace core
-{
+namespace flair {
+namespace core {
 
-Euler::Euler(float inRoll,float inPitch,float inYaw): roll(inRoll), pitch(inPitch),yaw(inYaw) {
-}
+Euler::Euler(float inRoll, float inPitch, float inYaw)
+    : roll(inRoll), pitch(inPitch), yaw(inYaw) {}
 
-Euler::~Euler() {
+Euler::~Euler() {}
 
-}
-
-Euler& Euler::operator=(const Euler &euler) {
-    roll=euler.roll;
-    pitch=euler.pitch;
-    yaw=euler.yaw;
-    return (*this);
+Euler &Euler::operator=(const Euler &euler) {
+  roll = euler.roll;
+  pitch = euler.pitch;
+  yaw = euler.yaw;
+  return (*this);
 }
 /*
@@ -85 +81 @@
 */
 void Euler::ToQuaternion(Quaternion &quaternion) const {
-    quaternion.q0=cos(yaw/2)*cos(pitch/2)*cos(roll/2)
-        +sin(yaw/2)*sin(pitch/2)*sin(roll/2);
+  quaternion.q0 = cos(yaw / 2) * cos(pitch / 2) * cos(roll / 2) +
+                  sin(yaw / 2) * sin(pitch / 2) * sin(roll / 2);
 
-    quaternion.q1=cos(yaw/2)*cos(pitch/2)*sin(roll/2)
-        -sin(yaw/2)*sin(pitch/2)*cos(roll/2);
+  quaternion.q1 = cos(yaw / 2) * cos(pitch / 2) * sin(roll / 2) -
+                  sin(yaw / 2) * sin(pitch / 2) * cos(roll / 2);
 
-    quaternion.q2=cos(yaw/2)*sin(pitch/2)*cos(roll/2)
-        +sin(yaw/2)*cos(pitch/2)*sin(roll/2);
+  quaternion.q2 = cos(yaw / 2) * sin(pitch / 2) * cos(roll / 2) +
+                  sin(yaw / 2) * cos(pitch / 2) * sin(roll / 2);
 
-    quaternion.q3=sin(yaw/2)*cos(pitch/2)*cos(roll/2)
-        -cos(yaw/2)*sin(pitch/2)*sin(roll/2);
+  quaternion.q3 = sin(yaw / 2) * cos(pitch / 2) * cos(roll / 2) -
+                  cos(yaw / 2) * sin(pitch / 2) * sin(roll / 2);
 }
 
 Quaternion Euler::ToQuaternion(void) const {
-    Quaternion quaternion;
-    ToQuaternion(quaternion);
-    return quaternion;
+  Quaternion quaternion;
+  ToQuaternion(quaternion);
+  return quaternion;
 }
 
-float Euler::ToDegree(float radianValue) {
-    return radianValue*180.0f/PI;
-}
+float Euler::ToDegree(float radianValue) { return radianValue * 180.0f / PI; }
 
-float Euler::ToRadian(float degreeValue) {
-    return degreeValue/180.0f*PI;
-}
+float Euler::ToRadian(float degreeValue) { return degreeValue / 180.0f * PI; }
 
 float Euler::YawDistanceFrom(float angle) const {
-    float rot1,rot2;
-    if(angle > yaw ) {
-        rot1=angle-yaw;
-        rot2=2*PI-angle+yaw;
-    } else {
-        rot1=2*PI+angle-yaw;
-        rot2=yaw-angle;
-    }
-    if(rot2<rot1) rot1=-rot2;
-    rot1=-rot1;//pour avoir rot1=yaw-angle
+  float rot1, rot2;
+  if (angle > yaw) {
+    rot1 = angle - yaw;
+    rot2 = 2 * PI - angle + yaw;
+  } else {
+    rot1 = 2 * PI + angle - yaw;
+    rot2 = yaw - angle;
+  }
+  if (rot2 < rot1)
+    rot1 = -rot2;
+  rot1 = -rot1; // pour avoir rot1=yaw-angle
 
-    return rot1;
+  return rot1;
 }