Changeset 8448 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_widget.cc

Timestamp:

Jun 15, 2006, 12:48:26 PM (18 years ago)

Author:

bensch

Message:

merged gui back to the trunk
merged with command
merge -r8377:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .

File:

• trunk/src/lib/gui/gl/glgui_widget.cc (modified) (9 diffs)

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

@@ -45 +45 @@
     if (this == GLGuiWidget::_focused)
       GLGuiWidget::_focused = NULL;
+
+    if (this->_toFrontColor)
+      delete this->_toFrontColor;
   }
 
@@ -66 +69 @@
     this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 
-    this->_backMat.setDiffuse(1.0, 1.0, 1.0);
-    this->_frontMat.setDiffuse(1.0, 0.0, 0.0);
-
-    this->_borderLeft = 1.0;
+    this->_backMat.setDiffuseColor(Color(1.0, 0.5, 0.4, 1.0));
+    this->_backMat.setDiffuseMap("gui_element_background.png");
+    this->_frontColor = Color(1.0, 0.0, 0.0);
+    this->_toFrontColor = NULL;
+
+
+    this->_borderLeft = 15.0;
     this->_borderRight = 1.0;
     this->_borderTop = 1.0;
@@ -115 +121 @@
   }
 
+  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
+      *this->_toFrontColor = frontColor;
+    //this->_frontColor = frontColor;
+    //this->updateFrontColor();
+  };
+
 
   void GLGuiWidget::setBorderSize(float borderSize)
@@ -176 +201 @@
   void GLGuiWidget::clicking(const Vector2D& pos)
   {
-    this->frontMaterial().setDiffuse(0, 0, 1);
+    this->setFrontColor(Color(0, 0, 1));
 
   }
@@ -182 +207 @@
   void GLGuiWidget::releasing(const Vector2D& pos)
   {
-    this->frontMaterial().setDiffuse(0,1,0);
+    this->setFrontColor(Color(0,1,0));
 
   }
@@ -188 +213 @@
   void GLGuiWidget::receivedFocus()
   {
-    this->frontMaterial().setDiffuse(0, 1, 0);
+    this->setFrontColor(Color(0, 1, 0));
   }
 
   void GLGuiWidget::removedFocus()
   {
-    this->frontMaterial().setDiffuse(1, 0, 0);
+    this->setFrontColor(Color(1, 0, 0));
 
   }
@@ -201 +226 @@
   ;
 
+
   void GLGuiWidget::setWidgetSize(const Vector2D& size)
   {
@@ -239 +265 @@
     this->setVisibility(false);
     this->hiding();
+  }
+
+  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;
+      }
+    }
   }
 
@@ -249 +289 @@
     this->backMaterial().select();
     this->drawRect(this->backRect());
+    this->backMaterial().unselect();
   }