Changeset 10278 in orxonox.OLD for branches/playability/src

Timestamp:

Jan 17, 2007, 7:23:47 PM (18 years ago)

Author:

muellmic

Message:

fixed bug, that set false Coor2Ds for the weapon-widgets when changing the weapon configuration. lots of thanks 2 marc!

Location:

branches/playability/src

Files:

• util/hud.cc (modified) (9 diffs)
• util/hud.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (1 diff)

branches/playability/src/util/hud.cc

@@ -197 +197 @@
 void Hud::setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec)
 {
+  //clearWeaponManager();
+
+  //Hide all widgets
   if (this->weaponManager != NULL)
   {
@@ -205 +208 @@
       {
         weapon->getEnergyWidget()->hide();
-        this->weaponsWidgetsPrim.remove(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (weapon->getEnergyWidget()));
+        //this->weaponsWidgetsPrim.remove(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (weapon->getEnergyWidget()));
       }
     }
@@ -218 +221 @@
       {
         weapon->getEnergyWidget()->hide();
-        this->weaponsWidgetsSec.remove(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (weapon->getEnergyWidget()));
+        //this->weaponsWidgetsSec.remove(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (weapon->getEnergyWidget()));
       }
     }
@@ -224 +227 @@
 
   this->weaponManager = weaponMan;
-  this->weaponManagerSecondary = weaponManSec;
+  this->weaponManagerSecondary = weaponManSec; 
 
   this->updateWeaponManager();
@@ -230 +233 @@
 }
 
+/*
+void Hud::clearWeaponManager()
+{
+  //Hide all widgets
+  if (this->weaponManager != NULL)
+  {
+    for (unsigned int i = 0; i < this->weaponManager->getSlotCount(); i++)
+    {
+      Weapon* weapon = this->weaponManager->getWeapon(i);
+      if (weapon != NULL)
+      {
+        weapon->getEnergyWidget()->hide();
+        //this->weaponsWidgetsPrim.remove(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (weapon->getEnergyWidget()));
+      }
+    }
+  }
+
+  if (this->weaponManagerSecondary != NULL)
+  {
+    for (unsigned int i = 0; i < this->weaponManagerSecondary->getSlotCount(); i++)
+    {
+      Weapon* weapon = this->weaponManagerSecondary->getWeapon(i);
+      if (weapon != NULL)
+      {
+        weapon->getEnergyWidget()->hide();
+        //this->weaponsWidgetsSec.remove(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (weapon->getEnergyWidget()));
+      }
+    }
+  }
+
+  //this->weaponsWidgetsPrim.clear();
+  //this->weaponsWidgetsSec.clear();
+}
+*/
+
 void Hud::updateWeaponManager()
 {
   // hide all the Widgets
+  
   std::list<OrxGui::GLGuiEnergyWidgetVertical*>::iterator weaponWidget;
   for (weaponWidget = this->weaponsWidgetsPrim.begin(); weaponWidget != this->weaponsWidgetsPrim.end(); weaponWidget++)
@@ -245 +284 @@
   }
   this->weaponsWidgetsSec.clear();
+  
 
   // add all that we need again.
+
   if (this->weaponManager != NULL)
     for (unsigned int i = 0; i < this->weaponManager->getSlotCount(); i++)
@@ -365 +406 @@
 
   std::list<OrxGui::GLGuiEnergyWidgetVertical*>::iterator weaponWidget;
-  Vector2D pos(overlayWidth, 0.5*this->resY);
-
+  Vector2D pos = Vector2D(overlayWidth + this->rightRect->getAbsCoor2D().x, 0.5*this->resY);
+  PRINTF(0)("Cur Pos: %f,%f\n",pos.x,pos.y);
   // out of reasons i can't get behind, this version is segfaulting when calling getSizeX2D or getSizeY2D. the other
   // element2D- related function works tough.. :s
@@ -374 +415 @@
     if (pos.x < overlayWidth*0.2)
     {
-      pos.x = overlayWidth;
+      pos.x = overlayWidth + this->rightRect->getAbsCoor2D().x;
       pos.y += (*weaponWidget)->getSizeX2D();
     }
@@ -385 +426 @@
 
   pos.y += 160;
-  pos.x = overlayWidth;
+  pos.x = overlayWidth + this->rightRect->getAbsCoor2D().x;
   for (weaponWidget = this->weaponsWidgetsSec.begin(); weaponWidget != this->weaponsWidgetsSec.end(); weaponWidget++)
   {
     if (pos.x < overlayWidth*0.2)
     {
-      pos.x = overlayWidth;
+      pos.x = overlayWidth + this->rightRect->getAbsCoor2D().x;
       pos.y += (*weaponWidget)->getSizeX2D();
     }

branches/playability/src/util/hud.h

@@ -54 +54 @@
 
   void updateWeaponManager();
+  //void clearWeaponManager();
 
   inline void setOverlayPercentage(int perc) 

branches/playability/src/world_entities/player.cc

@@ -98 +98 @@
 void Player::weaponConfigChanged()
 {
-  this->_hud.updateWeaponManager();
+  //this->_hud.updateWeaponManager();
+
+  if (dynamic_cast<SpaceShip*>(this->playable) != 0)
+      this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary());
+    else
+      this->_hud.setWeaponManager(&this->playable->getWeaponManager());
 }
 

branches/playability/src/world_entities/weapons/weapon.cc

@@ -392 +392 @@
 OrxGui::GLGuiWidget* Weapon::getEnergyWidget()
 {
-  if (this->energyWidget == NULL)
+  if ( this->energyWidget == NULL)
   {
     this->energyWidget = new OrxGui::GLGuiEnergyWidgetVertical();