Changeset 11305 for code/branches/HUD_HS16

Timestamp:

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

Author:

patricwi

Message:

linker error

Location:

code/branches/HUD_HS16/src/modules

Files:

• overlays/hud/HUDPickupItem.cc (modified) (1 diff)
• overlays/hud/HUDPickupItem.h (modified) (1 diff)
• overlays/hud/HUDPickupSystem.cc (modified) (3 diffs)
• overlays/hud/HUDPickupSystem.h (modified) (3 diffs)
• pickup/PickupManager.cc (modified) (6 diffs)
• pickup/PickupManager.h (modified) (2 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

code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc

@@ -51 +51 @@
 #include "CollectiblePickup.h"
 #include "PickupRepresentation.h"
-// #include "overlays/hud/HUDPickupSystem.h"
+#include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox
@@ -70 +70 @@
     SetConsoleCommand("useUnusePickup", &PickupManager::useUnusePickup).addShortcut().setActive(true);
 
-   // SetConsoleCommand("HumanController", "fire",           &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
     /**
     @brief
@@ -82 +81 @@
 
         orxout(internal_info, context::pickups) << "PickupManager created." << endl;
+    }
+
+    void PickupManager::setPickupSystem(HUDPickupSystem* system)
+    {
+        pickupSystem=system;
     }
 
@@ -295 +299 @@
             this->pickups_[index] = pickup;
 
-            //  //Add pickup keybinding
-            // if( KeyBinderManager::exists() )
-            //     addKeyBindingForNewPickup(pickup, index);
-            // else
-            //     orxout() << "Could not create new keybinding because KeyBinderManager doesn't exist." << endl;
+            //TODO
+            std::vector<Pickupable*> picks;
+
+            PickupManager& manager = PickupManager::getInstance();
+            
+            Pickupable* pickup = nullptr;
+
+            for(uint32_t i = 0; i!=10; i++)
+            {
+                pickup=manager.pickups_.find(i)->second;
+                picks.push_back(pickup);
+            }
+            // pickupSystem->updatePickupList(picks);
+            
         }
         else // If it was dropped, it is removed from the required lists.
@@ -307 +320 @@
             index = it->second;
 
-            // //Remove pickup keybinding
-            // if( KeyBinderManager::exists() )
-            //       removeKeyBindingForOldPickup(pickup, index);
-            // else
-            //     orxout() << "Could not delete old keybinding because KeyBinderManager doesn't exist." << endl;
-
-            // Remove the Pickupable from the indexes_ and pickups_ list.
+            
             this->indexes_.erase(pickup);
             this->pickups_.find(index)->second=nullptr; //set to null, so that can be identified as free slot by getPickupIndex()
@@ -342 +349 @@
 
     }
-
-    //PRECONDITION: KeyBinderManager exists, pickup is not NULL, 0 < index < 9
-    //FUNCTION: Adds a keybinding for the new pickup using its index and sets a console command
-    // void PickupManager::addKeyBindingForNewPickup(Pickupable* pickup, uint32_t index)
-    // {
-    //     std::string name="Keys.KeyNumpad";
-    //     std::string binding="useOrUnusePickup";
-
-    //     name.append(std::to_string(index));
-    //     binding.append(std::to_string(index));
-
-    //     SetConsoleCommand(binding, &PickupManager::useUnusePickup(pickup, index));
-    //     KeyBinderManager::getInstance().getCurrent()->setBinding(binding, name, true); 
-
-    //     orxout() << "Keybinding for item " << index << " has been added on keybinding " << name << endl;
-
-
-    // }
-
-    //PRECONDITION: KeyBinderManager exists, pickup is not NULL, 0 < index < 9
-    //FUNCTION: Removes the keybinding of the pickup using its index
-    // void PickupManager::removeKeyBindingForOldPickup(Pickupable* pickup, uint32_t index)
-    // {
-    //     std::string name="Keys.KeyNumpad";
-    //     std::string binding="";
-
-    //     name.append(std::to_string(index));
-
-    //     SetConsoleCommand(binding, nullptr);
-    //     KeyBinderManager::getInstance().getCurrent()->setBinding("", name, true); 
-
-    //     orxout() << "Keybinding for item " << index << " has been removed on keybinding " << name << endl;
-
-    // }
 
     //This function is called by the command line or by the key binding

code/branches/HUD_HS16/src/modules/pickup/PickupManager.h

@@ -45 +45 @@
 #include "util/Singleton.h"
 #include "interfaces/PickupListener.h"
+#include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox // tolua_export
@@ -148 +149 @@
             static void dropPickupNetworked(uint32_t pickup); //!< Helper method to drop the input pickup on the server.
             static void usePickupNetworked(uint32_t pickup, bool use); //!< Helper method to use (or unuse) the input Pickupable on the server.
+            void setPickupSystem(HUDPickupSystem* system);
 
         private:
+            HUDPickupSystem* pickupSystem;
             static PickupManager* singletonPtr_s;
             static const std::string guiName_s; //!< The name of the PickupInventory