Changeset 10724 for code/branches/fabienHS15/src/orxonox

Timestamp:

Oct 30, 2015, 7:51:49 PM (9 years ago)

Author:

fvultier

Message:

The weapon system HUD rescales properly if the window size changes.

Location:

code/branches/fabienHS15/src/orxonox

Files:

• overlays/OrxonoxOverlay.cc (modified) (1 diff)
• overlays/OrxonoxOverlay.h (modified) (1 diff)
• weaponsystem/Munition.cc (modified) (1 diff)
• weaponsystem/Munition.h (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -450 +450 @@
         tempTx->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, colour);
     }
+
+    void OrxonoxOverlay::setZOrder(unsigned short order)
+    {
+        if (this->overlay_)
+        {
+            this->overlay_->setZOrder(order);
+        }
+    }
 }

code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h

@@ -186 +186 @@
         virtual void changedOverlayGroup()
             { this->changedVisibility(); }
+        virtual void setZOrder(unsigned short order);
 
     protected:

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc

@@ -351 +351 @@
 
                 // If there was no change in a loop, all magazines are full (or locked due to loading)
-                // Because the first loop does not stat at the beginning of the map we have to treat is separately
+                // Because the first loop does not start at the beginning of the map we have to treat is separately
                 if (!change && !firstLoop)
                 {

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h

@@ -78 +78 @@
             inline unsigned int getMaxMunitionPerMagazine() const
                 { return this->maxMunitionPerMagazine_; }
-            inline bool getUseSeparateMagazines() const
-                { return deployment_ == MunitionDeployment::Separate; }
-            inline bool getStackMunition() const
-                { return deployment_ == MunitionDeployment::Stack; }
+            inline MunitionDeployment::Value getMunitionDeployment() const
+                { return deployment_; }
+
 
             bool canTakeMunition(unsigned int amount, WeaponMode* user) const;

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

@@ -297 +297 @@
         }
     }
+
+    void SpaceShip::gainBoostPower(float gainedBoostPower)
+    {
+        this->boostPower_ += gainedBoostPower;
+        
+        if (this->boostPower_ > this->initialBoostPower_)
+        {
+            this->boostPower_ = this->initialBoostPower_;
+        }
+
+        // If the booster is in cooldown mode and we gained boost power, the abort the cooldown.
+        if (this->isBoostCoolingDown() && this->boostPower_ > 0.0f)
+        {
+            timer_.stopTimer();
+            this->boostCooledDown();
+        }
+    }
+
     /**
     @brief

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

@@ -250 +250 @@
             inline float getShakeAmplitude() const
                 { return this->shakeAmplitude_; }
+            /**
+            @brief Add boost power. Is non-negative.
+            @return Returns the current boost power.
+            */
+            void gainBoostPower(float gainedBoostPower);
 
         protected: