Changeset 8437 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

gui: Coloring-sceme much improved

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_button.cc (modified) (1 diff)
• glgui_inputline.cc (modified) (1 diff)
• glgui_slider.cc (modified) (1 diff)
• glgui_widget.cc (modified) (3 diffs)
• glgui_widget.h (modified) (1 diff)

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

@@ -55 +55 @@
 
     this->_label.setFont("fonts/final_frontier.ttf", 20);
-    this->setFrontColor(Color(1, 0, 0, 1.0));
+    this->_label.setColor(this->frontColor());
 
     this->_label.setParent2D(this);

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

@@ -51 +51 @@
     this->_text.setRelCoor2D(4,4);
     this->_text.setFont("fonts/final_frontier.ttf", 20);
+    this->_text.setColor(this->frontColor());
     this->_text.setVisibility(false);
     this->resize();

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

@@ -228 +228 @@
   void GLGuiSlider::tick(float dt)
   {
+    GLGuiWidget::tick(dt);
   }
 

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

@@ -69 +69 @@
     this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 
-    this->_backMat.setDiffuse(1.0, 0.5, 0.4);
+    this->_backMat.setDiffuseColor(Color(1.0, 0.5, 0.4, 1.0));
     this->_backMat.setDiffuseMap("gui_element_background.png");
-    this->_frontColor.setColor(1.0, 0.0, 0.0);
-    _toFrontColor = NULL;
+    this->_frontColor = Color(1.0, 0.0, 0.0);
+    this->_toFrontColor = NULL;
 
 
@@ -121 +121 @@
   }
 
-  void GLGuiWidget::setFrontColor(const Color& frontColor)
-  {
-    if (!this->_toFrontColor)
+  void GLGuiWidget::setFrontColor(const Color& frontColor, bool instantaniously)
+  {
+    if (instantaniously)
+    {
+      this->_frontColor = frontColor;
+      if (this->_toFrontColor != NULL)
+      {
+        delete this->_toFrontColor;
+        this->_toFrontColor = NULL;
+      }
+    }
+    else if (!this->_toFrontColor)
       this->_toFrontColor = new Color(frontColor);
     else
@@ -214 +223 @@
 
   void GLGuiWidget::destroyed()
-  {
-  };
+  {}
+  ;
 
 

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

@@ -92 +92 @@
     const Rect2D& backRect() const { return this->_backRect; };
 
-    void setFrontColor(const Color& frontColor);
+    void setFrontColor(const Color& frontColor, bool instantaniously = false);
     const Color& frontColor() const { return this->_frontColor; };