[Orxonox-commit 4134] r8805 - in code/branches/output/src: libraries/core libraries/core/command libraries/util/output orxonox/overlays
landauf at orxonox.net
landauf at orxonox.net
Sun Jul 31 11:45:56 CEST 2011
Author: landauf
Date: 2011-07-31 11:45:56 +0200 (Sun, 31 Jul 2011)
New Revision: 8805
Modified:
code/branches/output/src/libraries/core/GUIManager.cc
code/branches/output/src/libraries/core/GraphicsManager.cc
code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc
code/branches/output/src/libraries/core/command/IOConsoleWindows.cc
code/branches/output/src/libraries/core/command/Shell.h
code/branches/output/src/libraries/util/output/OutputDefinitions.h
code/branches/output/src/libraries/util/output/OutputManager.cc
code/branches/output/src/orxonox/overlays/InGameConsole.cc
Log:
added new output level "message" for output directed to the user
Modified: code/branches/output/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/output/src/libraries/core/GUIManager.cc 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/libraries/core/GUIManager.cc 2011-07-31 09:45:56 UTC (rev 8805)
@@ -92,14 +92,6 @@
namespace orxonox
{
- namespace context
- {
- namespace
- {
- REGISTER_OUTPUT_CONTEXT(cegui);
- }
- }
-
static void key_esc()
{ GUIManager::getInstance().keyESC(); }
SetConsoleCommand("keyESC", &key_esc);
Modified: code/branches/output/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/output/src/libraries/core/GraphicsManager.cc 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/libraries/core/GraphicsManager.cc 2011-07-31 09:45:56 UTC (rev 8805)
@@ -67,14 +67,6 @@
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";
static const std::string __CC_setFSAA_name = "setFSAA";
Modified: code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc
===================================================================
--- code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc 2011-07-31 09:45:56 UTC (rev 8805)
@@ -239,6 +239,7 @@
// Colour line
switch (type)
{
+ case Shell::Message:
case Shell::DebugOutput: this->cout_ << "\033[0m"; break;
case Shell::UserError: this->cout_ << "\033[91m"; break;
Modified: code/branches/output/src/libraries/core/command/IOConsoleWindows.cc
===================================================================
--- code/branches/output/src/libraries/core/command/IOConsoleWindows.cc 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/libraries/core/command/IOConsoleWindows.cc 2011-07-31 09:45:56 UTC (rev 8805)
@@ -200,6 +200,7 @@
WORD colour = 0;
switch (type)
{
+ case Shell::Message:
case Shell::DebugOutput: colour = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; break;
case Shell::UserError: colour = FOREGROUND_INTENSITY | FOREGROUND_RED | 0 | 0 ; break;
@@ -248,7 +249,7 @@
|| !GetConsoleMode(this->stdInHandle_, &this->originalTerminalSettings_)
|| !SetConsoleMode(this->stdInHandle_, 0))
{
- COUT(1) << "Error: Could not set Windows console settings" << std::endl;
+ orxout(user_error) << "Error: Could not set Windows console settings" << endl;
return;
}
FlushConsoleInputBuffer(this->stdInHandle_);
Modified: code/branches/output/src/libraries/core/command/Shell.h
===================================================================
--- code/branches/output/src/libraries/core/command/Shell.h 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/libraries/core/command/Shell.h 2011-07-31 09:45:56 UTC (rev 8805)
@@ -90,6 +90,7 @@
enum LineType
{
DebugOutput = debug_output,
+ Message = message,
UserError = user_error,
UserWarning = user_warning,
UserStatus = user_status,
Modified: code/branches/output/src/libraries/util/output/OutputDefinitions.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputDefinitions.h 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/libraries/util/output/OutputDefinitions.h 2011-07-31 09:45:56 UTC (rev 8805)
@@ -44,18 +44,19 @@
static const OutputLevel all = 0xFFFF;
static const OutputLevel none = 0x0000;
- static const OutputLevel debug_output = 0x0001;
- static const OutputLevel user_error = 0x0002;
- static const OutputLevel user_warning = 0x0004;
- static const OutputLevel user_status = 0x0008;
- static const OutputLevel user_info = 0x0010;
- static const OutputLevel internal_error = 0x0020;
- static const OutputLevel internal_warning = 0x0040;
- static const OutputLevel internal_status = 0x0080;
- static const OutputLevel internal_info = 0x0100;
- static const OutputLevel verbose = 0x0200;
- static const OutputLevel verbose_more = 0x0400;
- static const OutputLevel verbose_ultra = 0x0800;
+ static const OutputLevel message = 0x0001;
+ static const OutputLevel debug_output = 0x0002;
+ static const OutputLevel user_error = 0x0004;
+ static const OutputLevel user_warning = 0x0008;
+ static const OutputLevel user_status = 0x0010;
+ static const OutputLevel user_info = 0x0020;
+ static const OutputLevel internal_error = 0x0040;
+ static const OutputLevel internal_warning = 0x0080;
+ static const OutputLevel internal_status = 0x0100;
+ static const OutputLevel internal_info = 0x0200;
+ static const OutputLevel verbose = 0x0400;
+ static const OutputLevel verbose_more = 0x0800;
+ static const OutputLevel verbose_ultra = 0x1000;
}
typedef uint64_t OutputContext;
@@ -72,11 +73,20 @@
{
REGISTER_OUTPUT_CONTEXT(undefined);
- REGISTER_OUTPUT_CONTEXT(test1);
- REGISTER_OUTPUT_CONTEXT(test2);
- REGISTER_OUTPUT_CONTEXT(output);
+ REGISTER_OUTPUT_CONTEXT(ogre);
+ REGISTER_OUTPUT_CONTEXT(cegui);
REGISTER_OUTPUT_CONTEXT(lua);
REGISTER_OUTPUT_CONTEXT(tcl);
+ REGISTER_OUTPUT_CONTEXT(identifier);
+ REGISTER_OUTPUT_CONTEXT(object_list);
+ REGISTER_OUTPUT_CONTEXT(super);
+ REGISTER_OUTPUT_CONTEXT(language);
+ REGISTER_OUTPUT_CONTEXT(output);
+ REGISTER_OUTPUT_CONTEXT(commands);
+ REGISTER_OUTPUT_CONTEXT(executor);
+ REGISTER_OUTPUT_CONTEXT(input);
+ REGISTER_OUTPUT_CONTEXT(events);
+ REGISTER_OUTPUT_CONTEXT(config);
}
}
}
Modified: code/branches/output/src/libraries/util/output/OutputManager.cc
===================================================================
--- code/branches/output/src/libraries/util/output/OutputManager.cc 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/libraries/util/output/OutputManager.cc 2011-07-31 09:45:56 UTC (rev 8805)
@@ -135,6 +135,7 @@
switch (level)
{
case level::none: { static std::string name = "None"; return name; }
+ case level::message: { static std::string name = "Message"; return name; }
case level::debug_output: { static std::string name = "Debug"; return name; }
case level::user_error: { static std::string name = "Error"; return name; }
case level::user_warning: { static std::string name = "Warning"; return name; }
Modified: code/branches/output/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/output/src/orxonox/overlays/InGameConsole.cc 2011-07-30 21:06:36 UTC (rev 8804)
+++ code/branches/output/src/orxonox/overlays/InGameConsole.cc 2011-07-31 09:45:56 UTC (rev 8805)
@@ -558,6 +558,7 @@
ColourValue colourTop, colourBottom;
switch (type)
{
+ case Shell::Message:
case Shell::DebugOutput: colourTop = ColourValue(0.9f, 0.9f, 0.9f); break;
case Shell::UserError: colourTop = ColourValue(0.9f, 0.0f, 0.0f); break;
More information about the Orxonox-commit
mailing list