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

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/lib/math

Files:

• Makefile.am (modified) (2 diffs)
• rect2D.cc (copied) (copied from branches/gui/src/lib/math/rect2D.cc)
• rect2D.h (copied) (copied from branches/gui/src/lib/math/rect2D.h)
• vector2D.h (modified) (4 diffs)

trunk/src/lib/math/Makefile.am

@@ -13 +13 @@
                 plane.cc \
                 line.cc \
+                rect2D.cc \
                 rotation_OBSOLETE.cc
 
@@ -23 +24 @@
                 plane.h \
                 line.h \
+                rect2D.h \
                 rotation_OBSOLETE.h

trunk/src/lib/math/vector2D.h

@@ -24 +24 @@
 #define __VECTOR2D_H_
 
-#include <math.h>
+#include <cmath>
 #include "compiler.h"
 
@@ -40 +40 @@
 
   /** @param v: the Vecor to compare with this one @returns true, if the Vecors are the same, false otherwise */
-  inline bool operator== (const Vector2D& v) const { return (this->x==v.x && this->y==v.y)?true:false; };
+  inline bool operator== (const Vector2D& v) const { return (this->x==v.x && this->y==v.y); };
+  /** @param v: the Vector to negative-compare with this one @returns true if the two vectors are different */
+  inline bool operator!= (const Vector2D& v) const { return (this->x!=v.x && this->y!=v.y); };
   /** @param index The index of the "array" @returns the x/y coordinate */
   inline float operator[] (float index) const { return ( index == 0)? this->x : this->y; }
@@ -77 +79 @@
   /** @param v: the other vector \return the dot product of the vectors */
   float dot (const Vector2D& v) const { return x*v.x+y*v.y; };
+  /** @param v multipy each entry with each other @returns this reference */
+  const Vector2D& internalMultipy(const Vector2D& v) { this->x *= v.x; this->y *= y; };
   /** scales the this vector with v* @param v the vector to scale this with */
   void scale(const Vector2D& v) {   x *= v.x;  y *= v.y; };
@@ -85 +89 @@
   Vector2D getNormalized() const;
   Vector2D abs();
+
+  /** @param v the Vector to slerp to @param val 0 = stay 1 = at v */
+  void slerp(const Vector2D& v, float val) { *this += (*this - v) * val; }
 
   void debug() const;