Changeset 7914 in orxonox.OLD

Timestamp:

May 28, 2006, 3:13:43 AM (18 years ago)

Author:

bensch

Message:

orxonox/gui: simple almost finished implementation of a Rectangle Class, that should greatly improve work-flow in the GUI (most widgets are Rectangled

Location:

branches/gui/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/gui/gl_gui/Makefile.am (modified) (2 diffs)
• lib/gui/gl_gui/glgui_slider.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_slider.h (modified) (3 diffs)
• lib/math/Makefile.am (modified) (2 diffs)
• lib/math/rect2D.cc (copied) (copied from branches/gui/src/lib/math/vector2D.cc) (2 diffs)
• lib/math/rect2D.h (copied) (copied from branches/gui/src/lib/math/vector2D.h) (1 diff)
• lib/math/vector2D.h (modified) (2 diffs)

branches/gui/src/defs/class_id.h

@@ -325 +325 @@
   CL_GLGUI_CHECKBUTTON          =    0x00000b04,
   CL_GLGUI_RADIOBUTTON          =    0x00000b05,
+  CL_GLGUI_SLIDER               =    0x00000b06,
+  CL_GLGUI_PROGRESSBAR          =    0x00000b07,
   CL_GLGUI_CONTAINER            =    0x00b04000,
-  CL_GLGUI_BOX                  =    0x00000b07,
-  CL_GLGUI_FRAME                =    0x00000b08,
-  CL_GLGUI_WINDOW               =    0x00000b09,
+  CL_GLGUI_BOX                  =    0x00000b17,
+  CL_GLGUI_FRAME                =    0x00000b18,
+  CL_GLGUI_WINDOW               =    0x00000b19,
   CL_GLMENU_IMAGE_SCREEN        =    0x00000b20,
   CL_GLGUI_BAR                  =    0x00000b30,

branches/gui/src/lib/gui/gl_gui/Makefile.am

@@ -18 +18 @@
                 glgui_pushbutton.cc \
                 glgui_checkbutton.cc \
+                glgui_slider.cc \
                 glgui_container.cc \
                 glgui_bar.cc \
@@ -38 +39 @@
                 glgui_pushbutton.h \
                 glgui_checkbutton.h \
+                glgui_slider.h \
                 glgui_container.h \
                 glgui_bar.h \

branches/gui/src/lib/gui/gl_gui/glgui_slider.cc

@@ -50 +50 @@
    * draws the GLGuiSlider
    */
-  void GLGuiSlider::draw()
+  void GLGuiSlider::draw() const
   {
   }

branches/gui/src/lib/gui/gl_gui/glgui_slider.h

@@ -8 +8 @@
 #define _GLGUI_SLIDER_H
 
-#include "base_object.h"
+#include "glgui_widget.h"
 
 
@@ -19 +19 @@
    *
    */
-  class GLGuiSlider : public GLGuiSlider
+  class GLGuiSlider : public GLGuiWidget
   {
 
@@ -28 +28 @@
     void init();
 
-    virtual void draw();
+    virtual void draw() const;
 
   private:

branches/gui/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

branches/gui/src/lib/math/rect2D.cc

@@ -19 +19 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MATH
 
-#include "vector2D.h"
+#include "rect2D.h"
 #ifdef DEBUG
   #include "debug.h"
@@ -27 +27 @@
 #endif
 
-using namespace std;
-
-/////////////
-/* VECTORS */
-/////////////
-/**
- *  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.
- */
-Vector2D Vector2D::getNormalized() const
-{
-  float l = this->len();
-  if(unlikely(l == 1.0 || l == 0.0))
-    return *this;
-  else
-    return (*this / l);
-}
-
-/**
- *  Vector2D is looking in the positive direction on all axes after this
-*/
-Vector2D Vector2D::abs()
-{
-  Vector2D v(fabs(x), fabs(y));
-  return v;
-}
-
-
-
-/**
- *  Outputs the values of the Vector2D
- */
-void Vector2D::debug() const
-{
-  PRINT(0)("x: %f; y: %f", x, y);
-  PRINT(0)(" lenght: %f", len());
-  PRINT(0)("\n");
-}
+/**
+ * @brief creates a new Rectangle with
+ * @param x the left border
+ * @param y the top border
+ * @param width: the width
+ * @param height the height
+ */
+Rect2D::Rect2D(float x, float y, float width, float height)
+{
+  this->setLeft(x), this->setTop(y);
+  this->setSize(width, height);
+}
+
+/**
+ * @brief creates a new Rectangle with
+ * @param topLeft the top-left corner
+ * @param bottomRight the lower-right corner
+ */
+Rect2D::Rect2D(const Vector2D& topLeft, const Vector2D& bottomRight )
+{
+  this->setTopLeft(topLeft);
+  this->setBottomRight(bottomRight);
+}
+
+/**
+ * @brief creates a new Rectangle with
+ * @param rect the rectangle to copy.
+ */
+Rect2D::Rect2D(const Rect2D& rect)
+{
+  *this = rect;
+}
+
+/**
+ * @brief copies the Values of rect to this rect
+ * @param rect copy the values from.
+ * @returns this reference.
+ */
+Rect2D& Rect2D::operator=(const Rect2D& rect)
+{
+  this->_topLeft = rect._topLeft;
+  this->_bottomRight = rect._bottomRight;
+  return *this;
+}
+
+bool Rect2D::operator==(const Rect2D& rect) const
+{
+  return (this->_topLeft == rect._topLeft &&
+      this->_bottomRight == rect._bottomRight);
+}
+
+bool Rect2D::operator!=(const Rect2D& rect) const
+{
+  return (this->_topLeft != rect._topLeft ||
+      this->_bottomRight != rect._bottomRight);
+}
+
+
+Rect2D Rect2D::operator+(const Rect2D& rect) const
+  {
+    return Rect2D(this->_topLeft + rect._topLeft,
+                  this->_bottomRight + rect._bottomRight);
+  }
+
+
+Rect2D& Rect2D::operator+=(const Rect2D& rect)
+{
+  this->_topLeft += rect._topLeft;
+  this->_bottomRight += rect._bottomRight;
+  return *this;
+}
+
+
+Rect2D Rect2D::operator-(const Rect2D& rect) const
+{
+  return Rect2D(this->_topLeft - rect._topLeft,
+                this->_bottomRight - rect._bottomRight);
+}
+
+Rect2D& Rect2D::operator-=(const Rect2D& rect)
+{
+  this->_topLeft -= rect._topLeft;
+  this->_bottomRight -= rect._bottomRight;
+  return *this;
+}
+
+Rect2D Rect2D::operator&(const Rect2D& rect) const
+  {
+    return this->intersection(rect);
+  }
+
+Rect2D& Rect2D::operator&=(const Rect2D& rect)
+{
+  *this = this->intersection(rect);
+}
+
+Rect2D Rect2D::operator*(const Vector2D& scaling) const
+{
+#warning implements this...
+  //this->scale(scaling);
+}
+
+
+void Rect2D::setWidth(float width)
+{
+  this->_bottomRight.x = this->_topLeft.x + width;
+}
+
+
+void Rect2D::setHeight(float height)
+{
+  this->_bottomRight.y = this->_topLeft.y + height;
+}
+
+void Rect2D::setSize(float width, float height)
+{
+  this->_bottomRight = this->_topLeft + Vector2D(width, height);
+}
+
+void Rect2D::setSize(const Vector2D& size)
+{
+  this->_bottomRight = this->_topLeft + size;
+}
+
+void Rect2D::setCenter(const Vector2D& center)
+{
+  this->move(center - this->center());
+}
+
+void Rect2D::scaleX(float x)
+{
+  this->_bottomRight.x = this->_topLeft.x + this->width() * x;
+}
+
+void Rect2D::scaleY(float y)
+{
+  this->_bottomRight.y = this->_topLeft.y + this->height() * y;
+}
+
+void Rect2D::scale(float x, float y)
+{
+  this->scale(Vector2D(x,y));
+}
+
+void Rect2D::scale(const Vector2D& v)
+{
+  this->_bottomRight = this->_topLeft + this->size().internalMultipy(v);
+
+}
+
+void Rect2D::scaleCentered(float x, float y)
+{
+  this->scaleCentered(Vector2D(x, y));
+}
+
+void Rect2D::scaleCentered(const Vector2D& v)
+{
+#warning implement this
+}
+
+void Rect2D::moveX(float x)
+{
+  this->_topLeft.x += x;
+  this->_bottomRight.x += x;
+}
+
+void Rect2D::moveY(float y)
+{
+  this->_topLeft.y += y;
+  this->_bottomRight.y += y;
+}
+void Rect2D::move(const Vector2D& v)
+{
+  this->_topLeft += v;
+  this->_bottomRight += v;
+}
+
+void Rect2D::swapTopBottom()
+{
+  float tmp = this->top();
+  this->setTop(this->bottom());
+  this->setBottom(tmp);
+}
+
+void Rect2D::swapLeftRight()
+{
+  float tmp = this->left();
+  this->setLeft(this->right());
+  this->setRight(tmp);
+}
+
+
+void Rect2D::normalize()
+{
+  if (this->top() > this->bottom())
+    this->swapTopBottom();
+  if (this->left() > this->right())
+    this->swapLeftRight();
+}
+
+Rect2D Rect2D::normalized() const
+{
+  Rect2D norm(*this);
+  norm.normalize();
+  return norm;
+}
+
+
+Rect2D Rect2D::intersection(const Rect2D& intersector) const
+{
+#warning implement
+}
+
+bool Rect2D::intersects(const Rect2D& intersector) const
+  {
+#warning implement
+
+  }
+Rect2D Rect2D::unite(const Rect2D& rect)
+  {
+#warning implement
+  }
+bool Rect2D::contains(const Rect2D& rect) const
+  {
+    return (this->top() <= rect.top() &&
+        this->bottom() >= rect.bottom() &&
+        this->left() <= rect.left() &&
+        this->right() >= rect.right());
+  }
+bool Rect2D::contains(const Vector2D& point) const
+  {
+    return (this->top() <= point.y &&
+        this->bottom() >= point.y &&
+        this->left() <= point.x &&
+        this->right() >= point.x);
+  }
+
+const Rect2D& Rect2D::slerp(const Rect2D& rect, float value)
+{
+  this->_topLeft.slerp(rect._topLeft, value);
+  this->_bottomRight.slerp(rect._bottomRight, value);
+
+  return *this;
+}
+

branches/gui/src/lib/math/rect2D.h

@@ -21 +21 @@
 */
 
-#ifndef __VECTOR2D_H_
-#define __VECTOR2D_H_
+#ifndef __RECT2D_H_
+#define __RECT2D_H_
 
-#include <math.h>
-#include "compiler.h"
+#include <cmath>
+#include "vector2D.h"
 
-//! small and performant 2D vector
-typedef float sVec2D[2];
+//! 2D Rectangle 2D
+/**
+ *       Class to handle 2-Dimensional Rectangles.
+ */
+class Rect2D
+{
+public:
+  Rect2D(float x, float y, float width, float height);
+  Rect2D(const Vector2D& topLeft, const Vector2D& bottomRight );
+  Rect2D(const Rect2D& rect);
 
-//! 2D Vector2D
-/**
- *       Class to handle 2D Vector2Ds
- */
-class Vector2D {
- public:
-  Vector2D (float x, float y) : x(x), y(y) {}  //!< assignment constructor
-  Vector2D () : x(0), y(0) {}
+  Rect2D& operator=(const Rect2D& rect);
+  bool operator==(const Rect2D& rect) const;
+  bool operator!=(const Rect2D& rect) const;
 
-  /** @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); };
-  /** @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; }
-  /** @param v The vector to add @returns the addition between two vectors (this + v) */
-  inline Vector2D operator+ (const Vector2D& v) const { return Vector2D(x + v.x, y + v.y); };
-  /** @param v The vector to add @returns the addition between two vectors (this + v) */
-  inline Vector2D operator+ (const sVec2D& v) const { return Vector2D(x + v[0], y + v[1]); };
-  /** @param v The vector to add  @returns the addition between two vectors (this += v) */
-  inline const Vector2D& operator+= (const Vector2D& v) { this->x += v.x; this->y += v.y; return *this; };
-  /** @param v The vector to substract  @returns the substraction between two vectors (this - v) */
-  inline const Vector2D& operator+= (const sVec2D& v) { this->x += v[0]; this->y += v[1]; return *this; };
-  /** @param v The vector to substract  @returns the substraction between two vectors (this - v) */
-  inline Vector2D operator- (const Vector2D& v) const { return Vector2D(x - v.x, y - v.y); }
-  /** @param v The vector to substract  @returns the substraction between two vectors (this - v) */
-  inline Vector2D operator- (const sVec2D& v) const { return Vector2D(x - v[0], y - v[1]); }
-  /** @param v The vector to substract  @returns the substraction between two vectors (this -= v) */
-  inline const Vector2D& operator-= (const Vector2D& v) { this->x -= v.x; this->y -= v.y; return *this; };
-  /** @param v The vector to substract  @returns the substraction between two vectors (this -= v) */
-  inline const Vector2D& operator-= (const sVec2D& v) { this->x -= v[0]; this->y -= v[1]; return *this; };
-  /** @param v the second vector  @returns The dotProduct between two vector (this (dot) v) */
-  inline float operator* (const Vector2D& v) const { return x * v.x + y * v.y; };
-  /** @todo strange */
-  inline const Vector2D& operator*= (const Vector2D& v) { this->x *= v.x; this->y *= v.y; return *this; };
-  /** @param f a factor to multiply the vector with @returns the vector multiplied by f (this * f) */
-  inline Vector2D operator* (float f) const { return Vector2D(x * f, y * f); };
-  /** @param f a factor to multiply the vector with @returns the vector multiplied by f (this *= f) */
-  inline const Vector2D& operator*= (float f) { this->x *= f; this->y *= f; return *this; };
-  /** @param f a factor to divide the vector with @returns the vector divided by f (this / f) */
-  inline Vector2D operator/ (float f) const { return (unlikely(f == 0.0)) ? Vector2D(0,0):Vector2D(this->x / f, this->y / f); };
-  /** @param f a factor to divide the vector with @returns the vector divided by f (this /= f) */
-  inline const Vector2D& operator/= (float f) {if (unlikely(f == 0.0)) {this->x=0;this->y=0;} else {this->x /= f; this->y /= f;} return *this; };
-  /**  copy constructor @todo (i do not know it this is faster) @param v the vector to assign to this vector. @returns the vector v */
-  inline const Vector2D& operator= (const Vector2D& v) { this->x = v.x; this->y = v.y; return *this; };
-  /** copy constructor* @param v the sVec3D to assign to this vector. @returns the vector v */
-  inline const Vector2D& operator= (const sVec2D& v) { this->x = v[0]; this->y = v[1]; }
-  /** @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; };
-  /** 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; };
-  /** @returns the length of the vector */
-  inline float len() const { return sqrt (x*x+y*y); }
-  /** normalizes the vector */
-  inline void normalize() { float l = len(); if( unlikely(l == 0.0))return; this->x=this->x/l; this->y=this->y/l; };
-  Vector2D getNormalized() const;
-  Vector2D abs();
+  Rect2D operator+(const Rect2D& rect) const;
+  Rect2D& operator+=(const Rect2D& rect);
 
-  void debug() const;
+  Rect2D operator-(const Rect2D& rect) const;
+  Rect2D& operator-=(const Rect2D& rect);
 
- public:
-  float    x;     //!< The x Coordinate of the Vector2D.
-  float    y;     //!< The y Coordinate of the Vector2D.
+  Rect2D operator&(const Rect2D& rect) const;
+  Rect2D& operator&=(const Rect2D& rect);
+
+  Rect2D operator*(const Vector2D& scaling) const;
+
+
+
+  /** @returns the top of the Rectangle */
+  inline float top() const { return _topLeft.y; };
+  /** @returns the bottom of the Rectangle */
+  inline float bottom() const { return _bottomRight.y; };
+  /** @returns the left border of the Rectangle */
+  inline float left() const { return _topLeft.x; };
+  /** @returns the right border of the rectangle */
+  inline float right() const { return _bottomRight.x; };
+  /** @returns the Center of the Rectangle */
+  inline Vector2D center() const { return (_topLeft+_bottomRight)/ 2.0; }
+  /** @returns the width of the Rectangle */
+  inline float width() const { return (right() - left()); };
+  /** @returns the height of the rectangle */
+  inline float height() const { return (bottom() - top()); };
+  /** @returns the Size of the Rectangle */
+  inline Vector2D size() const { return Vector2D(width(), height()); }
+  /** @returns the area of the Rectangle */
+  float area() const { return width()*height(); }
+
+  /** @param top sets the top border of the Rectangle */
+  inline void setTop(float top) { _topLeft.y = top; };
+  /** @param bottom the bottom border of the Rectangle */
+  inline void setBottom(float bottom) { _bottomRight.y = bottom; };
+  /** @param left the left border of the Rectangle */
+  inline void setLeft(float left) { _topLeft.x = left; };
+  /** @param right the right border of the Rectangle */
+  inline void setRight(float right) { _bottomRight.x = right; };
+  /** @param topLeft the top left corner of the Rectangle */
+  void setTopLeft(const Vector2D& topLeft) { _topLeft = topLeft; };
+  /** @param bottomRight the lower right corner of the Rectangle */
+  void setBottomRight(const Vector2D& bottomRight) { _bottomRight = bottomRight; };
+
+  void setWidth(float width);
+  void setHeight(float height);
+  void setSize(float width, float height);
+  void setSize(const Vector2D& size);
+  void setCenter(const Vector2D& center);
+
+  void scaleX(float x);
+  void scaleY(float y);
+  void scale(float x, float y);
+  void scale(const Vector2D& v);
+  void scaleCentered(float x, float y);
+  void scaleCentered(const Vector2D& v);
+
+  void moveX(float x);
+  void moveY(float y);
+  void move(const Vector2D& v);
+
+  void swapTopBottom();
+  void swapLeftRight();
+  void normalize();
+  Rect2D normalized() const;
+
+
+  Rect2D intersection(const Rect2D& intersector) const;
+  bool intersects(const Rect2D& intersector) const;
+  Rect2D unite(const Rect2D& rect);
+  bool contains(const Rect2D& rect) const;
+  bool contains(const Vector2D& point) const;
+
+  const Rect2D& slerp(const Rect2D& rect, float value);
+
+private:
+  Vector2D _topLeft;
+  Vector2D _bottomRight;
 };
 
 
-/** an easy way to create a Random Vector2D @param sideLength the length of the Vector2D (x not sqrt(x^2...)) */
-#define VECTOR2D_RAND(sideLength)  (Vector2D((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * sideLength)
+#endif /* __RECT2D_H_ */
 
-
-#endif /* __VECTOR2D_H_ */
-

branches/gui/src/lib/math/vector2D.h

@@ -79 +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; };
@@ -87 +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;