Changeset 8522

Timestamp:

May 20, 2011, 4:05:32 PM (13 years ago)

Author:

rgrieder

Message:

Added new output macro: DOUT. Use this instead of COUT(0) to produce temporary debug output.
If available, such output will be shown in vivid colours and with a "+++ " prefix.

Any occurrence of this macro in the trunk will be dealt with swiftly and painlessly (it's very easy to search for it).

Location:

code/branches/unity_build/src

Files:

• libraries/core/command/IOConsoleWindows.cc (modified) (1 diff)
• libraries/core/command/Shell.h (modified) (1 diff)
• libraries/util/Debug.h (modified) (1 diff)
• libraries/util/OutputHandler.h (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (1 diff)

code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.cc

@@ -208 +208 @@
         case Shell::Command: colour =                        FOREGROUND_GREEN                  | FOREGROUND_BLUE; break;
         case Shell::Hint:    colour =                        FOREGROUND_GREEN | FOREGROUND_RED                  ; break;
+        case Shell::TDebug:  colour = FOREGROUND_INTENSITY                    | FOREGROUND_RED | FOREGROUND_BLUE; break;
         default:             colour =                        FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE; break;
         }

code/branches/unity_build/src/libraries/core/command/Shell.h

@@ -91 +91 @@
             enum LineType
             {
+                TDebug  = OutputLevel::TDebug,
                 None    = OutputLevel::None,
                 Warning = OutputLevel::Warning,

code/branches/unity_build/src/libraries/util/Debug.h

@@ -123 +123 @@
             orxonox::OutputHandler::getOutStream(level)
 
+/** Logs debug output: You can use DOUT exactly like @c std::cout.
+    Use this macro to produce temporary debug output that will be removed later on.
+    The console output shall have a special colour if available.
+*/
+#define DOUT orxonox::OutputHandler::getOutStream(-1) << "+++ "
+
 #endif /* _Util_Debug_H__ */

code/branches/unity_build/src/libraries/util/OutputHandler.h

@@ -62 +62 @@
         enum Value
         {
+            TDebug  = -1,
             None    = 0,
             Error   = 1,

code/branches/unity_build/src/orxonox/overlays/InGameConsole.cc

@@ -590 +590 @@
                           colourBottom = ColourValue(0.90f, 0.90f, 0.90f, 1.00f); break;
 
+        case Shell::TDebug:  colourTop = ColourValue(0.90f, 0.00f, 0.90f, 1.00f);
+                          colourBottom = ColourValue(1.00f, 0.00f, 1.00f, 1.00f); break;
+
         default:             colourTop = ColourValue(0.90f, 0.90f, 0.90f, 1.00f);
                           colourBottom = ColourValue(1.00f, 1.00f, 1.00f, 1.00f); break;