Changeset 11305 for code/branches/HUD_HS16/src/modules/overlays

Timestamp:

Nov 21, 2016, 4:18:45 PM (8 years ago)

Author:

patricwi

Message:

linker error

Location:

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

Files:

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

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

@@ -65 +65 @@
     }
 
-    void initializeMaterial(const std::string& s)
+    void HUDPickupItem::initializeMaterial(const std::string& s)
     {
         overlayElement_->setMaterialName(s);
     }
 
-    void printHello()
+    void HUDPickupItem::printHello()
     {
         orxout() << "lets say hello" << endl;

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

@@ -53 +53 @@
 }
 
-#endif /* _HUDWeapon_H__ */
+#endif

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

@@ -37 +37 @@
 #include "pickup/Pickup.h"
 #include "HUDPickupItem.h"
+#include "pickup/PickupManager.h"
 
 namespace orxonox
@@ -53 +54 @@
         this->background_->addChild(overlayElement_);
 
+        PickupManager::getInstance().setPickupSystem(this);
     }
 
@@ -65 +67 @@
    //TODO: XMLPort
 
-    void HUDPickupSystem::updatePickupList(std::vector<WeakPtr<Pickup>> picks)
+    void HUDPickupSystem::updatePickupList(std::vector<Pickupable*> picks)
     {
-        for(Pickup* p : picks)
+        for(Pickupable* p : picks)
         {
             HUDPickupItem* item = new HUDPickupItem(this->getContext());
-            // item->initializeMaterial(p->getRepresentationName());
+            item->initializeMaterial(((Pickup*)p)->getRepresentationName());
             item->printHello();
         }

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

@@ -26 +26 @@
  *
  */
+
+
+#ifndef _HUDPickupSystem_H__
+#define _HUDPickupSystem_H__
+
 #include "overlays/OverlaysPrereqs.h"
 
@@ -58 +63 @@
         // virtual void positionChanged() override;
         // virtual void sizeChanged() override;
+        void updatePickupList(std::vector<Pickupable*> picks);    
     private:
-        void updatePickupList(std::vector<WeakPtr<Pickup>> picks);
         void createPickupList();
         void destroyAll();
@@ -69 +74 @@
     };
 }
+
+#endif