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

Timestamp:

Jun 16, 2006, 10:23:05 AM (19 years ago)

Author:

bensch

Message:

merged the gui back to the trunk

Location:

trunk/src/util

Files:

• hud.cc (modified) (9 diffs)
• hud.h (modified) (3 diffs)

trunk/src/util/hud.cc

@@ -23 +23 @@
 #include "glgui_widget.h"
 
+#include "glgui_inputline.h"
+#include "specials/glgui_notifier.h"
+
 /**
  * standard constructor
@@ -39 +42 @@
   this->resY = 1;
 
+  this->inputLine = new OrxGui::GLGuiInputLine();
+  this->inputLine->setParent2D(this);
+  this->notifier = new OrxGui::GLGuiNotifier();
+  this->notifier->setParent2D(this);
+  notifier->setAbsCoor2D(100,100);
+
+
+
 }
 
@@ -47 +58 @@
 Hud::~Hud ()
 {
+  delete this->inputLine;
+  delete this->notifier;
   // delete what has to be deleted here
 }
@@ -56 +69 @@
 }
 
+void Hud::notifyUser(const std::string& message)
+{
+  this->notifier->pushNotifyMessage(message);
+}
+
 void Hud::setBackGround()
-{
-}
+{}
 
 void Hud::setEnergyWidget(OrxGui::GLGuiWidget* widget)
@@ -74 +91 @@
     this->energyWidget->backMaterial().setDiffuseMap("hud_energy_background.png");
     this->energyWidget->backMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-/*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
-    this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
+    /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
+        this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
   }
 
@@ -82 +99 @@
 
 void Hud::setShiledWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::setArmorWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::setWeaponManager(WeaponManager* weaponMan)
@@ -123 +138 @@
   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()->show();
-      weapon->getEnergyWidget()->backMaterial().setDiffuse( .8,.2,.11);
-      weapon->getEnergyWidget()->backMaterial().setTransparency(.1);
-      weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
-//      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
-      this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+      Weapon* weapon = this->weaponManager->getWeapon(i);
+      if (weapon != NULL)
+      {
+        weapon->getEnergyWidget()->show();
+        weapon->getEnergyWidget()->backMaterial().setDiffuse( .8,.2,.11);
+        weapon->getEnergyWidget()->backMaterial().setTransparency(.1);
+        weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
+        //      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
+        this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+      }
     }
-  }
   this->updateResolution();
 }
 
 void Hud::addWeaponWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::removeWeaponWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::updateResolution()
@@ -162 +175 @@
   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);
+    (*weaponWidget)->setSize2D(.02*this->resX, .2 *this->resY);
+    (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
 
   }
@@ -171 +184 @@
 void Hud::tick(float dt)
 {
-  if (this->resY != State::getResY() || this->resX != State::getResY())
+  if (this->resY != State::getResY() || this->resX != State::getResX())
+  {
     this->updateResolution();
+  }
+
 }
 
 void Hud::draw() const
 {
-//  GLGuiWidget::draw();
+  //  GLGuiWidget::draw();
 }
 

trunk/src/util/hud.h

@@ -10 +10 @@
 // FORWARD DECLARATION
 class TiXmlElement;
+
 class WeaponManager;
-namespace OrxGui { class GLGuiWidget; }
+namespace OrxGui {
+  class GLGuiWidget;
+  class GLGuiNotifier;
+  class GLGuiInputLine;
+
+}
 
 //! A class that renders a HUD.
@@ -23 +29 @@
 
   virtual void loadParams(const TiXmlElement* root);
+
+  void notifyUser(const std::string& message);
+
 
   void setBackGround();
@@ -49 +58 @@
   OrxGui::GLGuiWidget*     armorWidget;
 
+  OrxGui::GLGuiNotifier*   notifier;
+  OrxGui::GLGuiInputLine*  inputLine;
+
   WeaponManager*           weaponManager;