Changeset 8809 for code/branches/output/src/libraries

Timestamp:

Aug 1, 2011, 4:37:38 PM (13 years ago)

Author:

landauf

Message:

Replaced COUT() with orxout() in tools and orxonox library. Requires quite some fine-tuning.

Location:

code/branches/output/src/libraries

Files:

• tools/BillboardSet.cc (modified) (2 diffs)
• tools/Mesh.cc (modified) (1 diff)
• tools/ParticleInterface.cc (modified) (1 diff)
• tools/ResourceCollection.cc (modified) (1 diff)
• tools/ResourceLocation.cc (modified) (2 diffs)
• tools/Shader.cc (modified) (2 diffs)
• tools/Timer.h (modified) (1 diff)
• util/output/OutputDefinitions.h (modified) (1 diff)

code/branches/output/src/libraries/tools/BillboardSet.cc

@@ -80 +80 @@
         catch (...)
         {
-            COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
+            orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
             this->billboardSet_ = 0;
         }
@@ -103 +103 @@
         catch (...)
         {
-            COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
+            orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
             this->billboardSet_ = 0;
         }

code/branches/output/src/libraries/tools/Mesh.cc

@@ -72 +72 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load mesh \"" << meshsource << '"' << std::endl;
+                orxout(internal_error) << "Couldn't load mesh \"" << meshsource << '"' << endl;
                 this->entity_ = 0;
             }

code/branches/output/src/libraries/tools/ParticleInterface.cc

@@ -78 +78 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load particle system \"" << templateName << '"' << std::endl;
+                orxout(internal_error) << "Couldn't load particle system \"" << templateName << '"' << endl;
                 this->particleSystem_ = 0;
             }

code/branches/output/src/libraries/tools/ResourceCollection.cc

@@ -62 +62 @@
         if (resourceGroup.empty())
         {
-            COUT(2) << "Warning: \"\" is not a valid resource group." << std::endl;
+            orxout(internal_warning) << "\"\" is not a valid resource group." << endl;
             return;
         }

code/branches/output/src/libraries/tools/ResourceLocation.cc

@@ -80 +80 @@
         else
         {
-            COUT(2) << "Warning: ResourceLocation '" << this->getPath() << "' does not seem to exist" << std::endl;
+            orxout(internal_warning) << "ResourceLocation '" << this->getPath() << "' does not seem to exist" << endl;
             return;
         }
@@ -101 +101 @@
         catch (const Ogre::Exception& ex)
         {
-            COUT(1) << "Removing of a ResourceLocation failed: " << ex.what() << std::endl;
+            orxout(internal_error) << "Removing of a ResourceLocation failed: " << ex.what() << endl;
         }
     }

code/branches/output/src/libraries/tools/Shader.cc

@@ -141 +141 @@
                 }
                 else
-                    COUT(2) << "Warning: Couldn't load compositor with name \"" << this->compositorName_ << "\"." << std::endl;
+                    orxout(internal_warning) << "Couldn't load compositor with name \"" << this->compositorName_ << "\"." << endl;
             }
             this->oldcompositorName_ = this->compositorName_;
@@ -217 +217 @@
                 }
                 else
-                    COUT(2) << "Warning: No pass " << it->pass_ << " in technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or pass has no shader." << std::endl;
+                    orxout(internal_warning) << "No pass " << it->pass_ << " in technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or pass has no shader." << endl;
             }
             else
-                COUT(2) << "Warning: No technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or technique has no pass with shader." << std::endl;
+                orxout(internal_warning) << "No technique " << it->technique_ << " in compositor \"" << this->compositorName_ << "\" or technique has no pass with shader." << endl;
         }
         this->parameters_.clear();

code/branches/output/src/libraries/tools/Timer.h

@@ -66 +66 @@
     void MyClass::myFunction()
     {
-        COUT(0) << "Hello World" << std::endl;
+        orxout() << "Hello World" << endl;
     }
     @endcode

code/branches/output/src/libraries/util/output/OutputDefinitions.h

@@ -97 +97 @@
             REGISTER_OUTPUT_CONTEXT(packets);
             REGISTER_OUTPUT_CONTEXT(master_server);
+            REGISTER_OUTPUT_CONTEXT(sound);
+            REGISTER_OUTPUT_CONTEXT(lod);
+            REGISTER_OUTPUT_CONTEXT(pickups);
+            REGISTER_OUTPUT_CONTEXT(quests);
+            REGISTER_OUTPUT_CONTEXT(notifications);
+            REGISTER_OUTPUT_CONTEXT(trigger);
+            REGISTER_OUTPUT_CONTEXT(docking);
         }
     }