Changeset 6440 in orxonox.OLD

Timestamp:

Jan 8, 2006, 3:20:00 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: now the Widgets are only rendered within the HUD

Location:

trunk/src

Files:

• util/hud.cc (modified) (2 diffs)
• world_entities/player.cc (modified) (4 diffs)
• world_entities/player.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (3 diffs)

trunk/src/util/hud.cc

@@ -29 +29 @@
   this->setClassID(CL_HUD, "Hud");
 
+
+  this->energyWidget = NULL;
+  this->shieldWidget = NULL;
+  this->armorWidget = NULL;
 }
 
@@ -53 +57 @@
 void Hud::setEnergyWidget(GLGuiWidget* widget)
 {
+  // decopple old widget
+  if (this->energyWidget != NULL)
+  {
+    this->energyWidget->hide();
+  }
+
+  this->energyWidget = widget;
+  if (this->energyWidget != NULL)
+  {
+    this->energyWidget->show();
+    this->energyWidget->setAbsCoor2D(10,80);
+    this->energyWidget->setSize2D(20,300);
+  }
+
 
 }

trunk/src/world_entities/player.cc

@@ -32 +32 @@
 Player::Player()
 {
-  this->init();
+//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
+  this->setClassID(CL_PLAYER, "Player");
+
+  PRINTF(4)("PLAYER INIT\n");
+
+  this->controllable = NULL;
+  this->hud = new Hud();
 
   EventHandler::getInstance()->subscribe(this, ES_GAME, SDLK_l);
@@ -43 +49 @@
 Player::~Player ()
 {
-}
+  delete this->hud;
 
-
-/**
- * initializes a Player
- */
-void Player::init()
-{
-//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_PLAYER, "Player");
-
-  PRINTF(4)("PLAYER INIT\n");
-
-  this->controllable = NULL;
-  this->hud = new Hud();
 }
 
@@ -66 +59 @@
   {
       this->controllable = controllable;
+      this->hud->setEnergyWidget(this->controllable->getEnergyWidget());
       return true;
   }
@@ -79 +73 @@
    {
      this->controllable = NULL;
+     this->hud->setEnergyWidget(NULL);
      return true;
    }

trunk/src/world_entities/player.h

@@ -35 +35 @@
 
   private:
-    void              init();
-
-
-  private:
     Playable*         controllable;                  //!< The one we controll or NULL if none
     Hud*              hud;                           //!< The HUD to be displayed.

trunk/src/world_entities/space_ships/space_ship.cc

@@ -213 +213 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
   this->attachCamera();
-
-  this->setEnergyWidgetVisibilit(true);
-
 }
 
@@ -222 +219 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
   this->detachCamera();
-
-  this->setEnergyWidgetVisibilit(false);
-
 }
 

trunk/src/world_entities/world_entity.cc

@@ -410 +410 @@
 }
 
+GLGuiWidget* WorldEntity::getEnergyWidget()
+{
+  this->createEnergyWidget();
+  return this->energyWidget;
+}
+
 /**
  * @param visibility shows or hides the energy-bar

trunk/src/world_entities/world_entity.h

@@ -20 +20 @@
 class BVTree;
 class Model;
+
+class GLGuiWidget;
 class GLGuiBar;
 
@@ -36 +38 @@
   void loadModel(const char* fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
   void setModel(Model* model, unsigned int modelNumber = 0);
-Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
+  Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
   inline void loadMD2Texture(const char* fileName) { this->md2TextureFileName = fileName; }
@@ -91 +93 @@
   float removeEnergy(float energy);
   void setMaxEnergy(float maxEnergy);
-
+  GLGuiWidget* getEnergyWidget();
 
 protected: