Changeset 6438 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 8, 2006, 1:51:55 PM (19 years ago)

Author:

bensch

Message:

trunk: widget war

Location:

trunk/src/world_entities

Files:

• player.cc (modified) (3 diffs)
• player.h (modified) (2 diffs)
• weapons/turret.cc (modified) (3 diffs)
• weapons/turret.h (modified) (2 diffs)
• weapons/weapon.cc (modified) (13 diffs)
• weapons/weapon.h (modified) (4 diffs)

trunk/src/world_entities/player.cc

@@ -22 +22 @@
 #include "class_list.h"
 #include "state.h"
+#include "util/hud.h"
 
 using namespace std;
@@ -56 +57 @@
 
   this->controllable = NULL;
+  this->hud = new Hud();
 }
 
@@ -95 +97 @@
          if (this->controllable != (*node) && (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->controllable->getAbsCoor()).len() < 10.0)
        {
- 
+
          this->disconnectControllable();
          this->setControllable(dynamic_cast<Playable*>(*node));

trunk/src/world_entities/player.h

@@ -11 +11 @@
 /* Forward Declaration */
 class Playable;
+class Hud;
 
 //! Basic controllable WorldEntity
@@ -39 +40 @@
   private:
     Playable*         controllable;                  //!< The one we controll or NULL if none
+    Hud*              hud;                           //!< The HUD to be displayed.
 };
 

trunk/src/world_entities/weapons/turret.cc

@@ -96 +96 @@
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
-
-  this->bar = new GLGuiBar;
-  this->bar->setSize2D( 20, 100);
-  this->bar->setMaximum(this->getEnergyMax());
-  this->bar->setValue(this->getEnergy());
-  this->loadedBar = new GLGuiBar;
-  this->loadedBar->setParent2D(this->bar);
-  this->loadedBar->setRelCoor2D(20,0);
-  this->loadedBar->setSize2D(10,50);
-  this->loadedBar->setMaximum(this->getLoadedEnergyMax());
 }
 
@@ -116 +106 @@
 void Turret::activate()
 {
-  this->bar->show();
-  this->loadedBar->show();
 }
 
 void Turret::deactivate()
 {
-  this->bar->hide();
-  this->loadedBar->hide();
 }
 
@@ -156 +142 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-
-  this->bar->setValue( this->getEnergy());
-  this->loadedBar->setValue(this->getLoadedEnergy());
 }
 

trunk/src/world_entities/weapons/turret.h

@@ -8 +8 @@
 
 #include "weapon.h"
-
-#include "glgui_bar.h"
 
 class Turret : public Weapon
@@ -30 +28 @@
 
   private:
-    GLGuiBar*    bar;
-    GLGuiBar*    loadedBar;
   };
 

trunk/src/world_entities/weapons/weapon.cc

@@ -34 +34 @@
 #include "sound_buffer.h"
 
+#include "glgui_bar.h"
+
 ////////////////////
 // INITAILISATION //
@@ -75 +77 @@
   this->stateDuration    = 0.0;                    //< All the States have zero duration
   for (int i = 0; i < WS_STATE_COUNT; i++)         //< Every State has:
-    {
-      this->times[i] = 0.0;                        //< An infinitesimal duration
-      this->animation[i] = NULL;                   //< No animation
-    }
+  {
+    this->times[i] = 0.0;                        //< An infinitesimal duration
+    this->animation[i] = NULL;                   //< No animation
+  }
   for (int i = 0; i < WA_ACTION_COUNT; i++)
     this->soundBuffers[i] = NULL;                  //< No Sounds
@@ -98 +100 @@
   this->energyMax = 10.0;                          //< How much energy can be carried
   this->capability = WTYPE_ALL;                    //< The Weapon has all capabilities @see W_Capability.
+
+  this->energyWidget = NULL;
+  this->energyLoadedWidget = NULL;
 }
 
@@ -109 +114 @@
 
   LoadParam(root, "projectile", this, Weapon, setProjectileType)
-      .describe("Sets the name of the Projectile to load onto the Entity");
+  .describe("Sets the name of the Projectile to load onto the Entity");
 
   LoadParam(root, "emission-point", this, Weapon, setEmissionPoint)
-      .describe("Sets the Point of emission of this weapon");
+  .describe("Sets the Point of emission of this weapon");
 
   LoadParam(root, "state-duration", this, Weapon, setStateDuration)
-      .describe("Sets the duration of a given state (1: state-Name; 2: duration in seconds)");
+  .describe("Sets the duration of a given state (1: state-Name; 2: duration in seconds)");
 
   LoadParam(root, "action-sound", this, Weapon, setActionSound)
-      .describe("Sets a given sound to an action (1: action-Name; 2: name of the sound (relative to the Data-Path))");
+  .describe("Sets a given sound to an action (1: action-Name; 2: name of the sound (relative to the Data-Path))");
 }
 
@@ -271 +276 @@
 }
 
+GLGuiWidget* Weapon::getEnergyWidget()
+{
+  if (this->energyWidget == NULL)
+  {
+    this->energyWidget = new GLGuiBar;
+    this->energyWidget->setSize2D( 20, 100);
+    this->energyWidget->setMaximum(this->getEnergyMax());
+    this->energyWidget->setValue(this->getEnergy());
+  }
+  return this->energyWidget;
+}
+
+
+GLGuiWidget* Weapon::getMaxEnergyWidget()
+{
+  if (this->energyLoadedWidget == NULL)
+  {
+    this->energyLoadedWidget = new GLGuiBar;
+    //this->energyLoadedWidget->setParent2D(this->bar);
+    this->energyLoadedWidget->setRelCoor2D(20,0);
+    this->energyLoadedWidget->setSize2D(10,50);
+    this->energyLoadedWidget->setMaximum(this->getLoadedEnergyMax());
+  }
+  return this->energyLoadedWidget;
+}
+
+void Weapon::updateWidgets()
+{
+  if (this->energyWidget != NULL)
+  {
+    this->energyWidget->setMaximum(this->energyMax);
+    this->energyWidget->setValue(this->energy);
+  }
+  if (this->energyLoadedWidget != NULL)
+  {
+    this->energyLoadedWidget->setMaximum(this->energyLoadedMax);
+    this->energyLoadedWidget->setValue(this->energyLoaded);
+  }
+}
+
 /////////////////
 //  EXECUTION  //
@@ -371 +416 @@
 bool Weapon::activateW()
 {
-//  if (this->currentState == WS_INACTIVE)
+  //  if (this->currentState == WS_INACTIVE)
   {
     // play Sound
     if (likely(this->soundBuffers[WA_ACTIVATE] != NULL))
       this->soundSource->play(this->soundBuffers[WA_ACTIVATE]);
-        // activate
+    // activate
     PRINTF(4)("Activating the Weapon %s\n", this->getName());
     this->activate();
@@ -390 +435 @@
 bool Weapon::deactivateW()
 {
-//  if (this->currentState != WS_INACTIVE)
+  //  if (this->currentState != WS_INACTIVE)
   {
     PRINTF(4)("Deactivating the Weapon %s\n", this->getName());
-        // play Sound
+    // play Sound
     if (this->soundBuffers[WA_DEACTIVATE] != NULL)
       this->soundSource->play(this->soundBuffers[WA_DEACTIVATE]);
@@ -410 +455 @@
   if ( this->currentState != WS_INACTIVE && this->energyLoaded >= this->minCharge)
   {
-        // playing Sound
+    // playing Sound
     if (this->soundBuffers[WA_CHARGE] != NULL)
       this->soundSource->play(this->soundBuffers[WA_CHARGE]);
 
-        // charge
+    // charge
     this->charge();
-        // setting up for the next state
+    // setting up for the next state
     this->enterState(WS_CHARGING);
   }
@@ -431 +476 @@
 bool Weapon::fireW()
 {
-     //if (likely(this->currentState != WS_INACTIVE))
+  //if (likely(this->currentState != WS_INACTIVE))
   if (this->minCharge <= this->energyLoaded)
   {
-          // playing Sound
+    // playing Sound
     if (this->soundBuffers[WA_SHOOT] != NULL)
       this->soundSource->play(this->soundBuffers[WA_SHOOT]);
-          // fire
+    // fire
     this->energyLoaded -= this->minCharge;
     this->fire();
-          // setting up for the next state
+    // setting up for the next state
     this->enterState(WS_SHOOTING);
   }
@@ -546 +591 @@
   bool retVal = true;
 
-//  if (this->projectile == NULL)
+  //  if (this->projectile == NULL)
   {
     PRINTF(1)("There was no projectile assigned to the Weapon.\n");
@@ -565 +610 @@
   PRINT(0)("Weapon-Debug %s, state: %s (duration: %fs), nextAction: %s\n", this->getName(), Weapon::stateToChar(this->currentState), this->stateDuration, Weapon::actionToChar(requestedAction));
   PRINT(0)("Energy: max: %f; current: %f;  loadedMax: %f; loadedCurrent: %f; chargeMin: %f, chargeMax %f\n",
-            this->energyMax, this->energy, this->energyLoadedMax, this->energyLoaded, this->minCharge, this->maxCharge);
+           this->energyMax, this->energy, this->energyLoadedMax, this->energyLoaded, this->minCharge, this->maxCharge);
 
 
@@ -595 +640 @@
     return WA_SPECIAL1;
   else
-    {
-      PRINTF(2)("action %s could not be identified.\n", action);
-      return WA_NONE;
-    }
+  {
+    PRINTF(2)("action %s could not be identified.\n", action);
+    return WA_NONE;
+  }
 }
 
@@ -658 +703 @@
     return WS_IDLE;
   else
-    {
-      PRINTF(2)("state %s could not be identified.\n", state);
-      return WS_NONE;
-    }
+  {
+    PRINTF(2)("state %s could not be identified.\n", state);
+    return WS_NONE;
+  }
 }
 

trunk/src/world_entities/weapons/weapon.h

@@ -24 +24 @@
 class FastFactory;
 template<class T> class tFastFactory;
+class GLGuiWidget;
 
 //! An enumerator defining Actions a Weapon can take
@@ -148 +149 @@
     Animation3D* copyAnimation(WeaponState from, WeaponState to);
 
+    GLGuiWidget* getEnergyWidget();
+    GLGuiWidget* getMaxEnergyWidget();
+
     // FLOW
     void tick(float dt); //!< this is a function that must be called by the weaponManager, or any other weaponHandler, all other functions are handled from within
@@ -183 +187 @@
     bool fireW();
     bool reloadW();
-
     inline void enterState(WeaponState state);
 
+    void updateWidgets();
 
   private:
@@ -200 +204 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
+    GLGuiBar*            energyWidget;
+    GLGuiBar*            energyLoadedWidget;
+
     ////////////
     // PHASES //