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

Timestamp:

Jun 5, 2006, 11:49:26 AM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

Location:

trunk/src/util

Files:

• animation/t_animation.h (modified) (1 diff)
• hud.cc (modified) (5 diffs)
• hud.h (modified) (3 diffs)

trunk/src/util/animation/t_animation.h

@@ -242 +242 @@
       break;
     case ANIM_NEG_EXP:
-      {
         this->animFunc = &tAnimation<T>::negExp;
         expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
         break;
-      }
     case ANIM_QUADRATIC:
       this->animFunc = &tAnimation<T>::quadratic;

trunk/src/util/hud.cc

@@ -62 +62 @@
 }
 
-void Hud::setEnergyWidget(GLGuiWidget* widget)
+void Hud::setEnergyWidget(OrxGui::GLGuiWidget* widget)
 {
   // decopple old widget
@@ -83 +83 @@
 }
 
-void Hud::setShiledWidget(GLGuiWidget* widget)
+void Hud::setShiledWidget(OrxGui::GLGuiWidget* widget)
 {
 }
 
-void Hud::setArmorWidget(GLGuiWidget* widget)
+void Hud::setArmorWidget(OrxGui::GLGuiWidget* widget)
 {
 }
@@ -115 +115 @@
 {
   // hide all the Widgets
-  std::list<GLGuiWidget*>::iterator weaponWidget;
+  std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget;
   for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++)
   {
@@ -140 +140 @@
 }
 
-void Hud::addWeaponWidget(GLGuiWidget* widget)
+void Hud::addWeaponWidget(OrxGui::GLGuiWidget* widget)
 {
 }
 
-void Hud::removeWeaponWidget(GLGuiWidget* widget)
+void Hud::removeWeaponWidget(OrxGui::GLGuiWidget* widget)
 {
 }
@@ -160 +160 @@
   this->setSize2D(.2 * this->resX, this->resY);
 
-  std::list<GLGuiWidget*>::iterator weaponWidget;
+  std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget;
   float pos = .3;
   for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03)

trunk/src/util/hud.h

@@ -15 +15 @@
 
 //! A class that renders a HUD.
-class Hud : public OrxGui::GLGuiWidget
+class Hud : public Element2D
 {
 
@@ -26 +26 @@
 
   void setBackGround();
-  void setEnergyWidget(GLGuiWidget* widget);
-  void setShiledWidget(GLGuiWidget* widget);
-  void setArmorWidget(GLGuiWidget* widget);
+  void setEnergyWidget(OrxGui::GLGuiWidget* widget);
+  void setShiledWidget(OrxGui::GLGuiWidget* widget);
+  void setArmorWidget(OrxGui::GLGuiWidget* widget);
   void setWeaponManager(WeaponManager* weaponMan);
 
-  void addWeaponWidget(GLGuiWidget* widget);
-  void removeWeaponWidget(GLGuiWidget* widget);
+  void addWeaponWidget(OrxGui::GLGuiWidget* widget);
+  void removeWeaponWidget(OrxGui::GLGuiWidget* widget);
 
   void updateWeaponManager();
@@ -46 +46 @@
   unsigned int             resY;
 
-  GLGuiWidget*             energyWidget;
-  GLGuiWidget*             shieldWidget;
-  GLGuiWidget*             armorWidget;
+  OrxGui::GLGuiWidget*     energyWidget;
+  OrxGui::GLGuiWidget*     shieldWidget;
+  OrxGui::GLGuiWidget*     armorWidget;
 
   WeaponManager*           weaponManager;
 
-  std::list<GLGuiWidget*>  weaponsWidgets; //!< WeaponWidgets will be displayed one after another
+  std::list<OrxGui::GLGuiWidget*> weaponsWidgets; //!< WeaponWidgets will be displayed one after another
 };