Changeset 10077 for code/branches

Timestamp:

May 27, 2014, 9:54:25 AM (10 years ago)

Author:

smerkli

Message:

Removed some verbose output from default output and
re-added a file that was removed accidentally.

Location:

code/branches/presentationFS14

Files:

• data/levels/templates/spaceshipTurret.oxt (added)
• src/orxonox/controllers/ControllerDirector.cc (modified) (5 diffs)
• src/orxonox/controllers/ScriptController.cc (modified) (5 diffs)

code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc

@@ -27 +27 @@
 
         // output a message to ensure we know the constructor was run
-        orxout()<<"hello universe constructor blablub"<< endl;
+        orxout(verbose)<<"hello universe constructor blablub"<< endl;
 
 
@@ -42 +42 @@
         SUPER(ControllerDirector, XMLPort, xmlelement, mode);
 
-        orxout()<< "ControllerDirector::XMLPort " 
+        orxout(verbose)<< "ControllerDirector::XMLPort " 
           << "An instance of ControllerDirector has been created." << endl;
     }
@@ -63 +63 @@
     {
        /* Output a message confirming that the function was called */
-       orxout()<<"test takecontrol."<< endl;
+       orxout(verbose)<<"test takecontrol."<< endl;
 
        /* First, we set up a new controller to attach to the unit that
@@ -112 +112 @@
         this->player_ = NULL;
 
-        orxout() << "Preparation to take Control!" << endl; 
+        orxout(verbose) << "Preparation to take Control!" << endl; 
 
         // Check whether it is a player trigger and extract pawn from it
@@ -125 +125 @@
         else
         {
-            orxout() << "ControllerDirector::preparationToTakeControl " 
+            orxout(verbose) << "ControllerDirector::preparationToTakeControl " 
               << "Not a player trigger, can't extract pawn from it.." << endl;
             return false;

code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc

@@ -71 +71 @@
     {
         /* Output some debugging information */
-        orxout() << "ScriptController: Taking control" << endl;
-        orxout() << "This-pointer: " << this << endl;
+        orxout(verbose) << "ScriptController: Taking control" << endl;
+        orxout(verbose) << "This-pointer: " << this << endl;
 
         /* Set the controller ID (the argument here should be nonzero) */
@@ -100 +100 @@
     {
       /* Output a message that confirms this function was called */
-      orxout() << "Great success!" << std::endl;
+      orxout(verbose) << "Great success!" << std::endl;
 
       /* Debugging: print all the scriptcontroller object pointers */
@@ -106 +106 @@
         ObjectList<ScriptController>::begin(); 
         it != ObjectList<ScriptController>::end(); ++it)
-      { orxout() << "Have object in list: " << *it << endl; }
+      { orxout(verbose) << "Have object in list: " << *it << endl; }
 
       /* Find the first one with a nonzero ID */
@@ -115 +115 @@
         // TODO: do some selection here. Currently just returns the first one
         if( (*it)->getID() > 0 )
-        { orxout() << "Controller to return: " << *it << endl;
+        { orxout(verbose) << "Controller to return: " << *it << endl;
           return *it; 
         }
@@ -231 +231 @@
       tmp.eventTime = executionTime;
 
-      orxout() << tmp.fctName << endl;
+      orxout(verbose) << tmp.fctName << endl;
 
       /* Add the created event to the event list */
       if(eventList.size()==0)
       { /* The list is still empty, just add it */
-        orxout() << "eventList empty (01)" << endl;
+        orxout(verbose) << "eventList empty (01)" << endl;
         eventList.insert(eventList.begin(), tmp);
         this->eventno += 1;