Changeset 6437 in orxonox.OLD

Timestamp:

Jan 8, 2006, 1:12:38 PM (18 years ago)

Author:

bensch

Message:

trunk: added HUD definition and removed user_control

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• util/Makefile.am (modified) (2 diffs)
• util/hud.cc (copied) (copied from trunk/src/proto/proto_class.cc) (4 diffs)
• util/hud.h (copied) (copied from trunk/src/proto/proto_class.h) (1 diff)
• util/user_control.cc (deleted)
• util/user_control.h (deleted)

trunk/src/defs/class_id.h

@@ -195 +195 @@
   CL_EVENT                      =    0x00000501,
   CL_KEY_MAPPER                 =    0x00000502,
-  CL_USER_CONTROL               =    0x00000511,
   CL_CROSSHAIR                  =    0x00000512,
 
   CL_WEAPON_MANAGER             =    0x00000503,
+  CL_HUD                        =    0x00000520,
 
   // Physics stuff (range from 0x00000600 to 0x000007ff)

trunk/src/util/Makefile.am

@@ -8 +8 @@
                         loading/factory.cc \
                         state.cc \
-                        user_control.cc \
+                        hud.cc \
                         animation/animation3d.cc \
                         animation/animation.cc \
@@ -23 +23 @@
                         object_manager.h \
                         state.h \
-                        user_control.h \
+                        hud.h \
                         animation/animation3d.h \
                         animation/animation.h \

trunk/src/util/hud.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "hud.h"
 
 using namespace std;
@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+Hud::Hud ()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
+   this->setClassID(CL_HUD, "Hud");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
 }
 
@@ -45 +35 @@
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+Hud::~Hud ()
 {
   // delete what has to be deleted here

trunk/src/util/hud.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
- * @brief Definition of ...
+ * @file hud.h
+ * @brief Definition of the ingame HUD.
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _HUD_H
+#define _HUD_H
 
-#include "base_object.h"
+#include "element_2d.h"
+#include <list>
 
 // FORWARD DECLARATION
+#include "glgui_widget.h"
 
 
 
-//! A class for ...
-class ProtoClass : public BaseObject {
+//! A class that renders a HUD.
+class Hud : private GLGuiWidget {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  Hud();
+  virtual ~Hud();
+
+  void setBackGround();
+  void setEnergyWidget(GLGuiWidget* widget);
+  void setShiledWidget(GLGuiWidget* widget);
+  void setArmorWidget(GLGuiWidget* widget);
+
+  void addWeaponWidget(GLGuiWidget* widget);
+  void removeWeaponWidget(GLGuiWidget* widget);
 
 
  private:
+   unsigned int             resX;          //!< The X-Resolution needed for resizing the Hud.
+   unsigned int             resY;          //!< The Y-Resolution needed for resizing the Hud.
 
+   GLGuiWidget*             energyWidget;
+   GLGuiWidget*             shieldWidget;
+   GLGuiWidget*             armorWidget;
+
+   std::list<GLGuiWidget*>  weaponsWidgets; //!< WeaponWidgets will be displayed one after another
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _HUD_H */