Changeset 11701 for code/trunk

Timestamp:

Jan 6, 2018, 12:24:02 AM (7 years ago)

Author:

landauf

Message:

[HUD_HS16] removed debug output

Location:

code/trunk/src

Files:

• modules/overlays/hud/HUDPickupItem.cc (modified) (3 diffs)
• modules/overlays/hud/HUDPickupSystem.cc (modified) (4 diffs)
• modules/pickup/PickupManager.cc (modified) (3 diffs)
• 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 +58 @@
     HUDPickupItem::~HUDPickupItem()
     {
-        /*if (this->isInitialized())
-        {
-            overlayElement_=nullptr;
-        }*/
     }
 
@@ -78 +73 @@
         assert(overlayElement_);
         assert(this->background_);
-        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())
-        {
-            this->picks.clear();
-        }*/
     }
 
@@ -72 +68 @@
         //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;
         }
 
@@ -89 +81 @@
         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)
@@ -104 +94 @@
             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;

code/trunk/src/modules/pickup/PickupManager.cc

@@ -105 +105 @@
         this->indexes_.clear();
 
-        orxout() << "PickupManager destroyed." << endl;
+        orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl;
     }
 
@@ -265 +265 @@
         assert(pickup);
 
-        orxout() << "just got called"<<endl;
         for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
             pickupSystem = hud;
@@ -317 +316 @@
             if(pickupSystem)
                 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;
     }
 
@@ -99 +98 @@
     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;
     }