Changeset 8798 for code/branches/output/src/libraries/core/GraphicsManager.cc

Timestamp:

Jul 30, 2011, 3:55:35 PM (13 years ago)

Author:

landauf

Message:

adjusted output levels for ogre and cegui messages
added config value for cegui logfile

File:

• code/branches/output/src/libraries/core/GraphicsManager.cc (modified) (5 diffs)

code/branches/output/src/libraries/core/GraphicsManager.cc

@@ -35 +35 @@
 #include <boost/filesystem.hpp>
 #include <boost/shared_array.hpp>
-#include <boost/preprocessor/stringize.hpp>
 
 #include <OgreFrameListener.h>
@@ -69 +68 @@
 namespace orxonox
 {
+    namespace context
+    {
+        namespace
+        {
+            REGISTER_OUTPUT_CONTEXT(ogre);
+        }
+    }
+
     static const std::string __CC_GraphicsManager_group = "GraphicsManager";
     static const std::string __CC_setScreenResolution_name = "setScreenResolution";
@@ -159 +166 @@
         SetConfigValue(ogreLogFile_,     "ogre.log")
             .description("Logfile for messages from Ogre. Use \"\" to suppress log file creation.");
-        SetConfigValue(ogreLogLevelTrivial_ , 5)
-            .description("Corresponding orxonox debug level for ogre Trivial");
-        SetConfigValue(ogreLogLevelNormal_  , 4)
-            .description("Corresponding orxonox debug level for ogre Normal");
-        SetConfigValue(ogreLogLevelCritical_, 2)
-            .description("Corresponding orxonox debug level for ogre Critical");
     }
 
@@ -410 +411 @@
             {
             case Ogre::LML_TRIVIAL:
-                orxonoxLevel = this->ogreLogLevelTrivial_;
+                orxonoxLevel = level::verbose_more;
                 break;
             case Ogre::LML_NORMAL:
-                orxonoxLevel = this->ogreLogLevelNormal_;
+                orxonoxLevel = level::verbose;
                 break;
             case Ogre::LML_CRITICAL:
-                orxonoxLevel = this->ogreLogLevelCritical_;
+                orxonoxLevel = level::internal_warning;
                 break;
             default:
@@ -423 +424 @@
             introduction = "Ogre: ";
         }
-#pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: use correct level, also for config values (and remove boost include)")
-        orxout(debug_output, context::ogre) << "ogre (level: " << lml << "): " << introduction << message << endl;
+
+        orxout(orxonoxLevel, context::ogre) << introduction << message << endl;
     }