Changeset 7939 in orxonox.OLD

Timestamp:

May 28, 2006, 10:53:10 PM (18 years ago)

Author:

bensch

Message:

gui: Silder Works perfectly

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui_handler.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_slider.cc (modified) (4 diffs)
• lib/gui/gl_gui/glgui_slider.h (modified) (1 diff)
• lib/math/vector.h (modified) (1 diff)
• lib/math/vector2D.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)

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

@@ -150 +150 @@
   }
 
+  const Vector2D& GLGuiHandler::cursorPositionAbs() const
+  {
+    if (this->cursor)
+      return this->cursor->getAbsCoor2D();
+    else
+      return Vector2D::nullVector();
+  }
+  const Vector2D& GLGuiHandler::cursorPositionRel(const GLGuiWidget* const widget) const
+  {
+    assert (widget != NULL);
+    if (this->cursor)
+      return  this->cursor->getAbsCoor2D() - widget->getAbsCoor2D();
+    else
+      return Vector2D::nullVector();
+  }
+
 
   void GLGuiHandler::draw()

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

@@ -31 +31 @@
 
     Vector2D cursorPositionOverFocusedWidget() const;
+    const Vector2D& cursorPositionAbs() const;
+    const Vector2D& cursorPositionRel(const GLGuiWidget* const widget) const;
 
     void activate();

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

@@ -18 +18 @@
 #include "glgui_slider.h"
 #include "event_def.h"
+
+#include "glgui_handler.h"
 
 namespace OrxGui
@@ -149 +151 @@
   float GLGuiSlider::sliderPosition() const
   {
-    return (this->_value - this->_minValue)/( this->_maxValue - this->_minValue) * (this->getSizeX2D() - 4.0) + 2.0;
+    return (this->_value - this->_minValue)/( this->_maxValue - this->_minValue) *
+        (this->getSizeX2D() - 2.0*(borderSize() + _sliderWidth)) +
+        (borderSize() +_sliderWidth);
   }
 
   float GLGuiSlider::sliderValue(float position) const
   {
-    return (position - 2.0) / (this->getSizeX2D() - 4.0)  *( this->_maxValue - this->_minValue) +this->_minValue ;
+    return (position - (borderSize()+_sliderWidth)) / (this->getSizeX2D() - 2.0*(borderSize() + _sliderWidth))
+        *( this->_maxValue - this->_minValue) +
+        this->_minValue ;
   }
 
@@ -165 +171 @@
     }*/
 
+  void GLGuiSlider::tick(float dt)
+  {
+/*    this->setValue(this->value() + dt);
+    if (this->value() >= this->max())
+    this->setValue(this->min());
+*/
+  }
+
   /**
    * @brief draws the GLGuiSlider
@@ -181 +195 @@
   }
 
+
   bool GLGuiSlider::processEvent( const Event& event )
   {
     if (this->grabbed && event.type == EV_MOUSE_MOTION)
     {
-      this->setValue(sliderValue(event.x - this->getAbsCoor2D().x));
+      this->setValue(sliderValue(GLGuiHandler::getInstance()->cursorPositionRel(this).x));
       return true;
     }

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

@@ -44 +44 @@
 
 
-//    virtual void tick(float dt);
+    virtual void tick(float dt);
     virtual bool processEvent(const Event& event);
     virtual void draw() const;

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

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

branches/gui/src/story_entities/simple_game_menu.cc

@@ -101 +101 @@
 
   OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();
-  slider->setRange(1, 10);
-  slider->setValue(5.0);
+  slider->setRange(-1, 10);
+  slider->setValue(slider->min());
   slider->show();
   slider->setAbsCoor2D(200, 270);