Changeset 10698 in orxonox.OLD for trunk/src/util/hud.h

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

File:

• trunk/src/util/hud.h (modified) (5 diffs)

trunk/src/util/hud.h

@@ -28 +28 @@
 
 public:
+
+  typedef enum {
+    Vertical         =  1,       //!< Vertical (seen from left or right/move in x-z)
+    Horizontal       =  2,       //!< Horizontal (seet from the top/move in x-y)
+    FromBehind       =  4,       //!< Seen from behind (move in z-y)
+    Full3D           =  8,       //!< Full featured 3D-mode. (move in all directions x-y-z)
+    FirstPerson      = 16,
+
+    PlaymodeCount    =  5,
+  } Playmode;
+  
   Hud();
   virtual ~Hud();
@@ -36 +47 @@
   void notifyUser(const std::string& message);
 
+  inline void setMode(Hud::Playmode playmode) {this->playmode = playmode;};
+  inline Hud::Playmode getMode() {return this->playmode;};
 
   void setBackGround();
   void setEnergyWidget(OrxGui::GLGuiWidget* widget);
-  void setShiledWidget(OrxGui::GLGuiWidget* widget);
-  void setArmorWidget(OrxGui::GLGuiWidget* widget);
+  void setShieldWidget(OrxGui::GLGuiWidget* widget);
+  void setHealthWidget(OrxGui::GLGuiWidget* widget);
+  void setImplantWidget(OrxGui::GLGuiWidget* widget);
+
   inline OrxGui::GLGuiWidget* getEnergyWidget() {return this->energyWidget;};
   inline OrxGui::GLGuiWidget* getShieldWidget() {return this->shieldWidget;};
-  inline OrxGui::GLGuiWidget* getArmorWidget() {return this->armorWidget;};
+  inline OrxGui::GLGuiWidget* getHealthWidget() {return this->healthWidget;};
+  inline OrxGui::GLGuiWidget* getImplantWidget() {return this->implantWidget;};
 
   void setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec = NULL);
@@ -82 +98 @@
   unsigned int             resX;
   unsigned int             resY;
+  
+  Hud::Playmode                         playmode; 
 
   float                    travelZoneWidth; //the percentage of the screen, the player has got for his movements. should always be a value between 0 and 1;
@@ -87 +105 @@
   OrxGui::GLGuiWidget*     energyWidget;
   OrxGui::GLGuiWidget*     shieldWidget;
-  OrxGui::GLGuiWidget*     armorWidget;
+  OrxGui::GLGuiWidget*     healthWidget;
+  OrxGui::GLGuiWidget*     implantWidget;
 
   OrxGui::GLGuiNotifier*   notifier;
@@ -96 +115 @@
   OrxGui::GLGuiWidget*     rightRect;
   OrxGui::GLGuiWidget*     leftRect;
+  OrxGui::GLGuiWidget*          topRect;
+  OrxGui::GLGuiWidget*          bottomRect;
+  OrxGui::GLGuiWidget*          middleRect;
+  OrxGui::GLGuiWidget*          barSocket;
   bool                     overlayActive;
   int                      overlayPercentage; //the percentage of the screen, the player has got for his movements. should always be a value between 0 and 1;