Changeset 7062 in orxonox.OLD

Timestamp:

Feb 6, 2006, 9:55:04 PM (18 years ago)

Author:

bensch

Message:

hud

Location:

trunk/src

Files:

• lib/gui/gl_gui/glgui_bar.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_widget.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_widget.h (modified) (1 diff)
• util/hud.cc (modified) (3 diffs)
• util/hud.h (modified) (1 diff)

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

@@ -45 +45 @@
   this->setClassID(CL_GLGUI_BAR, "GLGuiBar");
 
-  this->frontMat.setDiffuse(1,0,0);
-  this->frontMat.setTransparency(.99);
+  this->frontMat.setDiffuse(1,1,1);
 
   this->setSize2D(50, 10);
@@ -67 +66 @@
   glBegin(GL_QUADS);
 
+  glTexCoord2i(0,0);
   glVertex2f(3.0, 3.0);
+  glTexCoord2i(0,1);
   glVertex2f(3.0, (this->getSizeY2D()-3.0)* (value/maximum));
+  glTexCoord2i(1,1);
   glVertex2f(this->getSizeX2D()-3.0, (this->getSizeY2D()-3.0) * (value/maximum));
+  glTexCoord2i(1,0);
   glVertex2f(this->getSizeX2D()-3.0, 3.0);
 

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

@@ -54 +54 @@
 //  this->setParent2D((Element2D*)NULL);
 
-  this->backMat.setDiffuse(.1, .5, .5);
-  this->backMat.setTransparency(.9);
+  this->backMat.setDiffuse(1.0, 1.0, 1.0);
 
   this->frontModel = 0;
@@ -118 +117 @@
 
   glBegin(GL_QUADS);
-   glVertex2d(0, 0);
-   glVertex2d(0, this->getSizeY2D());
-   glVertex2d(this->getSizeX2D(), this->getSizeY2D());
-   glVertex2d(this->getSizeX2D(), 0);
+   glTexCoord2i(0,1); glVertex2d(0, 0);
+   glTexCoord2i(0,0); glVertex2d(0, this->getSizeY2D());
+   glTexCoord2i(1,0); glVertex2d(this->getSizeX2D(), this->getSizeY2D());
+   glTexCoord2i(1,1); glVertex2d(this->getSizeX2D(), 0);
   glEnd();
 }

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

@@ -66 +66 @@
     virtual void draw() const;
 
+    Material& backMaterial() { return this->backMat; };
+    Material& frontMaterial() { return this->frontMat; };
+
   protected:
     inline void startDraw() const { glPushMatrix(); glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0); };

trunk/src/util/hud.cc

@@ -74 +74 @@
   {
     this->energyWidget->show();
+    this->energyWidget->backMaterial().setDiffuseMap("hud_energy_background.png");
+    this->energyWidget->backMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
+    this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   }
 
@@ -146 +150 @@
   if (this->energyWidget != NULL)
   {
-    this->energyWidget->setAbsCoor2D(.02 * this->resX, .4 * this->resY);
-    this->energyWidget->setSize2D(.05 * this->resX, .55 * this->resY);
+    this->energyWidget->setAbsCoor2D(0 * this->resX, 0 * this->resY);
+    this->energyWidget->setSize2D(.3 * this->resX, 1 * this->resY);
   }
 
@@ -171 +175 @@
 void Hud::draw() const
 {
-  GLGuiWidget::draw();
+//  GLGuiWidget::draw();
 }
 

trunk/src/util/hud.h

@@ -41 +41 @@
   private:
     void updateResolution();
+
 private:
   unsigned int             resX;