Changeset 11701
- Timestamp:
- Jan 6, 2018, 12:24:02 AM (7 years ago)
- Location:
- code/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/overlays/hud/HUDPickupItem.cc
r11700 r11701 50 50 51 51 std::string name = "HUDPickupItem" + getUniqueNumberString(); 52 orxout() << "name: "<< name<<endl;53 52 overlayElement_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", name )); 54 53 … … 59 58 HUDPickupItem::~HUDPickupItem() 60 59 { 61 /*if (this->isInitialized())62 {63 overlayElement_=nullptr;64 }*/65 60 } 66 61 … … 78 73 assert(overlayElement_); 79 74 assert(this->background_); 80 orxout()<< overlayElement_->getName()<< endl;81 75 //overlayElement_->hide(); 82 76 this->background_->removeChild(overlayElement_->getName()); 83 84 77 } 85 78 } -
code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc
r11700 r11701 56 56 HUDPickupSystem::~HUDPickupSystem() 57 57 { 58 /*if (this->isInitialized())59 {60 this->picks.clear();61 }*/62 58 } 63 59 … … 72 68 //hide all pickup symbols in HUD and delete from local map 73 69 74 orxout() << "picks size before: " << picks.size() << endl;75 orxout() << "p size before: " << p.size() << endl;76 77 70 for(const auto& sm_pair : picks) 78 71 { 79 72 sm_pair.second->hideMe(sm_pair.first, repaint); 80 orxout() << "deleting local list picks: " << picks.size() << " pickup ptr" << sm_pair.first << endl;81 73 } 82 74 … … 89 81 float offsetY = 0.82f; 90 82 const float x = 0.102f; 91 orxout() << "picks size after: " << picks.size() << endl;92 orxout() << "p size after: " << p.size() << endl;93 83 94 84 for(Pickupable* pickup:p) … … 104 94 HUDPickupItem* item = new HUDPickupItem(this->getContext()); 105 95 item->initializeMaterial(this->getIcon(((Pickup*)pickup)->getRepresentationName()), offsetX+i*x, offsetY); 106 orxout() << "created new pickupHUDItem"<<endl;107 96 item->setOverlayGroup(this->getOverlayGroup()); 108 97 picks[pickup] = item; -
code/trunk/src/modules/pickup/PickupManager.cc
r11700 r11701 105 105 this->indexes_.clear(); 106 106 107 orxout( ) << "PickupManager destroyed." << endl;107 orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl; 108 108 } 109 109 … … 265 265 assert(pickup); 266 266 267 orxout() << "just got called"<<endl;268 267 for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>()) 269 268 pickupSystem = hud; … … 317 316 if(pickupSystem) 318 317 pickupSystem->sync(picks, indexes_); 319 orxout() << "end of pickupChangedPickedUp" << endl;320 318 } 321 319 -
code/trunk/src/orxonox/interfaces/Pickupable.cc
r11700 r11701 80 80 if(this->isPickedUp()) 81 81 this->drop(false); // Drops the pickup without creating a PickupSpawner. 82 orxout()<< "end of preDestroy" << endl;83 82 } 84 83 … … 99 98 void Pickupable::destroyPickup(void) 100 99 { 101 orxout()<< "beginning of actual destroy" << endl;102 100 if(!this->isBeingDestroyed()) 103 101 this->Destroyable::destroy(); 104 102 else 105 103 orxout(internal_warning, context::pickups) << this->getIdentifier()->getName() << " may be unsafe. " << endl; 106 orxout()<<"end of actual destroy" << endl;107 104 } 108 105
Note: See TracChangeset
for help on using the changeset viewer.