Changeset 8976 in orxonox.OLD

Timestamp:

Jul 1, 2006, 1:05:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the hud displays Energy and WeaponEnergy

Location:

trunk/src

Files:

• util/hud.cc (modified) (5 diffs)
• world_entities/elements/glgui_energywidget.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (2 diffs)
• world_entities/weapons/weapon.h (modified) (2 diffs)

trunk/src/util/hud.cc

@@ -19 +19 @@
 
 #include "state.h"
+#include "debug.h"
 
 #include "world_entities/weapons/weapon_manager.h"
@@ -121 +122 @@
 
   this->updateWeaponManager();
-  this->updateResolution();
+//  this->updateResolution();
 }
 
@@ -141 +142 @@
       if (weapon != NULL)
       {
+        //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassName(), weapon->getName());
         weapon->getEnergyWidget()->show();
         weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
@@ -161 +163 @@
   this->resX = State::getResX();
   this->resY = State::getResY();
+
+  this->setSize2D(.2 * this->resX, this->resY);
+
   if (this->energyWidget != NULL)
   {
@@ -167 +172 @@
   }
 
-  this->setSize2D(.2 * this->resX, this->resY);
 
   std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget;
   float pos = .3;
-  for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03)
-  {
-    (*weaponWidget)->setWidgetSize(.02*this->resX, .2 *this->resY);
-    (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
-
+  for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.3)
+  {
+    (*weaponWidget)->setAbsCoor2D(pos*this->resX, .9*this->resY);
+    (*weaponWidget)->setWidgetSize(.02*this->resX, .1 *this->resY);
+    (*weaponWidget)->show();
+    //printf("update thing %s::%s\n", (*weaponWidget)->getClassName(), (*weaponWidget)->getName());
   }
 }

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -50 +50 @@
   void GLGuiEnergyWidget::setValue(float value)
   {
-    MultiType val = value;
+    MultiType val(value);
+    val.setType(MT_INT);
 
     this->bar.setValue(value);

trunk/src/world_entities/weapons/weapon.cc

@@ -34 +34 @@
 #include "sound_buffer.h"
 
-#include "glgui_bar.h"
+#include "elements/glgui_energywidget.h"
 
 using namespace std;
@@ -312 +312 @@
   if (this->energyWidget == NULL)
   {
-    this->energyWidget = new OrxGui::GLGuiBar;
+    this->energyWidget = new OrxGui::GLGuiEnergyWidget;
     this->energyWidget->setSize2D( 20, 100);
     this->energyWidget->setMaximum(this->getEnergyMax());

trunk/src/world_entities/weapons/weapon.h

@@ -25 +25 @@
 class TiXmlElement;
 class FastFactory;
-namespace OrxGui{ class GLGuiWidget; }
 template<class T> class tFastFactory;
 
@@ -210 +209 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    OrxGui::GLGuiBar*    energyWidget;
+    OrxGui::GLGuiEnergyWidget* energyWidget;
 
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.