Changeset 10724 for code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc

Timestamp:

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

Author:

fvultier

Message:

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

File:

• code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) (5 diffs)

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");