Changeset 6442 in orxonox.OLD for trunk/src

Timestamp:

Jan 8, 2006, 5:19:39 PM (19 years ago)

Author:

bensch

Message:

Gui Shows weapons (simple)

Location:

trunk/src

Files:

• util/hud.cc (modified) (6 diffs)
• util/hud.h (modified) (3 diffs)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/playable.h (modified) (2 diffs)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/weapons/weapon_manager.h (modified) (2 diffs)

trunk/src/util/hud.cc

@@ -20 +20 @@
 #include "state.h"
 
+#include "world_entities/weapons/weapon_manager.h"
+
 using namespace std;
 
@@ -32 +34 @@
 
   //this->setSize2D(
+  this->weaponManager = NULL;
   this->energyWidget = NULL;
   this->shieldWidget = NULL;
@@ -37 +40 @@
   this->resX = 1;
   this->resY = 1;
+
 }
 
@@ -51 +55 @@
 void Hud::loadParams(const TiXmlElement* root)
 {
-
 }
 
 void Hud::setBackGround()
 {
-
 }
 
@@ -78 +80 @@
 void Hud::setShiledWidget(GLGuiWidget* widget)
 {
-
 }
 
 void Hud::setArmorWidget(GLGuiWidget* widget)
 {
+}
 
+void Hud::setWeaponManager(WeaponManager* weaponMan)
+{
+  if (this->weaponManager != NULL)
+  {
+    for (unsigned int i = 0; i < this->weaponManager->getSlotCount(); i++)
+    {
+      Weapon* weapon = this->weaponManager->getWeapon(i);
+      if (weapon != NULL)
+      {
+        weapon->getEnergyWidget()->hide();
+        this->weaponsWidgets.remove(weapon->getEnergyWidget());
+      }
+    }
+  }
+
+  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();
 }
+
 
 void Hud::addWeaponWidget(GLGuiWidget* widget)
 {
-
 }
 
 void Hud::removeWeaponWidget(GLGuiWidget* widget)
 {
-
 }
 
@@ -105 +136 @@
     this->energyWidget->setSize2D(.05 * this->resX, .55 * this->resY);
   }
+
+  this->setSize2D(.2 * this->resX, this->resY);
+
+  std::list<GLGuiWidget*>::iterator weaponWidget;
+  float pos = .2;
+  for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03)
+  {
+    (*weaponWidget)->setSize2D(.02*this->resX, .2 *this->resY);
+    (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
+  }
+
 }
 

trunk/src/util/hud.h

@@ -12 +12 @@
 // FORWARD DECLARATION
 class TiXmlElement;
-
+class WeaponManager;
 
 //! A class that renders a HUD.
@@ -29 +29 @@
   void setShiledWidget(GLGuiWidget* widget);
   void setArmorWidget(GLGuiWidget* widget);
+  void setWeaponManager(WeaponManager* weaponMan);
 
   void addWeaponWidget(GLGuiWidget* widget);
@@ -46 +47 @@
   GLGuiWidget*             armorWidget;
 
+  WeaponManager*           weaponManager;
+
   std::list<GLGuiWidget*>  weaponsWidgets; //!< WeaponWidgets will be displayed one after another
 };

trunk/src/world_entities/playable.cc

@@ -25 +25 @@
 Playable::Playable()
 {
-  this->init();
+  this->setClassID(CL_PLAYABLE, "Playable");
+  PRINTF(4)("PLAYABLE INIT\n");
+
+  this->toList(OM_GROUP_01);
+  this->weaponMan = new WeaponManager(this);
+
+  // the reference to the Current Player is NULL, because we dont have one at the beginning.
+  this->currentPlayer = NULL;
 }
 
@@ -39 +46 @@
 }
 
-/**
- * initializes this Playable
- */
-void Playable::init()
-{
-  this->setClassID(CL_PLAYABLE, "Playable");
-  PRINTF(4)("PLAYABLE INIT\n");
-
-  this->toList(OM_GROUP_01);
-  this->weaponMan = new WeaponManager(this);
-
-  // the reference to the Current Player is NULL, because we dont have one at the beginning.
-  this->currentPlayer = NULL;
-}
 
 /**

trunk/src/world_entities/playable.h

@@ -10 +10 @@
 #include "event.h"
 #include <list>
+
 
 class Weapon;
@@ -51 +52 @@
 
   private:
-    void init();
-
-  private:
     WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
     std::list<int>        events;             //!< A list of Events, that are captured for this playable

trunk/src/world_entities/player.cc

@@ -59 +59 @@
       this->controllable = controllable;
       this->hud.setEnergyWidget(this->controllable->getEnergyWidget());
+      this->hud.setWeaponManager(this->controllable->getWeaponManager());
       return true;
   }
@@ -73 +74 @@
      this->controllable = NULL;
      this->hud.setEnergyWidget(NULL);
+     this->hud.setWeaponManager(NULL);
      return true;
    }

trunk/src/world_entities/weapons/weapon_manager.h

@@ -54 +54 @@
 
     void setSlotCount(unsigned int slotCount);
+    unsigned int getSlotCount() const { return this->slotCount; };
     // setting up the WeaponManager with the following functions
     void setSlotPosition(int slot, const Vector& position);
@@ -69 +70 @@
     void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
+    Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].currentWeapon: NULL; };
 
     // FIXME ::