Changeset 5420 in orxonox.OLD for trunk/src/lib/math

Timestamp:

Oct 22, 2005, 1:57:29 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Font is now Right, and the Rendering 'should be' faster.

Location:

trunk/src/lib/math

Files:

• vector.cc (modified) (9 diffs)
• vector.h (modified) (1 diff)

trunk/src/lib/math/vector.cc

@@ -15 +15 @@
 
    Quaternion code borrowed from an Gamasutra article by Nick Bobick and Ken Shoemake
+
+   2005-06-02: Benjamin Grauer: speed up, and new Functionality to Vector (mostly inline now)
 */
 
@@ -30 +32 @@
  *  returns the this-vector normalized to length 1.0
  * @todo there is some error in this function, that i could not resolve. it just does not, what it is supposed to do.
-*/
+ */
 Vector Vector::getNormalized() const
 {
@@ -53 +55 @@
 /**
  *  Outputs the values of the Vector
-*/
+ */
 void Vector::debug() const
 {
@@ -77 +79 @@
  *
  * @TODO !!! OPTIMIZE THIS !!!
-*/
+ */
 Quaternion::Quaternion (const Vector& dir, const Vector& up)
 {
@@ -110 +112 @@
  * @param pitch: the pitch in radians
  * @param yaw: the yaw in radians
-*/
+ */
 Quaternion::Quaternion (float roll, float pitch, float yaw)
 {
@@ -136 +138 @@
  *  convert the Quaternion to a 4x4 rotational glMatrix
  * @param m: a buffer to store the Matrix in
-*/
+ */
 void Quaternion::matrix (float m[4][4]) const
 {
@@ -167 +169 @@
  * @param to where
  * @param t the time this transformation should take value [0..1]
-
  * @returns the Result of the smooth move
-*/
+ */
 Quaternion Quaternion::quatSlerp(const Quaternion& from, const Quaternion& to, float t)
 {
@@ -194 +195 @@
     }
 
-  //if( (1.0 - cosom) > DELTA )
-  //{
   omega = acos(cosom);
   sinom = sin(omega);
   scale0 = sin((1.0 - t) * omega) / sinom;
   scale1 = sin(t * omega) / sinom;
-  //}
-  /*
-    else
-    {
-    scale0 = 1.0 - t;
-    scale1 = t;
-    }
-  */
-
-
-  /*
-    Quaternion res;
-    res.v.x = scale0 * from.v.x + scale1 * tol[0];
-    res.v.y = scale0 * from.v.y + scale1 * tol[1];
-    res.v.z = scale0 * from.v.z + scale1 * tol[2];
-    res.w = scale0 * from.w + scale1 * tol[3];
-  */
   return Quaternion(Vector(scale0 * from.v.x + scale1 * tol[0],
-                           scale0 * from.v.y + scale1 * tol[1],
-                           scale0 * from.v.z + scale1 * tol[2]),
+                    scale0 * from.v.y + scale1 * tol[1],
+                    scale0 * from.v.z + scale1 * tol[2]),
                     scale0 * from.w + scale1 * tol[3]);
 }
@@ -227 +209 @@
  *  convert a rotational 4x4 glMatrix into a Quaternion
  * @param m: a 4x4 matrix in glMatrix order
-*/
+ */
 Quaternion::Quaternion (float m[4][4])
 {

trunk/src/lib/math/vector.h

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+### File Specific:
+   main-programmer: Christian Meyer
+   co-programmer: ...
+*/
+
 /*!
  * @file vector.h