Changeset 11277 for code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h

Timestamp:

Nov 7, 2016, 5:08:11 PM (9 years ago)

Author:

patricwi

Message:

visualization of pickup system initiated. next steps: add pickup icons when picked up

File:

• code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (modified) (3 diffs)

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

@@ -16 +16 @@
 #include "worldentities/pawns/Pawn.h"
 #include "overlays/OverlayGroup.h"
-#include "weaponsystem/Weapon.h"
-#include "weaponsystem/WeaponMode.h"
-#include "HUDWeaponMode.h"
+#include "pickup/Pickup.h"
 
 namespace orxonox
@@ -28 +26 @@
         virtual ~HUDPickupItem();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-        virtual void tick(float dt) override;
-        virtual void changedOwner() override;
-        virtual void changedOverlayGroup() override;
-        virtual void changedVisibility() override;
-        virtual void changedName() override;
-        virtual void positionChanged() override;
-        virtual void sizeChanged() override;
+        // virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        // virtual void tick(float dt) override;
+        // virtual void changedOwner() override;
+        // virtual void changedOverlayGroup() override;
+        // virtual void changedVisibility() override;
+        // virtual void changedName() override;
+        // virtual void positionChanged() override;
+        // virtual void sizeChanged() override;
 
-        void setPickup(Pickup* pickup);     
+        // void setPickup(Pickup* pickup);  
+        void initializeMaterial(std::string s);   
 
     private:
@@ -50 +49 @@
         WeakPtr<Pickup> pickup_;
 
-        Ogre::PanelOverlayElement* overlayElement_;
     };
 }