Changeset 5001 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Aug 13, 2005, 10:08:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: update-setRelDir works correctly now

Location:

orxonox/trunk/src/lib

Files:

• coord/p_node.cc (modified) (2 diffs)
• math/vector.h (modified) (1 diff)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -337 +337 @@
 void PNode::setAbsDir (const Quaternion& absDir)
 {
-  if (this->parent)
-    this->relDirection = absDir / parent->getAbsDir();
+  if (likely(this->parent != NULL))
+    this->relDirection = absDir / this->parent->getAbsDir();
   else
-    this->relDirection = absDir;
+   this->relDirection = absDir;
 
   this->bRelDirChanged = true;
-//  this->absDirection = absDir;
 }
 
@@ -576 +575 @@
       {
         /* update the current absDirection - remember * means rotation around sth.*/
-        this->absDirection = parent->getAbsDir() * this->relDirection;
+        this->absDirection = this->relDirection * parent->getAbsDir();;
       }
 

orxonox/trunk/src/lib/math/vector.h

@@ -171 +171 @@
   inline Vector getSpacialAxis() const { return this->v / sin(acos(w));/*sqrt(v.x*v.x + v.y*v.y + v.z+v.z);*/ };
   /** @returns the rotational angle of this Quaternion around getSpacialAxis()  !! IN DEGREE !! */
-  inline float getSpacialAxisAngle() const { return 360 / M_PI * acos(this->w); };
+  inline float getSpacialAxisAngle() const { return 360.0 / M_PI * acos(this->w); };
 
   static Quaternion quatSlerp(const Quaternion& from, const Quaternion& to, float t);