Changeset 11708 for code/trunk/src/modules/overlays

Timestamp:

Jan 6, 2018, 6:07:53 PM (7 years ago)

Author:

landauf

Message:

[HUD_HS16] fixed issue that the hud shows pickups of ALL players/bots instead of just the own spaceship. fixed this by comparing objectIDs
note: network calls currently support only 5 arguments, so I removed representationObjectId which doesn't seem to be used (neither in C++ nor in Lua)

Location:

code/trunk/src/modules/overlays/hud

Files:

• HUDPickupSystem.cc (modified) (3 diffs)
• HUDPickupSystem.h (modified) (2 diffs)

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

@@ -34 +34 @@
 #include <OgrePanelOverlayElement.h>
 
+#include "HUDPickupSystem.h"
+
 #include "core/CoreIncludes.h"
 #include "core/class/Super.h"
 #include "util/Convert.h"
-#include "HUDPickupSystem.h"
 #include "pickup/PickupManager.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -78 +80 @@
 
     }
-    
+
+    void HUDPickupSystem::changedOwner()
+    {
+        SUPER(HUDPickupSystem, changedOwner);
+
+        this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
+    }
+
     void HUDPickupSystem::tick(float dt)
     {
         SUPER(HUDPickupSystem, tick, dt);
 
-        int numPickups = PickupManager::getInstance().getNumPickups();
+        std::vector<const PickupInventoryContainer*> containers = this->getPickupsForOwner();
+
         for (size_t index = 0; index < this->items_.size(); ++index)
         {
             Ogre::OverlayElement* item = this->items_[index];
 
-            if (static_cast<int>(index) < numPickups)
+            if (index < containers.size())
             {
-                const PickupInventoryContainer* container = PickupManager::getInstance().popPickup();
-                item->setMaterialName(this->getIcon(container->representationName));
+                item->setMaterialName(this->getIcon(containers[index]->representationName));
                 if (!item->getParent())
                     this->background_->addChild(item);
@@ -103 +112 @@
     }
 
-    std::string HUDPickupSystem::getIcon(std::string repName)
+    std::vector<const PickupInventoryContainer*> HUDPickupSystem::getPickupsForOwner() const
+    {
+        std::vector<const PickupInventoryContainer*> containers;
+
+        int numPickups = PickupManager::getInstance().getNumPickups();
+        for (int i = 0; i < numPickups; ++i)
+        {
+            const PickupInventoryContainer* container = PickupManager::getInstance().popPickup();
+            if (this->owner_ && this->owner_->getObjectID() == container->carrierPawnId)
+                containers.push_back(container);
+        }
+
+        return containers;
+    }
+
+    std::string HUDPickupSystem::getIcon(const std::string& repName) const
     {
         if(repName.find("invisible", 0)!=std::string::npos) return "Eye";

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

@@ -32 +32 @@
 
 #include "overlays/OverlaysPrereqs.h"
+#include "pickup/PickupPrereqs.h"
 
 #include <vector>
@@ -48 +49 @@
 
         virtual void tick(float dt) override;
+
         virtual void sizeChanged() override;
+        virtual void changedOwner() override;
 
     private:
-        std::string getIcon(std::string repName);
+        std::vector<const PickupInventoryContainer*> getPickupsForOwner() const;
+        std::string getIcon(const std::string& repName) const;
 
         std::vector<Ogre::OverlayElement*> items_;
+        WeakPtr<Pawn> owner_;
     };
 }