Changeset 3819 in orxonox.OLD for orxonox

Timestamp:

Apr 14, 2005, 12:21:27 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: most important often used functions inlined

Location:

orxonox/trunk/src/lib/math

Files:

• vector.cc (modified) (3 diffs)
• vector.h (modified) (2 diffs)

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

@@ -23 +23 @@
 #include "vector.h"
 #include "debug.h"
-#include "stdincl.h"
 
 using namespace std;
@@ -90 +89 @@
         \return the cross product of the vectors
 */
-Vector Vector::cross (const Vector& v) const
-{
-  return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x );
-}
+//Vector Vector::cross (const Vector& v) const
+
   
 /**
    \brief normalizes the vector to lenght 1.0
 */
-void Vector::normalize ()
-{
-  float l = len();
-  
-  __UNLIKELY_IF( l == 0.0)
-  {
-    // Prevent divide by zero
-    return;
-  }
-  
-  x = x / l;
-  y = y / l;
-  z = z / l;
-}
+//void Vector::normalize ()
 
 
@@ -149 +133 @@
    \return the lenght of the vector
 */
-float Vector::len () const
-{
-  return sqrt (x*x+y*y+z*z);
-}
+//float Vector::len () const
 
 

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

@@ -10 +10 @@
 
 #include <math.h>
+#include "stdincl.h"
 //! PI the circle-constant
 #define PI 3.14159265359f
@@ -30 +31 @@
 
   inline Vector operator+ (const Vector& v) const { return Vector(x + v.x, y + v.y, z + v.z); }
-  Vector operator- (const Vector& v) const { return Vector(x - v.x, y - v.y, z - v.z); }
-  float operator* (const Vector& v) const { return x * v.x + y * v.y + z * v.z; }
-  Vector operator* (float f) const { return Vector(x * f, y * f, z * f); }
+  inline Vector operator- (const Vector& v) const { return Vector(x - v.x, y - v.y, z - v.z); }
+  inline float operator* (const Vector& v) const { return x * v.x + y * v.y + z * v.z; }
+  inline Vector operator* (float f) const { return Vector(x * f, y * f, z * f); }
   Vector operator/ (float f) const;
   float dot (const Vector& v) const;
-  Vector cross (const Vector& v) const;
+  inline Vector cross (const Vector& v) const {  return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x ); }
   void scale(const Vector& v);
-  float len() const;
-  void normalize();
+  inline float len() const { return sqrt (x*x+y*y+z*z); }
+  inline void normalize() { 
+                      float l = len(); 
+                      __UNLIKELY_IF( l == 0.0) 
+                        { 
+                          // Prevent divide by zero
+                          return;
+                        }
+                      x = x / l;
+                      y = y / l;
+                      z = z / l; 
+                    }
   Vector* getNormalized();
   Vector abs();