Changeset 11044 for code/branches/presentationHS15/src

Timestamp:

Jan 5, 2016, 9:13:31 AM (9 years ago)

Author:

landauf

Message:

fixed visibility of weapon hud:

• propagate changedVisibility to all child overlays (necessary if the containing overlaygroup changes its visibility)
• initialize the visibility of child overlays (necessary if the visibility of the weaponsystem is 'false' in the hud definition)

Location:

code/branches/presentationHS15/src/modules/overlays/hud

Files:

• HUDWeapon.cc (modified) (2 diffs)
• HUDWeaponMode.cc (modified) (1 diff)
• HUDWeaponSystem.cc (modified) (2 diffs)

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

@@ -117 +117 @@
         for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
         {
+            (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
             (*it)->setVisible(visible);
         }
@@ -168 +169 @@
             hudWeaponMode->setOwner(owner_);
             hudWeaponMode->setOverlayGroup(this->getOverlayGroup());
+            hudWeaponMode->setVisible(this->isVisible());
             hudWeaponMode->setWeaponMode(it->second);
             hudWeaponMode->setWeaponIndex(this->weaponIndex_);                    

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

@@ -218 +218 @@
         this->textOverlayLeft_->setVisible(visible);
         this->textOverlayRight_->setVisible(visible);
-
-        if (visible)
-        {
-            overlayElementIcon_->show();
-            overlayElementReplenish_->show();
-            overlayElementMunition_->show();
-            overlayElementState_->show();
-        }
     }
 

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

@@ -105 +105 @@
         for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
         {
+            (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
             (*it)->setVisible(visible);
         }
@@ -150 +151 @@
             hudWeapon->setOwner(owner_);
             hudWeapon->setOverlayGroup(this->getOverlayGroup());
+            hudWeapon->setVisible(this->isVisible());
             hudWeapon->setWeapon(*it);
             hudWeapon->setAspectCorrection(false);