Changeset 8811 for code/branches/output/src/modules/objects
- Timestamp:
- Aug 1, 2011, 7:09:29 PM (13 years ago)
- Location:
- code/branches/output/src/modules/objects
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/output/src/modules/objects/ForceField.cc
r8397 r8811 216 216 else 217 217 { 218 COUT(2) << "Wrong mode '" << mode << "' in ForceField. Setting to 'tube'." << std::endl;218 orxout(internal_warning) << "Wrong mode '" << mode << "' in ForceField. Setting to 'tube'." << endl; 219 219 this->mode_ = forceFieldMode::tube; 220 220 } -
code/branches/output/src/modules/objects/Planet.cc
r7401 r8811 73 73 { 74 74 float distance = this->getPosition().distance( activeCamera->getWorldPosition() ); 75 // COUT(2) << distance << std::endl;75 // orxout(internal_warning) << distance << endl; 76 76 float planetRadius = this->getScale(); 77 77 -
code/branches/output/src/modules/objects/Script.cc
r8706 r8811 137 137 return false; 138 138 139 COUT(4) << "Script (&" << this << ") triggered." << std::endl;139 orxout(internal_info) << "Script (&" << this << ") triggered." << endl; 140 140 141 141 PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger); … … 155 155 if(player == NULL) //TODO: Will this ever happen? If not, change in NotificationDispatcher as well. 156 156 { 157 COUT(4) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;157 orxout(internal_warning) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl; 158 158 return false; 159 159 } … … 272 272 else 273 273 { 274 COUT(2) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << std::endl;274 orxout(internal_warning) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << endl; 275 275 this->setMode(ScriptMode::normal); 276 276 this->modeStr_ = Script::NORMAL; … … 323 323 else 324 324 { 325 COUT(2) << "Invalid times '" << times << "' in Script. Setting to infinity." << std::endl;325 orxout(internal_warning) << "Invalid times '" << times << "' in Script. Setting to infinity." << endl; 326 326 this->times_ = Script::INF; 327 327 this->remainingExecutions_ = Script::INF; -
code/branches/output/src/modules/objects/SpaceBoundaries.cc
r8706 r8811 215 215 distance = this->computeDistance(currentPawn); 216 216 humanItem = this->isHumanPlayer(currentPawn); 217 COUT(5) << "Distance:" << distance << std::endl; // message for debugging217 // orxout() << "Distance:" << distance << endl; // message for debugging 218 218 if(distance > this->warnDistance_ && distance < this->maxDistance_) // Display warning 219 219 { … … 231 231 if( humanItem ) 232 232 { 233 COUT(5) << "Health should be decreasing!" << std::endl;233 // orxout() << "Health should be decreasing!" << endl; 234 234 this->displayWarning("You are out of the area now!"); 235 235 } -
code/branches/output/src/modules/objects/collisionshapes/BoxCollisionShape.cc
r8706 r8811 93 93 if(!this->hasUniformScaling()) 94 94 { 95 CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;95 orxout(internal_error) << "BoxCollisionShape: Non-uniform scaling is not yet supported." << endl; 96 96 return; 97 97 } -
code/branches/output/src/modules/objects/collisionshapes/ConeCollisionShape.cc
r8706 r8811 92 92 if(!this->hasUniformScaling()) 93 93 { 94 CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;94 orxout(internal_error) << "ConeCollisionShape: Non-uniform scaling is not yet supported." << endl; 95 95 return; 96 96 } -
code/branches/output/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
r8706 r8811 92 92 if(!this->hasUniformScaling()) 93 93 { 94 CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;94 orxout(internal_error) << "PlaneCollisionShape: Non-uniform scaling is not yet supported." << endl; 95 95 return; 96 96 } -
code/branches/output/src/modules/objects/collisionshapes/SphereCollisionShape.cc
r8706 r8811 89 89 if(!this->hasUniformScaling()) 90 90 { 91 CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;91 orxout(internal_error) << "SphereCollisionShape: Non-uniform scaling is not yet supported." << endl; 92 92 return; 93 93 } -
code/branches/output/src/modules/objects/eventsystem/EventFilter.cc
r8729 r8811 63 63 if (this->bActive_) 64 64 { 65 COUT(2) << "Warning: Detected Event loop in EventFilter \"" << this->getName() << '"' << std::endl;65 orxout(internal_warning, context::events) << "Detected Event loop in EventFilter \"" << this->getName() << '"' << endl; 66 66 return; 67 67 } -
code/branches/output/src/modules/objects/eventsystem/EventListener.cc
r8729 r8811 59 59 if (this->bActive_) 60 60 { 61 COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << '"' << std::endl;61 orxout(internal_warning, context::events) << "Detected Event loop in EventListener \"" << this->getName() << '"' << endl; 62 62 return; 63 63 } 64 64 65 COUT(4) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl;65 orxout(verbose, context::events) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << endl; 66 66 67 67 this->bActive_ = true; -
code/branches/output/src/modules/objects/eventsystem/EventTarget.cc
r6417 r8811 60 60 if (this->bActive_) 61 61 { 62 COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << '"' << std::endl;62 orxout(internal_warning, context::events) << "Detected Event loop in EventTarget \"" << this->getName() << '"' << endl; 63 63 return; 64 64 } -
code/branches/output/src/modules/objects/triggers/DistanceMultiTrigger.cc
r8706 r8811 247 247 this->setBeaconModeDirect(distanceMultiTriggerBeaconMode::exclude); 248 248 else 249 COUT(1) << "Invalid beacon mode in DistanceMultiTrigger." << endl;249 orxout(internal_error, context::triggers) << "Invalid beacon mode in DistanceMultiTrigger." << endl; 250 250 } 251 251 -
code/branches/output/src/modules/objects/triggers/DistanceTrigger.cc
r8706 r8811 108 108 if (targetId == NULL) 109 109 { 110 COUT(1) << "Error: \"" << targetStr << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << std::endl;110 orxout(internal_error, context::triggers) << "\"" << targetStr << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << endl; 111 111 return; 112 112 } … … 209 209 this->setTriggeringPawn(pawn); 210 210 else 211 CCOUT(2) << "Pawn was NULL." << endl;211 orxout(internal_warning, context::triggers) << "Pawn was NULL." << endl; 212 212 } 213 213 … … 270 270 this->setBeaconModeDirect(distanceTriggerBeaconMode::exclude); 271 271 else 272 COUT(1) << "Invalid beacon mode in DistanceTrigger." << endl;272 orxout(internal_error, context::triggers) << "Invalid beacon mode in DistanceTrigger." << endl; 273 273 } 274 274 -
code/branches/output/src/modules/objects/triggers/MultiTrigger.cc
r8706 r8811 72 72 MultiTrigger::~MultiTrigger() 73 73 { 74 COUT(4) << "Destroying MultiTrigger &" << this << ". " << this->stateQueue_.size() << " states still in queue. Deleting." << std::endl;74 orxout(verbose, context::triggers) << "Destroying MultiTrigger &" << this << ". " << this->stateQueue_.size() << " states still in queue. Deleting." << endl; 75 75 while(this->stateQueue_.size() > 0) 76 76 { … … 94 94 XMLPortParamLoadOnly(MultiTrigger, "target", addTarget, xmlelement, mode).defaultValues("Pawn"); //TODO: Remove load only 95 95 96 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << std::endl;96 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << endl; 97 97 } 98 98 … … 132 132 if(state == NULL) 133 133 { 134 COUT(1) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was NULL. State ignored." << std::endl;134 orxout(internal_error, context::triggers) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was NULL. State ignored." << endl; 135 135 queue->pop(); 136 136 continue; … … 241 241 // Print some debug output if the state has changed. 242 242 if(state->originator != NULL) 243 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: " << state->originator->getIdentifier()->getName() << " (&" << state->originator << "), active: " << bActive << ", triggered: " << state->bTriggered << "." << std::endl;243 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: " << state->originator->getIdentifier()->getName() << " (&" << state->originator << "), active: " << bActive << ", triggered: " << state->bTriggered << "." << endl; 244 244 else 245 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << std::endl;245 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << endl; 246 246 247 247 // If the MultiTrigger has a parent trigger, that is itself a MultiTrigger, it needs to call a method to notify him, that its activity has changed. … … 254 254 { 255 255 this->BaseObject::setActive(false); 256 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") ran out of activations. Setting it to inactive." << std::endl;256 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") ran out of activations. Setting it to inactive." << endl; 257 257 } 258 258 } … … 301 301 if (target == NULL) 302 302 { 303 COUT(1) << "Error: '" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;303 orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl; 304 304 return; 305 305 } … … 329 329 if (target == NULL) 330 330 { 331 COUT(1) << "Error: '" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;331 orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl; 332 332 return; 333 333 } … … 447 447 { 448 448 this->fireEvent(status); 449 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. status: " << status << "." << std::endl;449 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. status: " << status << "." << endl; 450 450 return; 451 451 } … … 453 453 MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator); 454 454 this->fireEvent(status, container); 455 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << std::endl;455 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl; 456 456 delete container; 457 457 } -
code/branches/output/src/modules/objects/triggers/TriggerBase.cc
r8706 r8811 128 128 this->setMode(TriggerMode::EventTriggerXOR); 129 129 else 130 COUT(2) << "Invalid mode '" << modeName << "' in TriggerBase " << this->getName() << " &(" << this << "). Leaving mode at '" << this->getModeString() << "'." << std::endl;130 orxout(internal_warning, context::triggers) << "Invalid mode '" << modeName << "' in TriggerBase " << this->getName() << " &(" << this << "). Leaving mode at '" << this->getModeString() << "'." << endl; 131 131 } 132 132
Note: See TracChangeset
for help on using the changeset viewer.