Changeset 6445 in orxonox.OLD for trunk/src

Timestamp:

Jan 8, 2006, 10:59:21 PM (19 years ago)

Author:

bensch

Message:

trunk: bars are nicer now

Location:

trunk/src

Files:

• util/hud.cc (modified) (3 diffs)
• world_entities/weapons/weapon.cc (modified) (1 diff)
• world_entities/weapons/weapon.h (modified) (1 diff)

trunk/src/util/hud.cc

@@ -103 +103 @@
   this->weaponManager = weaponMan;
 
-  if (weaponManager != NULL)
-    for (unsigned int i = 0; i < weaponMan->getSlotCount(); i++)
-    {
-      Weapon* weapon = weaponMan->getWeapon(i);
-      if (weapon != NULL)
-      {
-        weapon->getEnergyWidget()->show();
-        this->weaponsWidgets.push_back(weapon->getEnergyWidget());
-
-      }
-    }
-
-    this->updateResolution();
+  this->updateWeaponManager();
+  this->updateResolution();
 }
 
@@ -136 +125 @@
     {
       weapon->getEnergyWidget()->show();
+      weapon->getLoadedEnergyWidget()->show();
       this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+      this->weaponsWidgets.push_back(weapon->getLoadedEnergyWidget());
     }
   }
@@ -164 +155 @@
   std::list<GLGuiWidget*>::iterator weaponWidget;
   float pos = .2;
-  for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03)
+  bool test = true;
+  for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03, test = !test)
   {
-    (*weaponWidget)->setSize2D(.02*this->resX, .2 *this->resY);
-    (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
+    if (test)
+    {
+      (*weaponWidget)->setSize2D(.02*this->resX, .2 *this->resY);
+      (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
+    }
+    else
+    {
+      (*weaponWidget)->setSize2D(.02*this->resX, .17*this->resY);
+      (*weaponWidget)->setAbsCoor2D((pos-.008)*this->resX, .75*this->resY);
+    }
+
   }
 

trunk/src/world_entities/weapons/weapon.cc

@@ -289 +289 @@
 
 
-GLGuiWidget* Weapon::getMaxEnergyWidget()
+GLGuiWidget* Weapon::getLoadedEnergyWidget()
 {
   if (this->energyLoadedWidget == NULL)

trunk/src/world_entities/weapons/weapon.h

@@ -150 +150 @@
 
     GLGuiWidget* getEnergyWidget();
-    GLGuiWidget* getMaxEnergyWidget();
+    GLGuiWidget* getLoadedEnergyWidget();
 
     // FLOW