Changeset 11558 for code

Timestamp:

Nov 13, 2017, 4:14:47 PM (7 years ago)

Author:

patricwi

Message:

no more segfaults but still not exiting properly - maybe never ending loop?

Location:

code/branches/HUD_HS16/src/modules

Files:

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

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

@@ -68 +68 @@
     }
     
-    void HUDPickupSystem::sync(std::vector<Pickupable*> p)
+    void HUDPickupSystem::sync(std::vector<Pickupable*> p, std::map<Pickupable*, uint32_t> indexes_)
     {
         //hide all pickup symbols in HUD and delete from local map
+        
+        orxout() << "picks size before: " << picks.size() << endl;
+        orxout() << "p size before: " << p.size() << endl;
 
         for(const auto& sm_pair : picks)
         {
             sm_pair.second->hideMe(sm_pair.first, repaint);
-            picks.erase(sm_pair.first);
+            orxout() << "deleting local list picks: " << picks.size() << " pickup ptr" << sm_pair.first << endl;
         }
+
+        picks.clear();
+        assert(picks.empty()); //picks must be empty now
 
         //add to local map and place on screen
@@ -83 +89 @@
         float offsetY = 0.82f;
         const float x = 0.102f;
+        orxout() << "picks size after: " << picks.size() << endl;
+        orxout() << "p size after: " << p.size() << endl;
+
         for(Pickupable* pickup:p)
         {
+            i=indexes_.find(pickup)->second;
             //second row has offset
-            if(i==4)
+            if(i==5)
             {    
                 i=0;
@@ -97 +107 @@
             item->setOverlayGroup(this->getOverlayGroup());
             picks[pickup] = item;
-            i++;
-        }
-
-    }
-
-    void HUDPickupSystem::updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_)
-    {
-        int i =0;
-        const float offsetX = 0.345f;
-        float offsetY = 0.82f;
-        const float x = 0.102f;
-
-        if(picks.size()>0)
-        {
-            for(Pickupable* p : picks)
-            {
-                i = indexes_.find(p)->second;
-                offsetY = 0.82f;
-
-                if(i>=5)
-                {
-                    offsetY+=0.075f;
-                    i-=5;
-                }   
-                if(this->picks.count(p)==0)
-                {
-                    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;
-                }
-            }
         }
     }
 
-    void HUDPickupSystem::createPickupList()
-    {
-    }      
-
-    void HUDPickupSystem::removePickup(Pickupable* pickup)
-    {
-        assert(pickup);
-        orxout()<< "removePickup called with " << pickup << endl;
-        HUDPickupItem* item = this->picks.find(pickup)->second;
-        orxout() << "removePickup: pickup= " << pickup << " item= " << item << endl;
-        this->picks.erase(pickup);
-        //assert(item);
-        item->hideMe(pickup, repaint);
-        orxout() << "i am hidden now" << endl;
-        //assert(overlayElement_);
-        //assert(this->background_);
-        orxout()<< "end removePickup method" << endl;
-    }
-
+    
     void HUDPickupSystem::destroyAll()
     {

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();  
-        void removePickup(Pickupable* pickup);
+        void sync(std::vector<Pickupable*> p, std::map<Pickupable*, uint32_t> indexes_);
 
         bool repaint=true; //if we shouldnt repaint, set this to false

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

@@ -300 +300 @@
 
             if(pickupSystem)
-                pickupSystem->sync(picks);
+                pickupSystem->sync(picks, indexes_);
             
         }
@@ -316 +316 @@
 
             if(pickupSystem)
-                pickupSystem->sync(picks);
+                pickupSystem->sync(picks, indexes_);
             orxout() << "end of pickupChangedPickedUp" << endl;
         }