Changeset 3971 in orxonox.OLD for orxonox/trunk/src/lib/math/vector.h

Timestamp:

Apr 26, 2005, 1:23:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: return value of quat-slerp was wrong

File:

• orxonox/trunk/src/lib/math/vector.h (modified) (2 diffs)

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

@@ -76 +76 @@
   
   inline Quaternion () { w = 1; v = Vector(0,0,0); }
-  inline Quaternion (const Vector& b, float a) { w = a; v = b; }
+  inline Quaternion (const Vector& v, float f) { this->w = f; this->v = v; }
   Quaternion (float m[4][4]);
   inline Quaternion (float angle, const Vector& axis) { w = cos(angle/2); v = axis * sin(angle/2); }
@@ -99 +99 @@
   float norm () const;
   void matrix (float m[4][4]) const;
-  Quaternion quatSlerp(const Quaternion& from, const Quaternion& to, float t);
   
   void debug();
- private:
-  float DELTA;      //!< resolution of calculation
+};
 
-};
+Quaternion quatSlerp(const Quaternion& from, const Quaternion& to, float t);
+
+
 
 //! 3D rotation (OBSOLETE)