Changeset 8984 in orxonox.OLD for trunk

Timestamp:

Jul 1, 2006, 4:23:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: gui with fading

Location:

trunk/src

Files:

• lib/gui/gl/glgui_bar.cc (modified) (3 diffs)
• lib/gui/gl/glgui_bar.h (modified) (1 diff)
• world_entities/elements/glgui_energywidget.cc (modified) (2 diffs)
• world_entities/weapons/test_gun.cc (modified) (1 diff)

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

@@ -70 +70 @@
 
     this->_value = value;
-
-    this->_frontRect.setRight(this->getSizeX2D() * (_value -_minimum)/ (_minimum + _maximum));
+    this->_frontRect.setSize((this->getSizeX2D() - borderLeft() - borderRight()) * (_value -_minimum)/ (_minimum + _maximum)
+        ,this->getSizeY2D() - borderTop() - borderBottom());
   }
   void GLGuiBar::setMinimum(float minimum)
@@ -97 +97 @@
   }
 
-  void GLGuiBar::updateFrontColor()
-  {
-    this->font().setDiffuseColor(Color());
-  }
-
-
 
   /**
@@ -112 +106 @@
     GLGuiWidget::draw();
 
-    this->font().select();
-    glDisable(GL_BLEND);
+    this->foreground().select();
     this->drawRect(this->_frontRect);
 

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

@@ -40 +40 @@
   protected:
     virtual void resize();
-    virtual void updateFrontColor();
 
   private:

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -39 +39 @@
     this->_bar.setBackgroundTexture(Texture());
     this->_bar.setBackgroundColor(Color(0,0,0,0));
-    this->_bar.setForegroundColor(Color(1, 1, 1, 1));
+    this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
     this->_bar.font().setBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
   }
@@ -68 +68 @@
     val.setType(MT_INT);
 
+
     this->_bar.setValue(value);
+    this->_bar.setForegroundColor(Color(1 - (value / this->_bar.getMaximum()), value / this->_bar.getMaximum(),0,1));
     this->_valueText.setText(val.getString());
   }

trunk/src/world_entities/weapons/test_gun.cc

@@ -120 +120 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setEnergyMax(10000);
+  this->setEnergyMax(1000);
   this->increaseEnergy(1000);
   //this->minCharge = 2;