Changeset 10746 for code/branches/fabienHS15/src

Timestamp:

Nov 1, 2015, 10:25:57 PM (9 years ago)

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src

Files:

• modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• modules/overlays/hud/HUDShieldBar.cc (added)
• modules/overlays/hud/HUDShieldBar.h (added)
• modules/pickup/items/MunitionPickup.h (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (6 diffs)
• orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)
• orxonox/worldentities/pawns/SpaceShip.h (modified) (3 diffs)

code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt

@@ -5 +5 @@
   HUDSpeedBar.cc
   HUDBoostBar.cc
+  HUDShieldBar.cc
   HUDHealthBar.cc
   HUDTimer.cc

code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h

@@ -48 +48 @@
 namespace orxonox
 {
-
+    /**
+    @brief
+        The MunitionPickup gives munition to the user (a @ref Pawn).
+    */
     class _PickupExport MunitionPickup : public Pickup
     {

code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc

@@ -61 +61 @@
 
         this->bAlive_ = true;
-        this->bShieldRecharging_ = false;
 
         this->health_ = 0;
@@ -71 +70 @@
         this->maxShieldHealth_ = 100; //otherwise shield might increase to float_max
         this->shieldAbsorption_ = 0.5;
-
         this->shieldRechargeRate_ = 0;
         this->shieldRechargeWaitTime_ = 1.0f;
@@ -153 +151 @@
     void Pawn::registerVariables()
     {
-        registerVariable(this->bAlive_,           VariableDirection::ToClient);
-        registerVariable(this->health_,           VariableDirection::ToClient);
-        registerVariable(this->maxHealth_,        VariableDirection::ToClient);
-        registerVariable(this->shieldHealth_,     VariableDirection::ToClient);
-        registerVariable(this->maxShieldHealth_,  VariableDirection::ToClient);
-        registerVariable(this->shieldAbsorption_, VariableDirection::ToClient);
-        registerVariable(this->bShieldRecharging_,          VariableDirection::ToServer);
-        registerVariable(this->aimPosition_,      VariableDirection::ToServer);  // For the moment this variable gets only transfered to the server
+        registerVariable(this->bAlive_,            VariableDirection::ToClient);
+        registerVariable(this->health_,            VariableDirection::ToClient);
+        registerVariable(this->maxHealth_,         VariableDirection::ToClient);
+        registerVariable(this->shieldHealth_,      VariableDirection::ToClient);
+        registerVariable(this->maxShieldHealth_,   VariableDirection::ToClient);
+        registerVariable(this->shieldAbsorption_,  VariableDirection::ToClient);
+        registerVariable(this->aimPosition_,       VariableDirection::ToServer);  // For the moment this variable gets only transfered to the server
     }
 
@@ -167 +164 @@
         SUPER(Pawn, tick, dt);
 
-        this->bShieldRecharging_ = false;
-
+        // Recharge the shield
         // TODO: use the existing timer functions instead
         if(this->shieldRechargeWaitCountdown_ > 0)
@@ -252 +248 @@
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
+            // Health-damage cannot be absorbed by shields.
+            // Shield-damage only reduces shield health. 
+            // Normal damage can be (partially) absorbed by shields.
+
             if (shielddamage >= this->getShieldHealth())
             {
@@ -480 +480 @@
     }
 
-    void Pawn::reload()
-    {
-        this->bShieldRecharging_ = true;
-    }
-
     void Pawn::postSpawn()
     {

code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h

@@ -42 +42 @@
     /**
     @brief
-        Everything in Orxonoy that has a health attribute is a Pawn. After a Pawn is spawned its health is set to
+        Everything in Orxonox that has a health attribute is a Pawn. After a Pawn is spawned its health is set to
         its initial health. In every call of the Pawns tick function the game checks whether the pawns health is at
         or below zero. If it is, the pawn gets killed.
@@ -141 +141 @@
 
             virtual void fired(unsigned int firemode);
-            virtual void reload();
             virtual void postSpawn();
 
@@ -234 +233 @@
 
             WeaponSystem* weaponSystem_;
-            bool bShieldRecharging_;
 
             std::string spawnparticlesource_;

code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -53 +53 @@
         - The <b>boost</b>, there are quite some parameters pertaining to boosting. The boost is a special move of the SpaceShip, where, for a limited amount of time, it can fly considerably faster than usual. The <b>boostPower</b> is the amount of power available for boosting. The <b>boostPowerRate</b> is the rate at which the boost power is replenished. The <b>boostRate</b> is the rate at which boosting uses power. And the <b>boostCooldownDuration</b> is the time the SpaceShip cannot boost, once all the boost power has been used up. Naturally all of these parameters must be non-negative.
         - The <b>boost shaking</b>, when the SpaceShip boosts, the camera shakes to create a more immersive effect. Two parameters can be used to adjust the effect. The <b>shakeFrequency</b> is the frequency with which the camera shakes. And the <b>shakeAmplitude</b> is the amount with which the camera shakes. Again these parameters must bee non-negative.
-        - The <b>lift</b> creates a more natural flight feeling through the addition of a lift force. There are again tow parameters that can be specified. The <b>lift</b> which is the lift force that is applied. And the <b>stallSpeed</b> which is the forward speed after which no more lift is generated.
+        - The <b>lift</b> creates a more natural flight feeling through the addition of a lift force. There are again two parameters that can be specified. The <b>lift</b> which is the lift force that is applied. And the <b>stallSpeed</b> which is the forward speed after which no more lift is generated.
 
         As mentioned @ref orxonox::Engine Engines can be mounted on the SpaceShip. Here is a (primitive) example of a SpaceShip defined in XML:
@@ -267 +267 @@
             bool bBoostCooldown_;         //!< Whether the SpaceShip is currently in boost cooldown, during which boosting is impossible.
             float initialBoostPower_;     //!< The initial (and maximal) boost power.
-            float boostPower_;            //!< The current boost power.
+            float boostPower_;            //!< The current boost power. If the boost power is reduced to zero the boost cooldown will start.
             float boostPowerRate_;        //!< The rate at which the boost power is recharged.
             float boostRate_;             //!< The rate at which boost power is used up.
@@ -294 +294 @@
             std::vector<Engine*> engineList_; //!< The list of all Engines mounted on this SpaceShip.
 
-            Timer timer_;                          //!< Timer for the cooldown duration.
+            Timer timer_;                          //!< Timer for the cooldown of the boost.
             float shakeDt_;                        //!< Temporary variable for the shaking of the camera.
             Vector3 cameraOriginalPosition_;       //!< The original position of the camera before shaking it.