Changeset 9965 in orxonox.OLD for branches/playability/src/util

Timestamp:

Nov 28, 2006, 11:54:34 PM (18 years ago)

Author:

marcscha

Message:

Modifications to ship, HUD,.. see changelog

Location:

branches/playability/src/util

Files:

• hud.cc (modified) (4 diffs)
• hud.h (modified) (2 diffs)

branches/playability/src/util/hud.cc

@@ -45 +45 @@
   //this->setSize2D(
   this->weaponManager = NULL;
+  this->weaponManagerSecondary = NULL;
   this->energyWidget = NULL;
   this->shieldWidget = NULL;
@@ -118 +119 @@
 {}
 
-void Hud::setWeaponManager(WeaponManager* weaponMan)
+void Hud::setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec)
 {
   if (this->weaponManager != NULL)
@@ -133 +134 @@
   }
 
+  if (this->weaponManagerSecondary != NULL)
+  {
+    for (unsigned int i = 0; i < this->weaponManagerSecondary->getSlotCount(); i++)
+    {
+      Weapon* weapon = this->weaponManagerSecondary->getWeapon(i);
+      if (weapon != NULL)
+      {
+        weapon->getEnergyWidget()->hide();
+        this->weaponsWidgets.remove(weapon->getEnergyWidget());
+      }
+    }
+  }
+
   this->weaponManager = weaponMan;
+  this->weaponManagerSecondary = weaponManSec;
 
   this->updateWeaponManager();
@@ -164 +179 @@
       }
     }
+
+  if (this->weaponManagerSecondary != NULL)
+    for (unsigned int i = 0; i < this->weaponManagerSecondary->getSlotCount(); i++)
+    {
+      Weapon* weapon = this->weaponManagerSecondary->getWeapon(i);
+      if (weapon != NULL)
+      {
+        //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassCName(), weapon->getName());
+        weapon->getEnergyWidget()->show();
+        weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
+        weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
+        //      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
+        this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+      }
+    }
+
   this->updateResolution();
+
 }
 

branches/playability/src/util/hud.h

@@ -39 +39 @@
   void setShiledWidget(OrxGui::GLGuiWidget* widget);
   void setArmorWidget(OrxGui::GLGuiWidget* widget);
-  void setWeaponManager(WeaponManager* weaponMan);
+  void setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec = NULL);
 
   void addWeaponWidget(OrxGui::GLGuiWidget* widget);
@@ -68 +68 @@
 
   WeaponManager*           weaponManager;
+  WeaponManager*           weaponManagerSecondary;
 
   std::list<OrxGui::GLGuiWidget*> weaponsWidgets; //!< WeaponWidgets will be displayed one after another