Changeset 8975 in orxonox.OLD for trunk/src

Timestamp:

Jul 1, 2006, 12:12:48 PM (19 years ago)

Author:

bensch

Message:

trunk: widget displayed

Location:

trunk/src

Files:

• story_entities/game_world_data.cc (modified) (1 diff)
• util/hud.cc (modified) (2 diffs)
• world_entities/elements/glgui_energywidget.cc (modified) (2 diffs)
• world_entities/elements/glgui_energywidget.h (modified) (1 diff)

trunk/src/story_entities/game_world_data.cc

@@ -107 +107 @@
   LightManager::getInstance();
 
-  GraphicsEngine::getInstance()->displayFPS(true);
+//  GraphicsEngine::getInstance()->displayFPS(true);
 
   return ErrorMessage();

trunk/src/util/hud.cc

@@ -163 +163 @@
   if (this->energyWidget != NULL)
   {
-    this->energyWidget->setAbsCoor2D(0 * this->resX, 0 * this->resY);
-    this->energyWidget->setSize2D(.25 * this->resX, 1 * this->resY);
+    this->energyWidget->setAbsCoor2D(0.0 * this->resX, 0.9 * this->resY);
+    this->energyWidget->setWidgetSize(.25 * this->resX, 0.1 * this->resY);
   }
 
@@ -173 +173 @@
   for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03)
   {
-    (*weaponWidget)->setSize2D(.02*this->resX, .2 *this->resY);
+    (*weaponWidget)->setWidgetSize(.02*this->resX, .2 *this->resY);
     (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
 

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -42 +42 @@
 
 
+
   void GLGuiEnergyWidget::setMaximum(float max)
   {
@@ -56 +57 @@
 
 
+  void GLGuiEnergyWidget::showing()
+  {
+    this->text.show();
+    this->bar.show();
+  }
+
+  void GLGuiEnergyWidget::hiding()
+  {
+    this->text.hide();
+    this->bar.hide();
+  }
+
+
 
 }

trunk/src/world_entities/elements/glgui_energywidget.h

@@ -27 +27 @@
   protected:
     //virtual void resize();
+    virtual void showing();
+    virtual void hiding();
 
   private: