Changeset 10724 for code/branches/fabienHS15/src

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

Files:

• modules/overlays/hud/HUDWeapon.cc (modified) (2 diffs)
• modules/overlays/hud/HUDWeapon.h (modified) (2 diffs)
• modules/overlays/hud/HUDWeaponMode.cc (modified) (5 diffs)
• modules/overlays/hud/HUDWeaponMode.h (modified) (3 diffs)
• modules/overlays/hud/HUDWeaponSystem.cc (modified) (8 diffs)
• modules/overlays/hud/HUDWeaponSystem.h (modified) (3 diffs)
• modules/pickup/items/BoostPickup.cc (added)
• modules/pickup/items/BoostPickup.h (added)
• modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• modules/pickup/items/MunitionPickup.cc (modified) (1 diff)
• modules/weapons/munitions/LaserMunition.cc (modified) (2 diffs)
• orxonox/overlays/OrxonoxOverlay.cc (modified) (1 diff)
• orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)
• orxonox/weaponsystem/Munition.cc (modified) (1 diff)
• orxonox/weaponsystem/Munition.h (modified) (1 diff)
• orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc

@@ -29 +29 @@
 #include "HUDWeapon.h"
 
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/TextureGenerator.h"
 #include "util/Convert.h"
 #include "core/class/Super.h"
@@ -186 +182 @@
             (*it)->setWeaponIndex(this->weaponIndex_);
             (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
-            (*it)->positionHUDChilds();
 
             ++ positionIndex;

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h

@@ -37 +37 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreTechnique.h>
-#include <OgrePass.h>
 #include <OgrePanelOverlayElement.h> 
 
 #include "overlays/OrxonoxOverlay.h"
-#include "overlays/OverlayText.h"
 #include "tools/interfaces/Tickable.h"
 #include "worldentities/pawns/Pawn.h"
@@ -79 +75 @@
             { weaponIndex_ = index;
               this->updatePosition();
-            }
-
-        virtual void positionHUDChilds();
+            }        
 
     private:
         virtual void createHUDChilds();
-        
+        virtual void positionHUDChilds();
         virtual void destroyHUDChilds();
         virtual void updateWeaponModeList();

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Yuning Chai
- *      Felix Schulthess
+ *      Fabien Vultier
  *   Co-authors:
- *      Reto Grieder
- *      Wolfgang Roenninger
+ *      ...
  *
  */
 
 #include "HUDWeaponMode.h"
-
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/TextureGenerator.h"
-#include "weaponsystem/WeaponMode.h"
-#include "weaponsystem/Munition.h"
 #include "util/Convert.h"
+#include "core/class/Super.h"
 
 namespace orxonox
@@ -87 +80 @@
         textOverlayLeft_->setColour(ColourValue(0.21,0.70,0.21,1.0));
         textOverlayLeft_->setAspectCorrection(false);
+        textOverlayLeft_->setZOrder(600);
         
         this->textOverlayRight_ = new OverlayText(this->getContext());
@@ -97 +91 @@
         textOverlayRight_->setColour(ColourValue(0.21,0.70,0.21,1.0));
         textOverlayRight_->setAspectCorrection(false);
+        textOverlayRight_->setZOrder(600);
 
         materialNameState_ = "Orxonox/WSHUD_Reloading";
@@ -137 +132 @@
             if (munition != NULL)
             {
-                bool useSeparateMagazines = munition->getUseSeparateMagazines();
-                bool stackMunition = munition->getStackMunition();
-
-                if (!useSeparateMagazines && !stackMunition)
+                MunitionDeployment::Value deployment = munition->getMunitionDeployment();
+
+                if (deployment == MunitionDeployment::Share)
                 {
                     this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunitionInCurrentMagazine(weaponMode_)));
                     this->textOverlayRight_->setCaption(multi_cast<std::string>(munition->getNumMagazines()));
                 }
-                else if (!useSeparateMagazines && stackMunition)
+                else if (deployment == MunitionDeployment::Stack)
                 {
                     this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunition(weaponMode_)));
                     this->textOverlayRight_->setCaption("");
                 }
-                else if (useSeparateMagazines && !stackMunition)
+                else if (deployment == MunitionDeployment::Separate)
                 {
                     this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunitionInCurrentMagazine(weaponMode_)));
@@ -245 +239 @@
         if (munition != NULL)
         {
-            bool useSeparateMagazines = munition->getUseSeparateMagazines();
-            bool stackMunition = munition->getStackMunition();
-
-            if (!useSeparateMagazines && !stackMunition)
+            MunitionDeployment::Value deployment = munition->getMunitionDeployment();
+
+            if (deployment == MunitionDeployment::Share)
             {
                 overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionShare");
             }
-            else if (!useSeparateMagazines && stackMunition)
+            else if (deployment == MunitionDeployment::Stack)
             {
                 overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionStack");
             }
-            else if (useSeparateMagazines && !stackMunition)
+            else if (deployment == MunitionDeployment::Separate)
             {
                 overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionSeparate");

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h

@@ -38 +38 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreTechnique.h>
-#include <OgrePass.h>
 #include <OgrePanelOverlayElement.h> 
 
@@ -49 +46 @@
 #include "overlays/OverlayGroup.h"
 #include "weaponsystem/ReplenishingMunition.h"
+#include "weaponsystem/WeaponMode.h"
+#include "weaponsystem/Munition.h"
 
 namespace orxonox
@@ -84 +83 @@
             }
 
-        virtual void positionHUDChilds();
-
     private:
         virtual void updateSize();
         virtual void updatePosition();
+        virtual void positionHUDChilds();
 
         WeakPtr<Pawn> owner_;

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Yuning Chai
- *      Felix Schulthess
+ *      Fabien Vultier
  *   Co-authors:
- *      Reto Grieder
- *      Wolfgang Roenninger
+ *      ...
  *
  */
@@ -31 +29 @@
 #include "HUDWeaponSystem.h"
 
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/TextureGenerator.h"
 #include "weaponsystem/WeaponSystem.h"
 #include "weaponsystem/WeaponPack.h"
@@ -73 +67 @@
     }
 
-    void HUDWeaponSystem::tick(float dt)
-    {
-        SUPER(HUDWeaponSystem, tick, dt);
-
-        if (this->owner_)
-        {
-
-        }
-    }  
-
     void HUDWeaponSystem::positionChanged()
     {
@@ -111 +95 @@
     {
         SUPER(HUDWeaponSystem, changedOverlayGroup);
-
-        //this->getOverlayGroup()->addElement(this->textOverlay_.get());
     }   
 
@@ -118 +100 @@
     {
         SUPER(HUDWeaponSystem, changedVisibility);
-
-        //this->textOverlay_->setVisible(this->isVisible());
     }
 
@@ -125 +105 @@
     {
         SUPER(HUDWeaponSystem, changedName);
-
-        //this->textOverlay_->setName(this->getName() + "text");
     }  
 
@@ -178 +156 @@
     {
         int positionIndex = 0;
-        //this->setSize(weaponModeHUDSize_);
-        // this->weaponModeHUDActualSize_ = this->getActualSize();
 
         for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
@@ -185 +161 @@
             (*it)->setWeaponIndex(positionIndex);
             (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
-            (*it)->positionHUDChilds();           
 
             ++ positionIndex;

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h

@@ -36 +36 @@
 #include <string>
 
-#include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreTechnique.h>
-#include <OgrePass.h>
-#include <OgrePanelOverlayElement.h> 
-
 #include "overlays/OrxonoxOverlay.h"
-#include "overlays/OverlayText.h"
-#include "tools/interfaces/Tickable.h"
 #include "worldentities/pawns/Pawn.h"
 #include "overlays/OverlayGroup.h"
@@ -51 +43 @@
 namespace orxonox
 {
-    class _OverlaysExport HUDWeaponSystem : public OrxonoxOverlay, public Tickable
+    class _OverlaysExport HUDWeaponSystem : public OrxonoxOverlay
     {
     public:
@@ -58 +50 @@
 
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        virtual void tick(float dt);
         virtual void changedOwner();
         virtual void changedOverlayGroup();

code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt

@@ -8 +8 @@
   ShrinkPickup.cc
   DamageBoostPickup.cc
+  BoostPickup.cc
   MunitionPickup.cc
   MunitionContainer.cc

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

@@ -111 +111 @@
             this->Pickupable::destroy();
 
-
         // If the pickup has transited to used.
         if(this->isUsed())

code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc

@@ -43 +43 @@
         RegisterObject(LaserMunition);
 
-        this->maxMunitionPerMagazine_ = 10;
+        this->maxMunitionPerMagazine_ = 20;
         this->maxMagazines_ = 10;
         this->magazines_ = 10;
@@ -55 +55 @@
         this->replenishMunitionAmount_ = 1;
 
-        this->reloadTime_ = 0.8f;
+        this->reloadTime_ = 0.5f;
     }
 }

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: