[Orxonox-commit 6655] r11293 - code/branches/HUD_HS16/src/modules/overlays/hud

[patricwi at orxonox.net]

Author: patricwi
Date: 2016-11-17 16:58:06 +0100 (Thu, 17 Nov 2016)
New Revision: 11293

Modified:
   code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc
   code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h
   code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc
   code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h
Log:
improvements on pickup system

Modified: code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc
===================================================================
--- code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc	2016-11-14 15:08:55 UTC (rev 11292)
+++ code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc	2016-11-17 15:58:06 UTC (rev 11293)
@@ -64,7 +64,7 @@
         }
     }
 
-    void initializeMaterial(std::string s)
+    void initializeMaterial(const std::string& s)
     {
         overlayElement_->setMaterialName(s);
     }

Modified: code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h
===================================================================
--- code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h	2016-11-14 15:08:55 UTC (rev 11292)
+++ code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h	2016-11-17 15:58:06 UTC (rev 11293)
@@ -35,7 +35,7 @@
         // virtual void sizeChanged() override;
 
         // void setPickup(Pickup* pickup);  
-        void initializeMaterial(std::string s);   
+        void initializeMaterial(const std::string& s);   
 
     private:
         // void createHUDChilds();

Modified: code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc
===================================================================
--- code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc	2016-11-14 15:08:55 UTC (rev 11292)
+++ code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc	2016-11-17 15:58:06 UTC (rev 11293)
@@ -49,7 +49,7 @@
         overlayElement_->setMaterialName("PickupBar");
         overlayElement_->setPosition(0.0f,0.0f);
         overlayElement_->setDimensions(0.70f,0.15f);
-        orxout() << "hello HUDPickupSystem" << endl;
+        orxout() << "hello here is the HUDPickupSystem" << endl;
         this->background_->addChild(overlayElement_);
 
     }
@@ -64,12 +64,12 @@
 
    //TODO: XMLPort
 
-    void HUDPickupSystem::updatePickupList(std::vector<Pickup> picks)
+    void HUDPickupSystem::updatePickupList(std::vector<WeakPtr<Pickup>> picks)
     {
-        for(Pickup p : picks)
+        for(Pickup* p : picks)
         {
-            HUDPickupItem item = new HUDPickupItem(this->getContext());
-            item.initializeMaterial(p.getRepresentationName());
+            HUDPickupItem* item = new HUDPickupItem(this->getContext());
+            item->initializeMaterial(p->getRepresentationName());
         }
     }
 

Modified: code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h
===================================================================
--- code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h	2016-11-14 15:08:55 UTC (rev 11292)
+++ code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h	2016-11-17 15:58:06 UTC (rev 11293)
@@ -40,6 +40,7 @@
 #include "overlays/OverlayGroup.h"
 #include "pickup/Pickup.h"
 #include "pickup/PickupRepresentation.h"
+#include "HUDPickupItem.h"
 
 namespace orxonox
 {
@@ -57,7 +58,7 @@
         // virtual void positionChanged() override;
         // virtual void sizeChanged() override;
     private:
-        void updatePickupList(std::vector<Pickup> picks);
+        void updatePickupList(std::vector<WeakPtr<Pickup>> picks);
         void createPickupList();
         void destroyAll();