[Orxonox-commit 7084] r11701 - in code/trunk/src: modules/overlays/hud modules/pickup orxonox/interfaces

[landauf at orxonox.net]

Author: landauf
Date: 2018-01-06 00:24:02 +0100 (Sat, 06 Jan 2018)
New Revision: 11701

Modified:
   code/trunk/src/modules/overlays/hud/HUDPickupItem.cc
   code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc
   code/trunk/src/modules/pickup/PickupManager.cc
   code/trunk/src/orxonox/interfaces/Pickupable.cc
Log:
[HUD_HS16] removed debug output

Modified: code/trunk/src/modules/overlays/hud/HUDPickupItem.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/HUDPickupItem.cc	2018-01-05 23:15:25 UTC (rev 11700)
+++ code/trunk/src/modules/overlays/hud/HUDPickupItem.cc	2018-01-05 23:24:02 UTC (rev 11701)
@@ -49,7 +49,6 @@
         RegisterObject(HUDPickupItem);
 
         std::string name = "HUDPickupItem" + getUniqueNumberString();
-        orxout() << "name: "<< name<<endl;
         overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", name ));
 
         overlayElement_->setDimensions(0.075f,0.08f);
@@ -58,10 +57,6 @@
 
     HUDPickupItem::~HUDPickupItem()
     {
-        /*if (this->isInitialized())
-        {
-            overlayElement_=nullptr;
-        }*/
     }
 
     void HUDPickupItem::initializeMaterial(const std::string& s, float x, float y)
@@ -77,9 +72,7 @@
         if(!repaint) return;                     //dont do anything, if we are not allowed to repaint because the level is terminating
         assert(overlayElement_);
         assert(this->background_);
-        orxout()<< overlayElement_->getName()<< endl;
         //overlayElement_->hide();
         this->background_->removeChild(overlayElement_->getName());
-        
     }
 }

Modified: code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc	2018-01-05 23:15:25 UTC (rev 11700)
+++ code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc	2018-01-05 23:24:02 UTC (rev 11701)
@@ -55,10 +55,6 @@
 
     HUDPickupSystem::~HUDPickupSystem()
     {
-        /*if (this->isInitialized())
-        {
-            this->picks.clear();
-        }*/
     }
 
     void HUDPickupSystem::sizeChanged()
@@ -71,13 +67,9 @@
     {
         //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);
-            orxout() << "deleting local list picks: " << picks.size() << " pickup ptr" << sm_pair.first << endl;
         }
 
         picks.clear();
@@ -88,8 +80,6 @@
         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;
 
         for(Pickupable* pickup:p)
         {
@@ -103,7 +93,6 @@
 
             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;
         }

Modified: code/trunk/src/modules/pickup/PickupManager.cc
===================================================================
--- code/trunk/src/modules/pickup/PickupManager.cc	2018-01-05 23:15:25 UTC (rev 11700)
+++ code/trunk/src/modules/pickup/PickupManager.cc	2018-01-05 23:24:02 UTC (rev 11701)
@@ -104,7 +104,7 @@
         this->pickups_.clear();
         this->indexes_.clear();
 
-        orxout() << "PickupManager destroyed." << endl;
+        orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl;
     }
 
     /**
@@ -264,7 +264,6 @@
     {
         assert(pickup);
 
-        orxout() << "just got called"<<endl;
         for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
             pickupSystem = hud;
         
@@ -316,7 +315,6 @@
 
             if(pickupSystem)
                 pickupSystem->sync(picks, indexes_);
-            orxout() << "end of pickupChangedPickedUp" << endl;
         }
 
         // If we're either in standalone mode or this is the host whom the change of the pickup's status concerns.

Modified: code/trunk/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/trunk/src/orxonox/interfaces/Pickupable.cc	2018-01-05 23:15:25 UTC (rev 11700)
+++ code/trunk/src/orxonox/interfaces/Pickupable.cc	2018-01-05 23:24:02 UTC (rev 11701)
@@ -79,7 +79,6 @@
 
         if(this->isPickedUp())
             this->drop(false); // Drops the pickup without creating a PickupSpawner.
-        orxout()<< "end of preDestroy" << endl;
     }
 
     /**
@@ -98,12 +97,10 @@
     */
     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;
     }
 
     /**