Changeset 8983 in orxonox.OLD for trunk/src/lib

Timestamp:

Jul 1, 2006, 4:12:44 PM (18 years ago)

Author:

bensch

Message:

blend-stuff

Location:

trunk/src/lib/gui/gl

Files:

• glgui_bar.cc (modified) (5 diffs)
• glgui_bar.h (modified) (3 diffs)
• glgui_widget.h (modified) (1 diff)

trunk/src/lib/gui/gl/glgui_bar.cc

@@ -18 +18 @@
 #include "glgui_bar.h"
 
+#include "debug.h"
 
 namespace OrxGui
@@ -36 +37 @@
    */
   GLGuiBar::~GLGuiBar()
-  {
-  }
+  {}
 
   /**
@@ -50 +50 @@
     this->setSize2D(50, 10);
 
-    this->value = 0.5f;
-    this->minimum = 0.0f;
-    this->maximum = 1.0f;
+    this->_minimum = 0.0f;
+    this->_maximum = 1.0f;
+    this->setValue(0.5f);
+    this->resize();
+  }
+
+  void GLGuiBar::setValue(float value)
+  {
+    if (value > _maximum)
+    {
+      value = _maximum;
+      PRINTF(2)("Oversteped range, set Value to %f\n", _maximum);
+    }
+    if (value < _minimum)
+    {
+      value = _minimum;
+      PRINTF(2)("Oversteped range, set Value to %f\n", _minimum);
+    }
+
+    this->_value = value;
+
+    this->_frontRect.setRight(this->getSizeX2D() * (_value -_minimum)/ (_minimum + _maximum));
+  }
+  void GLGuiBar::setMinimum(float minimum)
+  {
+    this->_minimum = minimum;
+  }
+  void GLGuiBar::setMaximum(float maximum)
+  {
+    this->_maximum = maximum;
+  }
+  void GLGuiBar::setRange(float minimum, float maximum)
+  {
+    this->setMinimum(minimum);
+    this->setMaximum(maximum);
   }
 
@@ -59 +91 @@
     GLGuiWidget::resize();
 
+    this->_frontRect.setTopLeft(borderLeft(), borderTop());
+    this->_frontRect.setSize((this->getSizeX2D() - borderLeft() - borderRight()) * (_value -_minimum)/ (_minimum + _maximum)
+                             ,this->getSizeY2D() - borderTop() - borderBottom());
 
   }
+
+  void GLGuiBar::updateFrontColor()
+  {
+    this->font().setDiffuseColor(Color());
+  }
+
 
 
@@ -71 +112 @@
     GLGuiWidget::draw();
 
+    this->font().select();
+    glDisable(GL_BLEND);
+    this->drawRect(this->_frontRect);
+
     this->endDraw();
   }

trunk/src/lib/gui/gl/glgui_bar.h

@@ -26 +26 @@
     virtual ~GLGuiBar();
 
-    void setValue(float value) { this->value = value; };
-    void setMinimum(float minimum) { this->minimum = minimum; };
-    void setMaximum(float maximum) { this->maximum = maximum; };
+    void setValue(float value);
+    void setMinimum(float minimum);
+    void setMaximum(float maximum);
+    void setRange(float minimum, float maximum);
 
-    float getValue() const { return this->value; };
-    float getMinimum() const { return this->minimum; };
-    float getMaximum() const { return this->maximum; };
+    float getValue() const { return this->_value; };
+    float getMinimum() const { return this->_minimum; };
+    float getMaximum() const { return this->_maximum; };
 
     virtual void update() { };
@@ -39 +40 @@
   protected:
     virtual void resize();
+    virtual void updateFrontColor();
 
   private:
@@ -44 +46 @@
 
   private:
-    float value;
+    float         _value;
 
-    float minimum;
-    float maximum;
+    Rect2D        _frontRect;
+
+    float         _minimum;
+    float         _maximum;
   };
 }

trunk/src/lib/gui/gl/glgui_widget.h

@@ -119 +119 @@
     /** @returns FeaturePosition */
     inline FeaturePosition featurePosition() const { return _featurePosition; }
+    /** @returns the constant font */
+    inline const Font& font() const { return _font; }
     /** @returns the font */
-    inline const Font& font() const { return _font; }
+    inline Font& font() { return _font; }
     /** @returns true if the Element is Animated */
     inline bool animating() const { return _animating; }