Changeset 10721 for code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc

Timestamp:

Oct 29, 2015, 11:27:32 PM (9 years ago)

Author:

fvultier

Message:

 

File:

• code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) (7 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Yuning Chai
- *      Felix Schulthess
+ *      Fabien Vultier
  *   Co-authors:
- *      Reto Grieder
- *      Wolfgang Roenninger
+ *      ...
  *
  */
@@ -48 +46 @@
         RegisterObject(HUDWeapon);
 
+        weaponModeHUDActualSize_ = Vector2(0.0f,0.0f);
+
+        weaponModes_ = NULL;
+        weaponIndex_ = 0;
+        hudWeaponModes_.clear();
+
         overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "HUDWeapon" + getUniqueNumberString()));
         overlayElement_->setMaterialName("Orxonox/WSHUD_Weapon");
@@ -75 +79 @@
     {
         SUPER(HUDWeapon, tick, dt);
+
+        if (!weapon_)
+        {
+            // TODO: destroy this HUD id the Weapon does no more exist. (Wehen the weak pointer is NULL)
+        }
     }    
 
@@ -82 +91 @@
 
         positionHUDChilds();
-    }     
+    }
+
+    void HUDWeapon::sizeChanged()
+    {
+        OrxonoxOverlay::sizeChanged();
+
+        positionHUDChilds();
+    }
 
     void HUDWeapon::changedOwner()
@@ -131 +147 @@
         weaponModes_ = weapon_->getAllWeaponmodes();
 
+        updateSize();
         createHUDChilds();
-        positionHUDChilds();        
+        positionHUDChilds();
     }  
 
     void HUDWeapon::createHUDChilds()
     {
+        if (weaponModes_ == NULL)
+        {
+            return;
+        }
+
+        int positionIndex = 0;
+
         for (std::multimap<unsigned int, WeaponMode*>::iterator it = weaponModes_->begin(); it != weaponModes_->end(); ++it)
         {
             HUDWeaponMode* hudWeaponMode = new HUDWeaponMode(this->getContext());
             hudWeaponMode->setOwner(owner_);
+            hudWeaponMode->setOverlayGroup(this->getOverlayGroup());
             hudWeaponMode->setWeaponMode(it->second);
+            hudWeaponMode->setWeaponIndex(this->weaponIndex_);                    
+            hudWeaponMode->setAspectCorrection(false);
+            hudWeaponMode->setPickPoint(Vector2(0.0f,0.0f));
+
             hudWeaponModes_.push_back(hudWeaponMode);
-        }    
+
+            ++ positionIndex;
+        }
     }      
 
@@ -152 +183 @@
         for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
         {
-            (*it)->setOverlayGroup(this->getOverlayGroup());            
-            (*it)->setAspectCorrection(this->getAspectCorrection());
-            (*it)->setPosition(this->getPosition() + Vector2(0.0f,0.025f*positionIndex));
-            (*it)->setSize(Vector2(0.15f,0.025f));
-            (*it)->setPickPoint(Vector2(0.0f,0.0f));
-
-            ++ positionIndex;        
-        }
-
-        overlayElement_->setDimensions(1.0f,0.25f*hudWeaponModes_.size());
+            (*it)->setWeaponModeIndex(positionIndex);
+            (*it)->setWeaponIndex(this->weaponIndex_);
+            (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
+            (*it)->positionHUDChilds();
+
+            ++ positionIndex;
+        }
     }  
 
@@ -173 +201 @@
         hudWeaponModes_.clear();
     }
+
+    void HUDWeapon::updateSize()
+    {
+        if (weaponModes_ != NULL)
+        {
+            this->setSize(Vector2(weaponModeHUDActualSize_.x,weaponModeHUDActualSize_.y*weaponModes_->size()));
+            updatePosition();
+        }        
+    }
+
+    void HUDWeapon::updatePosition()
+    {
+        if (weaponModes_ != NULL)
+        {
+            this->setPosition(Vector2(weaponModeHUDActualSize_.x*weaponIndex_,0.0f));
+        }        
+    }       
 }