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

Timestamp:

Aug 13, 2011, 11:58:07 PM (13 years ago)

Author:

landauf

Message:

Exported orxout() and the output levels to lua, replaces logMessage() and cout().
Note that OutputDefinitions.h is now included in the tolua section of core, even though the file is in util. But I guess that's ok.

Location:

code/branches/output/src/libraries

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/LuaState.cc (modified) (2 diffs)
• core/LuaState.h (modified) (1 diff)
• core/command/Shell.cc (modified) (1 diff)
• util/output/OutputDefinitions.h (modified) (3 diffs)

code/branches/output/src/libraries/core/CMakeLists.txt

@@ -86 +86 @@
     input/KeyBinder.h
     input/KeyBinderManager.h
+    ../util/output/OutputDefinitions.h
   PCH_FILE
     CorePrecompiledHeaders.h

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

@@ -36 +36 @@
 }
 #include <loki/ScopeGuard.h>
-#include <boost/preprocessor/stringize.hpp>
 
 #include "util/Output.h"
@@ -237 +236 @@
     }
 
-    void LuaState::luaLog(unsigned int level, const std::string& message)
-    {
-#pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: use correct level, inspect lua support (and remove boost include)")
-        orxout(debug_output, context::lua) << "luaLog (level: " << level << "): " << message << endl;
+    void LuaState::luaOutput(OutputLevel level, const std::string& context, const std::string& message)
+    {
+        orxout(level, registerContext(context)) << message << endl;
+    }
+
+    void LuaState::luaOutput(OutputLevel level, const std::string& message)
+    {
+        orxout(level, context::lua) << message << endl;
+    }
+
+    void LuaState::luaOutput(const std::string& message)
+    {
+        orxout(debug_output, context::lua) << message << endl;
     }
 

code/branches/output/src/libraries/core/LuaState.h

@@ -83 +83 @@
 
         void luaPrint(const std::string& str); // tolua_export
-        void luaLog(unsigned int level, const std::string& message); // tolua_export
+        void luaOutput(orxonox::level::OutputLevel level, const std::string& context, const std::string& message); // tolua_export
+        void luaOutput(orxonox::level::OutputLevel level, const std::string& message); // tolua_export
+        void luaOutput(const std::string& message); // tolua_export
         bool fileExists(const std::string& filename); // tolua_export
         std::string getSourceCode(const std::string& filename); // tolua_export

code/branches/output/src/libraries/core/command/Shell.cc

@@ -33 +33 @@
 
 #include "Shell.h"
-
-#include <boost/preprocessor/stringize.hpp>
 
 #include "util/Math.h"

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

@@ -39 +39 @@
     const OutputContextContainer& subname() { static const OutputContextContainer& context = registerContext(#name, #subname); return context; }
 
+// tolua_begin
 namespace orxonox
 {
@@ -63 +64 @@
         };
     }
+// tolua_end
 
     using namespace level;
@@ -128 +130 @@
         }
     }
-}
+} // tolua_export
 
 #endif /* _OutputDefinitions_H__ */