Changeset 11293 for code

Timestamp:

Nov 17, 2016, 4:58:06 PM (8 years ago)

Author:

patricwi

Message:

improvements on pickup system

Location:

code/branches/HUD_HS16/src/modules/overlays/hud

Files:

• HUDPickupItem.cc (modified) (1 diff)
• HUDPickupItem.h (modified) (1 diff)
• HUDPickupSystem.cc (modified) (2 diffs)
• HUDPickupSystem.h (modified) (2 diffs)

code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc

@@ -65 +65 @@
     }
 
-    void initializeMaterial(std::string s)
+    void initializeMaterial(const std::string& s)
     {
         overlayElement_->setMaterialName(s);

code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h

@@ -36 +36 @@
 
         // void setPickup(Pickup* pickup);  
-        void initializeMaterial(std::string s);   
+        void initializeMaterial(const std::string& s);   
 
     private:

code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc

@@ -50 +50 @@
         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_);
 
@@ -65 +65 @@
    //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());
         }
     }

code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h

@@ -41 +41 @@
 #include "pickup/Pickup.h"
 #include "pickup/PickupRepresentation.h"
+#include "HUDPickupItem.h"
 
 namespace orxonox
@@ -58 +59 @@
         // virtual void sizeChanged() override;
     private:
-        void updatePickupList(std::vector<Pickup> picks);
+        void updatePickupList(std::vector<WeakPtr<Pickup>> picks);
         void createPickupList();
         void destroyAll();