Changeset 8448 in orxonox.OLD for trunk/src/util

Timestamp:

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

Author:

bensch

Message:

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

Location:

trunk/src/util

Files:

• hud.cc (modified) (3 diffs)
• hud.h (modified) (1 diff)

trunk/src/util/hud.cc

@@ -21 +21 @@
 
 #include "world_entities/weapons/weapon_manager.h"
-
-using namespace std;
-
+#include "glgui_widget.h"
 
 /**
@@ -76 +74 @@
     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);
+/*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
+    this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
   }
 
@@ -132 +130 @@
       weapon->getEnergyWidget()->backMaterial().setDiffuse( .8,.2,.11);
       weapon->getEnergyWidget()->backMaterial().setTransparency(.1);
-      weapon->getEnergyWidget()->frontMaterial().setDiffuse( .2,.5,.7);
-      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
+      weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
+//      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
       this->weaponsWidgets.push_back(weapon->getEnergyWidget());
     }

trunk/src/util/hud.h

@@ -7 +7 @@
 #define _HUD_H
 
-#include "glgui_widget.h"
-#include <list>
-
+#include "element_2d.h"
 // FORWARD DECLARATION
 class TiXmlElement;
 class WeaponManager;
+namespace OrxGui { class GLGuiWidget; }
 
 //! A class that renders a HUD.