Changeset 11314 for code/branches

Timestamp:

Nov 28, 2016, 7:21:35 PM (8 years ago)

Author:

patricwi

Message:

linker problem solved, visuals work as long as only 1 item is picked up.

Location:

code/branches/HUD_HS16/src/modules

Files:

• overlays/hud/HUDPickupItem.cc (modified) (2 diffs)
• overlays/hud/HUDPickupItem.h (modified) (1 diff)
• overlays/hud/HUDPickupSystem.cc (modified) (3 diffs)
• overlays/hud/HUDPickupSystem.h (modified) (1 diff)
• pickup/CMakeLists.txt (modified) (1 diff)
• pickup/PickupManager.cc (modified) (4 diffs)
• pickup/PickupManager.h (modified) (2 diffs)

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

@@ -52 +52 @@
         overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "HUDPickupItem" + getUniqueNumberString()));
         
-        overlayElement_->setPosition(0.0f,0.0f);
-        overlayElement_->setDimensions(0.5f,0.5f);
-        this->background_->addChild(overlayElement_);
+        overlayElement_->setDimensions(0.1f,0.1f);
+        
     }
 
@@ -65 +64 @@
     }
 
-    void HUDPickupItem::initializeMaterial(const std::string& s)
-    {
+    void HUDPickupItem::initializeMaterial(const std::string& s, float x, float y)
+    {
+        orxout() << "material name is: " << s << endl;
         overlayElement_->setMaterialName(s);
-    }
-
-    void HUDPickupItem::printHello()
-    {
-        orxout() << "lets say hello" << endl;
+        overlayElement_->setPosition(x, y);
+        overlayElement_->show();
+        this->background_->addChild(overlayElement_);
+    }
+
+    void HUDPickupItem::hideMe()
+    {
+        orxout() << this << " has called hide" << endl;
+        overlayElement_->hide();
+        overlayElement_->_update();
+        orxout() << "after the call the element is visible: " << overlayElement_->isVisible() << endl;
     }
 

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

@@ -36 +36 @@
 
         // void setPickup(Pickup* pickup);  
-        void initializeMaterial(const std::string& s);  
-        void printHello(); 
+        void initializeMaterial(const std::string& s, float x, float y);  
+        void hideMe(); 
 
     private:

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

@@ -53 +53 @@
         orxout() << "hello here is the HUDPickupSystem" << endl;
         this->background_->addChild(overlayElement_);
-
-        PickupManager::getInstance().setPickupSystem(this);
     }
 
@@ -69 +67 @@
     void HUDPickupSystem::updatePickupList(std::vector<Pickupable*> picks)
     {
-        for(Pickupable* p : picks)
+        int i=0;
+        const float offsetX = 0.32f;
+        float offsetY = 0.77f;
+        const float x = 0.1f;
+
+        orxout() << "size: " << picks.size() << endl;
+
+        if(picks.size()>0)
         {
-            HUDPickupItem* item = new HUDPickupItem(this->getContext());
-            item->initializeMaterial(((Pickup*)p)->getRepresentationName());
-            item->printHello();
+
+            for(Pickupable* p : picks)
+            {
+                // orxout() << "actual pick is: " << p << endl;
+                if(i%4==0)
+                {
+                    offsetY+=0.04f;
+                    i=0;
+                }   
+                HUDPickupItem* item = new HUDPickupItem(this->getContext());
+                // item->initializeMaterial(((Pickup*)p)->getRepresentationName(), offsetX+i*x, offsetY);
+                if(i%2==0)
+                    item->initializeMaterial("Shield", offsetX+i*x, offsetY);
+                else
+                    item->initializeMaterial("ArrowUp", offsetX+i*x, offsetY);
+                item->setOverlayGroup(this->getOverlayGroup());
+                this->picks[p] = item;
+                ++i;
+            }
         }
     }
@@ -79 +100 @@
     void HUDPickupSystem::createPickupList()
     {
-     
     }      
+
+    void HUDPickupSystem::removePickup(Pickupable* pickup)
+    {
+        HUDPickupItem* item = this->picks.find(pickup)->second;
+        orxout() << "removePickup: pickup= " << pickup << " item= " << item << endl;
+        assert(item);
+        item->setOverlayGroup(nullptr); 
+        item->hideMe();
+        overlayElement_->_update();
+    }
 
     void HUDPickupSystem::destroyAll()
     {
-        
+        this->background_->removeChild(overlayElement_->getName());
     }
 }

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

@@ -63 +63 @@
         // virtual void positionChanged() override;
         // virtual void sizeChanged() override;
-        void updatePickupList(std::vector<Pickupable*> picks);    
+        void updatePickupList(std::vector<Pickupable*> picks);  
+        void createPickupList();  
+        void removePickup(Pickupable* pickup);
     private:
-        void createPickupList();
+        
         void destroyAll();
+
+        std::map<Pickupable*, HUDPickupItem*> picks;
 
         Ogre::PanelOverlayElement* overlayElement_;

code/branches/HUD_HS16/src/modules/pickup/CMakeLists.txt

@@ -19 +19 @@
     PickupPrecompiledHeaders.h
   LINK_LIBRARIES
+    overlays
     orxonox
   SOURCE_FILES ${PICKUP_SRC_FILES}

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

@@ -83 +83 @@
     }
 
-    void PickupManager::setPickupSystem(HUDPickupSystem* system)
-    {
-        pickupSystem=system;
-    }
-
     /**
     @brief
@@ -271 +266 @@
         assert(pickup);
 
+        if(!pickupSystem)
+        {
+            for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
+                pickupSystem = hud;
+        }
+        assert(pickupSystem); //pickupSystem HAS to be there!
+
         if(!GameMode::isMaster()) // If this is neither standalone nor the server.
             return;
@@ -299 +301 @@
             this->pickups_[index] = pickup;
 
-            //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);
+            orxout() << "the pickup is: " << pickup << endl;
+
+            this->picks.push_back(pickup);
+
+            pickupSystem->updatePickupList(picks);
             
         }
@@ -320 +314 @@
             index = it->second;
 
-            
             this->indexes_.erase(pickup);
             this->pickups_.find(index)->second=nullptr; //set to null, so that can be identified as free slot by getPickupIndex()
+
+
+            this->picks.erase(std::remove(this->picks.begin(), this->picks.end(), pickup), this->picks.end()); //remove pickup from vector
+
+            pickupSystem->removePickup(pickup);
+            pickupSystem->updatePickupList(picks);
         }
 

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

@@ -42 +42 @@
 
 #include "PickupRepresentation.h"
-
+#include "interfaces/Pickupable.h"
 #include "util/Singleton.h"
 #include "interfaces/PickupListener.h"
@@ -153 +153 @@
         private:
             HUDPickupSystem* pickupSystem;
+            std::vector<Pickupable*> picks;
+
             static PickupManager* singletonPtr_s;
             static const std::string guiName_s; //!< The name of the PickupInventory