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

Timestamp:

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

Author:

fvultier

Message:

 

File:

• code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) (6 diffs)

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

@@ -51 +51 @@
         RegisterObject(HUDWeaponSystem);
 
+        weaponModeHUDSize_ = Vector2(0.0f,0.0f);
+        weaponModeHUDActualSize_ = Vector2(0.0f,0.0f);        
+
         weapons_.clear();
         hudWeapons_.clear();
@@ -67 +70 @@
         SUPER(HUDWeaponSystem, XMLPort, xmlelement, mode);
 
-        /*XMLPortParam(HUDWeaponSystem, "sensitivity", setRadarSensitivity, getRadarSensitivity, xmlelement, mode);
-        XMLPortParam(HUDWeaponSystem, "halfDotSizeDistance", setHalfDotSizeDistance, getHalfDotSizeDistance, xmlelement, mode);*/
+        XMLPortParam(HUDWeaponSystem, "weaponModeHUDSize", setWeaponModeHUDSize, getWeaponModeHUDSize, xmlelement, mode);
     }
 
@@ -86 +88 @@
 
         positionHUDChilds();
-    }  
+    }
+
+    void HUDWeaponSystem::sizeChanged()
+    {
+        OrxonoxOverlay::sizeChanged();
+
+        weaponModeHUDActualSize_ = this->getActualSize();
+
+        positionHUDChilds();
+    }
 
     void HUDWeaponSystem::changedOwner()
@@ -142 +153 @@
 
         createHUDChilds();
-        positionHUDChilds();        
+        positionHUDChilds();
     }
 
     void HUDWeaponSystem::createHUDChilds()
     {
+        int positionIndex = 0;
+
         for (std::vector<WeakPtr<Weapon> >::iterator it = weapons_.begin(); it != weapons_.end(); ++it)
         {
-            HUDWeapon* hudWeapon = new HUDWeapon(this->getContext());            
+            HUDWeapon* hudWeapon = new HUDWeapon(this->getContext());
             hudWeapon->setOwner(owner_);
+            hudWeapon->setOverlayGroup(this->getOverlayGroup());
             hudWeapon->setWeapon(*it);
+            hudWeapon->setAspectCorrection(false);
+            hudWeapon->setPickPoint(Vector2(0.0f,0.0f));
+
             hudWeapons_.push_back(hudWeapon);
-        }       
+
+            ++ positionIndex;
+        }
     }      
 
@@ -159 +178 @@
     {
         int positionIndex = 0;
+        //this->setSize(weaponModeHUDSize_);
+        // this->weaponModeHUDActualSize_ = this->getActualSize();
 
         for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
         {
-            (*it)->setOverlayGroup(this->getOverlayGroup());            
-            (*it)->setAspectCorrection(this->getAspectCorrection());
-            (*it)->setPosition(this->getPosition() + Vector2(0.15f*positionIndex,0.0f));            
-            (*it)->setSize(Vector2(0.15f,0.10f));
-            (*it)->setPickPoint(Vector2(0.0f,0.0f));
+            (*it)->setWeaponIndex(positionIndex);
+            (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
+            (*it)->positionHUDChilds();           
 
             ++ positionIndex;
-        }        
+        }
     }  
 
@@ -180 +199 @@
 
         hudWeapons_.clear();     
-    }     
+    }
 }