Changeset 11700

Timestamp:

Jan 6, 2018, 12:15:25 AM (6 years ago)

Author:

landauf

Message:

merged the remaining commits of HUD_HS16 branch back to trunk (except commit r11392 which added DDDialogue that seems to be just a test)

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDPickupItem.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDPickupSystem.cc (modified) (2 diffs)
• src/modules/overlays/hud/HUDPickupSystem.h (modified) (1 diff)
• src/modules/pickup/PickupManager.cc (modified) (4 diffs)
• src/orxonox/interfaces/Pickupable.cc (modified) (2 diffs)

code/trunk/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 ));
 
@@ -59 +59 @@
     HUDPickupItem::~HUDPickupItem()
     {
-        if (this->isInitialized())
+        /*if (this->isInitialized())
         {
             overlayElement_=nullptr;
-        }
+        }*/
     }
 
@@ -78 +78 @@
         assert(overlayElement_);
         assert(this->background_);
-        overlayElement_->hide();
+        orxout()<< overlayElement_->getName()<< endl;
+        //overlayElement_->hide();
         this->background_->removeChild(overlayElement_->getName());
+        
     }
 }

code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc

@@ -56 +56 @@
     HUDPickupSystem::~HUDPickupSystem()
     {
-        if (this->isInitialized())
+        /*if (this->isInitialized())
         {
             this->picks.clear();
-        }
+        }*/
     }
 
@@ -68 +68 @@
     }
     
+    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;
 
-    void HUDPickupSystem::updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_)
-    {
-        int i =0;
+        for(const auto& sm_pair : picks)
+        {
+            sm_pair.second->hideMe(sm_pair.first, repaint);
+            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
+        int i = 0;
         const float offsetX = 0.345f;
         float offsetY = 0.82f;
         const float x = 0.102f;
+        orxout() << "picks size after: " << picks.size() << endl;
+        orxout() << "p size after: " << p.size() << endl;
 
-        if(picks.size()>0)
+        for(Pickupable* pickup:p)
         {
-            for(Pickupable* p : picks)
-            {
-                i = indexes_.find(p)->second;
-                offsetY = 0.82f;
+            i=indexes_.find(pickup)->second;
+            //second row has offset
+            if(i==5)
+            {    
+                i=0;
+                offsetY+=0.075f;
+            }
 
-                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);
-                
-                    item->setOverlayGroup(this->getOverlayGroup());
-                    this->picks[p] = item;
-                }
-            }
+            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;
         }
     }
 
-    void HUDPickupSystem::createPickupList()
-    {
-    }      
-
-    void HUDPickupSystem::removePickup(Pickupable* pickup)
-    {
-        assert(pickup);
-        HUDPickupItem* item = this->picks.find(pickup)->second;
-        orxout(internal_info, context::pickups) << "removePickup: pickup= " << pickup << " item= " << item << endl;
-        assert(item);
-        item->hideMe(pickup, repaint);
-        assert(overlayElement_);
-        assert(this->background_);
-        this->picks.erase(pickup);
-    }
-
+    
     void HUDPickupSystem::destroyAll()
     {

code/trunk/src/modules/overlays/hud/HUDPickupSystem.h

@@ -57 +57 @@
 
         void sizeChanged();
-        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/trunk/src/modules/pickup/PickupManager.cc

@@ -103 +103 @@
         // Destroying all the WeakPointers that are still there.
         this->pickups_.clear();
-
         this->indexes_.clear();
 
-        orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl;
+        orxout() << "PickupManager destroyed." << endl;
     }
 
@@ -266 +265 @@
         assert(pickup);
 
+        orxout() << "just got called"<<endl;
         for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
             pickupSystem = hud;
@@ -300 +300 @@
 
             if(pickupSystem)
-                pickupSystem->updatePickupList(picks, indexes_);
+                pickupSystem->sync(picks, indexes_);
             
         }
@@ -316 +316 @@
 
             if(pickupSystem)
-                pickupSystem->removePickup(pickup);
+                pickupSystem->sync(picks, indexes_);
+            orxout() << "end of pickupChangedPickedUp" << endl;
         }
 

code/trunk/src/orxonox/interfaces/Pickupable.cc

@@ -80 +80 @@
         if(this->isPickedUp())
             this->drop(false); // Drops the pickup without creating a PickupSpawner.
+        orxout()<< "end of preDestroy" << endl;
     }
 
@@ -98 +99 @@
     void Pickupable::destroyPickup(void)
     {
+        orxout()<< "beginning of actual destroy" << endl;
         if(!this->isBeingDestroyed())
             this->Destroyable::destroy();
         else
             orxout(internal_warning, context::pickups) << this->getIdentifier()->getName() << " may be unsafe. " << endl;
+        orxout()<<"end of actual destroy" << endl;
     }