Changeset 8435 in orxonox.OLD

Timestamp:

Jun 15, 2006, 1:16:13 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: fade to colors
now the gui can be looked at
at least a bit

Location:

branches/gui/src/lib

Files:

• gui/gl/glgui_button.cc (modified) (1 diff)
• gui/gl/glgui_inputline.cc (modified) (1 diff)
• gui/gl/glgui_widget.cc (modified) (4 diffs)
• gui/gl/glgui_widget.h (modified) (3 diffs)
• util/color.h (modified) (1 diff)

branches/gui/src/lib/gui/gl/glgui_button.cc

@@ -72 +72 @@
   {
     this->_label.setColor(this->frontColor());
-    printf("TEST Color is "); this->frontColor().debug();
   }
 

branches/gui/src/lib/gui/gl/glgui_inputline.cc

@@ -191 +191 @@
   void GLGuiInputLine::tick(float dt)
   {
+    GLGuiWidget::tick(dt);
     if (this->delayNext > 0.0)
       this->delayNext -= dt;

branches/gui/src/lib/gui/gl/glgui_widget.cc

@@ -45 +45 @@
     if (this == GLGuiWidget::_focused)
       GLGuiWidget::_focused = NULL;
+
+    if (this->_toFrontColor)
+      delete this->_toFrontColor;
   }
 
@@ -69 +72 @@
     this->_backMat.setDiffuseMap("gui_element_background.png");
     this->_frontColor.setColor(1.0, 0.0, 0.0);
+    _toFrontColor = NULL;
+
 
     this->_borderLeft = 15.0;
@@ -116 +121 @@
   }
 
+  void GLGuiWidget::setFrontColor(const Color& frontColor)
+  {
+    if (!this->_toFrontColor)
+      this->_toFrontColor = new Color(frontColor);
+    else
+      *this->_toFrontColor = frontColor;
+    //this->_frontColor = frontColor;
+    //this->updateFrontColor();
+  };
+
 
   void GLGuiWidget::setBorderSize(float borderSize)
@@ -243 +258 @@
   }
 
+  void GLGuiWidget::tick(float dt)
+  {
+    if (this->_toFrontColor)
+    {
+      this->_frontColor.slerp(*_toFrontColor, dt*3.0);
+      this->updateFrontColor();
+      if (this->_frontColor.dist(*_toFrontColor) < .1)
+      {
+        delete _toFrontColor;
+        _toFrontColor = NULL;
+      }
+    }
+  }
+
 
   /**

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

@@ -92 +92 @@
     const Rect2D& backRect() const { return this->_backRect; };
 
-    void setFrontColor(const Color& frontColor) { this->_frontColor = frontColor; this->updateFrontColor(); };
+    void setFrontColor(const Color& frontColor);
     const Color& frontColor() const { return this->_frontColor; };
 
@@ -126 +126 @@
 
     virtual void update() {};
+    virtual void tick(float dt);
     virtual void draw() const;
 
@@ -163 +164 @@
 
     Color                          _frontColor;
+    Color*                         _toFrontColor;
 
     float                          _borderLeft;

branches/gui/src/lib/util/color.h

@@ -38 +38 @@
 
   void setColor(float r = 0.0f, float g = 0.0f, float b = 0.0f, float a = 1.0f) { _rgba[0] = r; _rgba[1] = g; _rgba[2] = b; _rgba[3] = a; };
+  void setColor(const Color& c) { r() = c.r();  g()= c.g(); b() = c.b(); a() = c.a(); };
 
+  inline float dist(const Color& c) const { return (sqrt((r()-c.r())*(r()-c.r()) + (g()-c.g())*(g()-c.g()) + (b()-c.b())*(b()-c.b()) + (a()-c.a())*(a()-c.a()))); }
   /// Maths
   inline const Color& operator+=(const Color& c) { r()+=c.r(); g()+=c.g(); b()+=c.b(); a()+=c.a(); return *this; };