Changeset 5001 in orxonox.OLD

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

Files:

• defs/alincl.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (2 diffs)
• lib/math/vector.h (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)

orxonox/trunk/src/defs/alincl.h

@@ -1 +1 @@
 /*!
-  \file alincl.h
-  \brief This file includes al Headers.
-
-  no Class is defined here, but the openAL Headers
+ * This file includes openAL-Headers.
+ * @file alincl.h
 */
 

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);

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -116 +116 @@
 void Turret::tick(float dt)
 {
+  Quaternion quat;
   Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+
   direction.normalize();
+
   if (likely (this->getParent() != NULL))
-  {
-    Quaternion quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
-    this->setAbsDir(quat);
-  }
+    quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
   else
-  {
-    Quaternion quat = Quaternion(direction, this->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
-    this->setAbsDir(quat);
-  }
+    quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+
+  this->setAbsDir(quat);
 }