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

Timestamp:

Jan 6, 2018, 3:16:00 AM (7 years ago)

Author:

landauf

Message:

[HUD_HS16] fixed wrong dependency between overlays and pickup module: pickup should NOT depend on overlays; instead overlays should use pickup.

also reverted all changes from HUD_HS16 in PickupManager for several reasons:

• calling HUDPickupSystem is not necessary anymore due to the fixed dependencies
• adding a console command is not necessary because there is already a full GUI for this purpose (press F4)
• limiting the number of pickups to 10 is a bad idea because PickupManager manages pickups for ALL players in the game

Location:

code/trunk/src/modules/overlays

Files:

• CMakeLists.txt (modified) (1 diff)
• hud/HUDPickupSystem.cc (modified) (3 diffs)
• hud/HUDPickupSystem.h (modified) (2 diffs)

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

@@ -16 +16 @@
   LINK_LIBRARIES
     orxonox
+    pickup
     weapons
   SOURCE_FILES ${OVERLAYS_SRC_FILES}

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

@@ -38 +38 @@
 #include "HUDPickupSystem.h"
 #include "HUDPickupItem.h"
-#include "pickup/Pickup.h"
 #include "pickup/PickupManager.h"
 
@@ -66 +65 @@
     }
     
-    void HUDPickupSystem::sync(std::vector<Pickupable*> p, std::map<Pickupable*, uint32_t> indexes_)
+    void HUDPickupSystem::tick(float dt)
     {
+        SUPER(HUDPickupSystem, tick, dt);
+
         //hide all pickup symbols in HUD and delete from local map
-        
         for(HUDPickupItem* item : items_)
         {
@@ -84 +84 @@
         const float y = 0.075f;
 
-        for(Pickupable* pickup:p)
+        int numPickups = PickupManager::getInstance().getNumPickups();
+        for (int index = 0; index < numPickups; ++index)
         {
-            int index = indexes_.find(pickup)->second;
             int row = index / 5;
             int column = index % 5;
 
+            const PickupInventoryContainer* container = PickupManager::getInstance().popPickup();
+
             HUDPickupItem* item = new HUDPickupItem(this->getContext());
-            item->initializeMaterial(this->getIcon(((Pickup*)pickup)->getRepresentationName()), offsetX+column*x, offsetY+row*y);
+            item->initializeMaterial(this->getIcon(container->representationName), offsetX+column*x, offsetY+row*y);
             item->setOverlayGroup(this->getOverlayGroup());
             items_.push_back(item);

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

@@ -37 +37 @@
 #include "util/OgreForwardRefs.h"
 #include "overlays/OrxonoxOverlay.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox
 {
-    class _OverlaysExport HUDPickupSystem : public OrxonoxOverlay
+    class _OverlaysExport HUDPickupSystem : public OrxonoxOverlay, public Tickable
     {
     public:
@@ -46 +47 @@
         virtual ~HUDPickupSystem();
 
-        void sizeChanged();
-        void sync(std::vector<Pickupable*> p, std::map<Pickupable*, uint32_t> indexes_);
+        virtual void tick(float dt) override;
+        virtual void sizeChanged() override;
 
     private: