Changeset 11540 for code/branches/HUD_HS16/src

Timestamp:

Nov 6, 2017, 4:05:15 PM (7 years ago)

Author:

patricwi

Message:

sync function added without success, order of pickups in HUD is mixed up

Location:

code/branches/HUD_HS16/src/modules

Files:

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

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

@@ -50 +50 @@
 
         std::string name = "HUDPickupItem" + getUniqueNumberString();
-
+        orxout() << "name: "<< name<<endl;
         overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", name ));
 
@@ -78 +78 @@
         assert(overlayElement_);
         assert(this->background_);
-        overlayElement_->hide();
-        //this->background_->removeChild(overlayElement_->getName());
+        orxout()<< overlayElement_->getName()<< endl;
+        //overlayElement_->hide();
+        this->background_->removeChild(overlayElement_->getName());
+        
     }
 }

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

@@ -68 +68 @@
     }
     
+    void HUDPickupSystem::sync(std::vector<Pickupable*> p)
+    {
+        //hide all pickup symbols in HUD and delete from local map
+
+        for(const auto& sm_pair : picks)
+        {
+            sm_pair.second->hideMe(sm_pair.first, repaint);
+            picks.erase(sm_pair.first);
+        }
+
+        //add to local map and place on screen
+        int i = 0;
+        const float offsetX = 0.345f;
+        float offsetY = 0.82f;
+        const float x = 0.102f;
+        for(Pickupable* pickup:p)
+        {
+            //second row has offset
+            if(i==4)
+            {    
+                i=0;
+                offsetY+=0.075f;
+            }
+
+            HUDPickupItem* item = new HUDPickupItem(this->getContext());
+            item->initializeMaterial(this->getIcon(((Pickup*)pickup)->getRepresentationName()), offsetX+i*x, offsetY);
+            orxout() << "created new pickupHUDItem"<<endl;
+            item->setOverlayGroup(this->getOverlayGroup());
+            picks[pickup] = item;
+            i++;
+        }
+
+    }
 
     void HUDPickupSystem::updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_)
@@ -92 +125 @@
                     HUDPickupItem* item = new HUDPickupItem(this->getContext());
                     item->initializeMaterial(this->getIcon(((Pickup*)p)->getRepresentationName()), offsetX+i*x, offsetY);
-                
+                    orxout() << "created new pickupHUDItem"<<endl;
                     item->setOverlayGroup(this->getOverlayGroup());
                     this->picks[p] = item;
@@ -110 +143 @@
         HUDPickupItem* item = this->picks.find(pickup)->second;
         orxout() << "removePickup: pickup= " << pickup << " item= " << item << endl;
+        this->picks.erase(pickup);
         //assert(item);
         item->hideMe(pickup, repaint);
@@ -115 +149 @@
         //assert(overlayElement_);
         //assert(this->background_);
-        //this->picks.erase(pickup);
         orxout()<< "end removePickup method" << endl;
     }

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

@@ -57 +57 @@
 
         void sizeChanged();
+        void sync(std::vector<Pickupable*> p);
         void updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_);  
         void createPickupList();  

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

@@ -265 +265 @@
         assert(pickup);
 
+        orxout() << "just got called"<<endl;
         for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
             pickupSystem = hud;
@@ -299 +300 @@
 
             if(pickupSystem)
-                pickupSystem->updatePickupList(picks, indexes_);
+                pickupSystem->sync(picks);
             
         }
@@ -315 +316 @@
 
             if(pickupSystem)
-                pickupSystem->removePickup(pickup);
+                pickupSystem->sync(picks);
             orxout() << "end of pickupChangedPickedUp" << endl;
         }