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

Timestamp:

Nov 10, 2015, 7:47:39 PM (10 years ago)

Author:

fvultier

Message:

bug in the WeaponHUD fixed.

File:

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

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

@@ -93 +93 @@
         textOverlayRight_->setZOrder(600);
 
-        materialNameState_ = "Orxonox/WSHUD_Empty";
+        materialNameState_ = "";
 
         overlayElementReplenish_->setMaterialName("Orxonox/WSHUD_Replenish");
@@ -198 +198 @@
 
         this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
+
+        materialNameState_ = ""; // Needed to set the material in the tick ater a change of the owner.
     }
 
@@ -212 +214 @@
         SUPER(HUDWeaponMode, changedVisibility);
 
-        this->textOverlayLeft_->setVisible(this->isVisible());
-        this->textOverlayRight_->setVisible(this->isVisible());
+        bool visible = this->isVisible();
+
+        this->textOverlayLeft_->setVisible(visible);
+        this->textOverlayRight_->setVisible(visible);
+
+        if (visible)
+        {
+            overlayElementIcon_->show();
+            overlayElementReplenish_->show();
+            overlayElementMunition_->show();
+            overlayElementState_->show();
+        }
     }