Changeset 11277 for code/branches/HUD_HS16

Timestamp:

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

Author:

patricwi

Message:

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

Location:

code/branches/HUD_HS16

Files:

• data/overlays/HUDTemplates3.oxo (modified) (2 diffs)
• data/overlays/HUDTemplatesFPS.oxo (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDPickupItem.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDPickupItem.h (modified) (3 diffs)
• src/modules/overlays/hud/HUDPickupSystem.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDPickupSystem.h (modified) (2 diffs)
• src/modules/pickup/PickupManager.cc (modified) (2 diffs)

code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo

@@ -188 +188 @@
      name                   = "PickupSystem"
      correctaspect          = true
-     position               = "0.45, 0.95"
+     position               = "0.32, 0.81"
      pickpoint              = "0.0, 0.0"
      visible                = "true"
@@ -195 +195 @@
     <HUDTimer
      name     = "Timer"
-     position = "0.5, 0.85"
+     position = "0.5, 0.25"
      font     = "VeraMono"
      textsize = 0.1

code/branches/HUD_HS16/data/overlays/HUDTemplatesFPS.oxo

@@ -104 +104 @@
     />
 
+    <HUDPickupSystem
+     name                   = "PickupSystem"
+     correctaspect          = true
+     position               = "0.45, 0.95"
+     pickpoint              = "0.0, 0.0"
+     visible                = "true"
+    />
+
     <HUDTimer
      name     = "Timer"

code/branches/HUD_HS16/src/modules/overlays/OverlaysPrereqs.h

@@ -104 +104 @@
     class PauseNotice;
     class TeamBaseMatchScore;
+    class HUDPickupSystem;
+    class HUDPickupItem;
 
     // stats

code/branches/HUD_HS16/src/modules/overlays/hud/CMakeLists.txt

@@ -14 +14 @@
   HUDWeapon.cc
   HUDWeaponSystem.cc
+  HUDPickupItem.cc
+  HUDPickupSystem.cc
   ChatOverlay.cc
   AnnounceMessage.cc

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

@@ -29 +29 @@
 #include "HUDPickupItem.h"
 
+#include <string>
+
+
+#include <OgreOverlayManager.h>
+#include <OgrePanelOverlayElement.h> 
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "util/Convert.h"
 #include "core/class/Super.h"
+#include "HUDPickupItem.h"
 
 namespace orxonox
 {
     RegisterClass(HUDPickupItem);
+    Ogre::PanelOverlayElement* overlayElement_;
 
     HUDPickupItem::HUDPickupItem(Context* context) : OrxonoxOverlay(context)
@@ -43 +51 @@
 
         overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "HUDPickupItem" + getUniqueNumberString()));
-        overlayElement_->setMaterialName("Orxonox/WSHUD_Weapon");   //TODO be switched
+        
         overlayElement_->setPosition(0.0f,0.0f);
-        overlayElement_->setDimensions(1.0f,1.0f);
+        overlayElement_->setDimensions(0.5f,0.5f);
         this->background_->addChild(overlayElement_);
     }
@@ -53 +61 @@
         if (this->isInitialized())
         {
-            destroyHUDChilds();
+            overlayElement_=nullptr;
         }
+    }
+
+    void initializeMaterial(std::string s)
+    {
+        overlayElement_->setMaterialName(s);
     }
 

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_;
     };
 }

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

@@ -27 +27 @@
  */
 
+#include <vector>
+#include <string>
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "util/Convert.h"
 #include "core/class/Super.h"
+#include "HUDPickupSystem.h"
+#include "pickup/Pickup.h"
+#include "HUDPickupItem.h"
 
 namespace orxonox
@@ -39 +45 @@
     {
         RegisterObject(HUDPickupSystem);
+
+        overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "HUDPickupSystem" + getUniqueNumberString()));
+        overlayElement_->setMaterialName("PickupBar");
+        overlayElement_->setPosition(0.0f,0.0f);
+        overlayElement_->setDimensions(0.70f,0.15f);
+        orxout() << "hello HUDPickupSystem" << endl;
+        this->background_->addChild(overlayElement_);
 
     }
@@ -52 +65 @@
    //TODO: XMLPort
 
-    void HUDPickupSystem::updatePickupList()
+    void HUDPickupSystem::updatePickupList(std::vector<Pickup> picks)
     {
-        
+        for(Pickup p : picks)
+        {
+            HUDPickupItem item = new HUDPickupItem(this->getContext());
+            item.initializeMaterial(p.getRepresentationName());
+        }
     }
 

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

@@ -32 +32 @@
 #include <string>
 
+
+#include <OgreOverlayManager.h>
+#include <OgrePanelOverlayElement.h> 
+
 #include "overlays/OrxonoxOverlay.h"
 #include "worldentities/pawns/Pawn.h"
 #include "overlays/OverlayGroup.h"
+#include "pickup/Pickup.h"
+#include "pickup/PickupRepresentation.h"
 
 namespace orxonox
@@ -51 +57 @@
         // virtual void positionChanged() override;
         // virtual void sizeChanged() override;
-    protected:
-        void updatePickupList();
+    private:
+        void updatePickupList(std::vector<Pickup> picks);
         void createPickupList();
         void destroyAll();
+
+        Ogre::PanelOverlayElement* overlayElement_;
+        WeakPtr<Pawn> owner_;
+
+        std::vector<PickupRepresentation> pickupRepresentations_;
     };
 }

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

@@ -51 +51 @@
 #include "CollectiblePickup.h"
 #include "PickupRepresentation.h"
+// #include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox
@@ -378 +379 @@
     //This function is called by the command line or by the key binding
     //it uses or unuses the pickup, depending on its current state
-    void PickupManager::useUnusePickup(uint32_t index) //uint32_t index
+    void PickupManager::useUnusePickup(uint32_t index) 
     {
         orxout() << "Hello there I was here " << index << endl;