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

Timestamp:

May 31, 2006, 4:20:51 PM (19 years ago)

Author:

bensch

Message:

gui: merged the gui back to the trunk

Location:

trunk/src/lib/math

Files:

• rect2D.h (modified) (1 diff)
• vector.h (modified) (2 diffs)
• vector2D.h (modified) (1 diff)

trunk/src/lib/math/rect2D.h

@@ -83 +83 @@
   inline void setRight(float right) { _bottomRight.x = right; };
   /** @param topLeft the top left corner of the Rectangle */
-  void setTopLeft(const Vector2D& topLeft) { _topLeft = topLeft; };
+  inline void setTopLeft(const Vector2D& topLeft) { _topLeft = topLeft; };
+  /** @param x the left border of the Rectangle @param y the top border */
+  inline void setTopLeft(float x, float y) { this->setTopLeft(Vector2D(x,y)); };
   /** @param bottomRight the lower right corner of the Rectangle */
-  void setBottomRight(const Vector2D& bottomRight) { _bottomRight = bottomRight; };
+  inline void setBottomRight(const Vector2D& bottomRight) { _bottomRight = bottomRight; };
+  /** @param x the right border of the Rectangle @param y the bottom border */
+  inline void setBottomRight(float x, float y) { this->setBottomRight(Vector2D(x,y)); };
 
   void setWidth(float width);

trunk/src/lib/math/vector.h

@@ -32 +32 @@
 //! this is a small and performant 3D vector
 typedef float sVec3D[3];
-
-
-//! small and performant 2D vector
-typedef float sVec2D[2];
-
 
 
@@ -101 +96 @@
   inline void slerpTo(const Vector& toVec, float t) { *this + (toVec - *this) * t; };
 
+  /** @returns a Null Vector */
+  inline static const Vector& nullVector() { static Vector nullVector; return nullVector; }
   void debug() const;
 

trunk/src/lib/math/vector2D.h

@@ -93 +93 @@
   void slerp(const Vector2D& v, float val) { *this += (*this - v) * val; }
 
+  /** @returns a Vector of (0,0) */
+  static const Vector2D& nullVector() { static Vector2D nullVector; return nullVector; };
+
   void debug() const;