Changeset 6441 in orxonox.OLD for trunk/src/util

Timestamp:

Jan 8, 2006, 4:02:30 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the Hud now scales the Widgets itself

Location:

trunk/src/util

Files:

• hud.cc (modified) (4 diffs)
• hud.h (modified) (3 diffs)
• state.cc (modified) (1 diff)
• state.h (modified) (2 diffs)

trunk/src/util/hud.cc

@@ -18 +18 @@
 #include "hud.h"
 
+#include "state.h"
+
 using namespace std;
 
@@ -29 +31 @@
   this->setClassID(CL_HUD, "Hud");
 
-
+  //this->setSize2D(
   this->energyWidget = NULL;
   this->shieldWidget = NULL;
   this->armorWidget = NULL;
+  this->resX = 1;
+  this->resY = 1;
 }
 
@@ -67 +71 @@
   {
     this->energyWidget->show();
-    this->energyWidget->setAbsCoor2D(10,80);
-    this->energyWidget->setSize2D(20,300);
   }
 
-
+  this->updateResolution();
 }
 
@@ -94 +96 @@
 }
 
-void setResolution(unsigned int resX, unsigned int resY);
+void Hud::updateResolution()
+{
+  this->resX = State::resX();
+  this->resY = State::resY();
+  if (this->energyWidget != NULL)
+  {
+    this->energyWidget->setAbsCoor2D(.02 * this->resX, .4 * this->resY);
+    this->energyWidget->setSize2D(.05 * this->resX, .55 * this->resY);
+  }
+}
+
+
+void Hud::tick(float dt)
+{
+  if (this->resY != State::resY() || this->resX != State::resY())
+    this->updateResolution();
+}
+
+void Hud::draw() const
+{
+  GLGuiWidget::draw();
+}
+
+

trunk/src/util/hud.h

@@ -15 +15 @@
 
 //! A class that renders a HUD.
-class Hud : private GLGuiWidget
+class Hud : public GLGuiWidget
 {
 
@@ -21 +21 @@
   Hud();
   virtual ~Hud();
+
 
   void loadParams(const TiXmlElement* root);
@@ -32 +33 @@
   void removeWeaponWidget(GLGuiWidget* widget);
 
-  void setResolution(unsigned int resX, unsigned int resY);
+  void tick(float dt);
+  void draw() const;
 
+  private:
+    void updateResolution();
 private:
-  unsigned int             resX;          //!< The X-Resolution needed for resizing the Hud.
-  unsigned int             resY;          //!< The Y-Resolution needed for resizing the Hud.
+  unsigned int             resX;
+  unsigned int             resY;
 
   GLGuiWidget*             energyWidget;

trunk/src/util/state.cc

@@ -31 +31 @@
 ObjectManager* State::objectManager = NULL;
 
+unsigned int State::_resX = 1;
+unsigned int State::_resY = 1;
+
 /**
  *  sets camera and target of the current Camera

trunk/src/util/state.h

@@ -39 +39 @@
   static inline ObjectManager* getObjectManager() { return State::objectManager; };
 
+  static inline void setResolution(unsigned int resX, unsigned int resY) { State::_resX = resX; State::_resY = resY; };
+  static inline unsigned int resX() { return State::_resX; };
+  static inline unsigned int resY() { return State::_resY; };
+
   /////////////////////////
   /// WORLD_ENTITY_LIST ///
@@ -51 +55 @@
   static ObjectManager*         objectManager;      //!< A referenct to the current ObjectManager
 
+  static unsigned int           _resX;              //!< The X Resolution of the screen.
+  static unsigned int           _resY;              //!< The Y Resolution of the screen.
 };