Changeset 11705

Timestamp:

Jan 6, 2018, 3:13:26 PM (6 years ago)

Author:

landauf

Message:

[HUD_HS16] removed HUDPickupItem as it is not really necessary (it's just an ogre overlay). also fixed several memory-leaks and some issues with positioning and visibility of the pickup items

Location:

code/trunk

Files:

• data/overlays/HUDPickupTemplate.oxo (modified) (1 diff)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDPickupItem.cc (deleted)
• src/modules/overlays/hud/HUDPickupItem.h (deleted)
• src/modules/overlays/hud/HUDPickupSystem.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDPickupSystem.h (modified) (1 diff)

code/trunk/data/overlays/HUDPickupTemplate.oxo

@@ -187 +187 @@
     <HUDPickupSystem
      name                   = "PickupSystem"
+     background             = "PickupBar"
      correctaspect          = true
+     size                   = "0.70, 0.15"
      position               = "0.32, 0.81"
      pickpoint              = "0.0, 0.0"

code/trunk/data/overlays/HUDTemplates3.oxo

@@ -187 +187 @@
     <HUDPickupSystem
      name                   = "PickupSystem"
+     background             = "PickupBar"
      correctaspect          = true
+     size                   = "0.70, 0.15"
      position               = "0.32, 0.81"
      pickpoint              = "0.0, 0.0"

code/trunk/src/modules/overlays/OverlaysPrereqs.h

@@ -105 +105 @@
     class TeamBaseMatchScore;
     class HUDPickupSystem;
-    class HUDPickupItem;
 
     // stats

code/trunk/src/modules/overlays/hud/CMakeLists.txt

@@ -14 +14 @@
   HUDWeapon.cc
   HUDWeaponSystem.cc
-  HUDPickupItem.cc
   HUDPickupSystem.cc
   ChatOverlay.cc

code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
+#include <OgreOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
 
 #include "core/CoreIncludes.h"
 #include "core/class/Super.h"
-#include "util/StringUtils.h"
+#include "util/Convert.h"
 #include "HUDPickupSystem.h"
-#include "HUDPickupItem.h"
 #include "pickup/PickupManager.h"
 
@@ -48 +48 @@
         RegisterObject(HUDPickupSystem);
 
-        overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "HUDPickupSystem" + getUniqueNumberString()));
-        overlayElement_->setMaterialName("PickupBar");
-        overlayElement_->setPosition(0.0f,0.0f);
-        overlayElement_->setDimensions(0.70f,0.15f);
-        this->background_->addChild(overlayElement_);
+        const float offsetX = 0.02f;
+        const float offsetY = 0.05f;
+        const float x = 0.2;
+        const float y = 0.5f;
+
+        for (int index = 0; index < 10; ++index)
+        {
+            int row = index / 5;
+            int column = index % 5;
+
+            std::string name = "HUDPickupItem" + multi_cast<std::string>(index);
+            Ogre::OverlayElement* item = Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", name);
+
+            item->setDimensions(0.16, 0.4);
+            item->setPosition(offsetX + column*x, offsetY + row*y);
+            this->items_.push_back(item);
+        }
     }
 
     HUDPickupSystem::~HUDPickupSystem()
     {
+        for (Ogre::OverlayElement* item : items_)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(item);
     }
 
@@ -69 +83 @@
         SUPER(HUDPickupSystem, tick, dt);
 
-        //hide all pickup symbols in HUD and delete from local map
-        for(HUDPickupItem* item : items_)
+        int numPickups = PickupManager::getInstance().getNumPickups();
+        for (size_t index = 0; index < this->items_.size(); ++index)
         {
-            item->hideMe();
-        }
+            Ogre::OverlayElement* item = this->items_[index];
 
-        items_.clear();
-        assert(items_.empty()); //items_ must be empty now
-
-        //add to local map and place on screen
-        const float offsetX = 0.345f;
-        const float offsetY = 0.82f;
-        const float x = 0.102f;
-        const float y = 0.075f;
-
-        int numPickups = PickupManager::getInstance().getNumPickups();
-        for (int index = 0; index < numPickups; ++index)
-        {
-            int row = index / 5;
-            int column = index % 5;
-
-            const PickupInventoryContainer* container = PickupManager::getInstance().popPickup();
-
-            HUDPickupItem* item = new HUDPickupItem(this->getContext());
-            item->initializeMaterial(this->getIcon(container->representationName), offsetX+column*x, offsetY+row*y);
-            item->setOverlayGroup(this->getOverlayGroup());
-            items_.push_back(item);
+            if (static_cast<int>(index) < numPickups)
+            {
+                const PickupInventoryContainer* container = PickupManager::getInstance().popPickup();
+                item->setMaterialName(this->getIcon(container->representationName));
+                if (!item->getParent())
+                    this->background_->addChild(item);
+            }
+            else
+            {
+                if (item->getParent())
+                    this->background_->removeChild(item->getName());
+            }
         }
     }

code/trunk/src/modules/overlays/hud/HUDPickupSystem.h

@@ -51 +51 @@
 
     private:
-        
         std::string getIcon(std::string repName);
 
-        std::vector<HUDPickupItem*> items_;
-        Ogre::PanelOverlayElement* overlayElement_;
+        std::vector<Ogre::OverlayElement*> items_;
     };
 }