Changeset 1586 for code/branches/core3

Timestamp:

Jun 10, 2008, 3:35:50 PM (16 years ago)

Author:

landauf

Message:

moved Debug.h, OutputHandler and OutputBuffer to util, to make COUT(x) available everywhere

Location:

code/branches/core3/src

Files:

• asylum/audio/_AudioObject.cc (modified) (1 diff)
• asylum/loader/LevelLoader.cc (modified) (1 diff)
• asylum/orxonox/SpaceshipSteering.cc (modified) (1 diff)
• asylum/util/String2Number.h (modified) (1 diff)
• audio/AudioManager.cc (modified) (1 diff)
• audio/AudioStream.cc (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• core/ClassFactory.h (modified) (1 diff)
• core/CommandEvaluation.cc (modified) (1 diff)
• core/CommandExecutor.cc (modified) (1 diff)
• core/ConsoleCommandCompilation.cc (modified) (1 diff)
• core/Core.cc (modified) (3 diffs)
• core/Core.h (modified) (1 diff)
• core/CoreIncludes.h (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/Error.cc (modified) (1 diff)
• core/Executor.h (modified) (1 diff)
• core/Factory.cc (modified) (1 diff)
• core/Functor.h (modified) (1 diff)
• core/Identifier.h (modified) (1 diff)
• core/Language.cc (modified) (1 diff)
• core/Loader.cc (modified) (1 diff)
• core/MetaObjectList.cc (modified) (1 diff)
• core/NamespaceNode.cc (modified) (1 diff)
• core/Shell.cc (modified) (2 diffs)
• core/Shell.h (modified) (1 diff)
• core/SignalHandler.cc (modified) (1 diff)
• core/TclBind.cc (modified) (1 diff)
• core/TclThreadManager.cc (modified) (1 diff)
• core/XMLPort.h (modified) (1 diff)
• core/input/Button.cc (modified) (1 diff)
• core/input/InputManager.cc (modified) (1 diff)
• core/input/KeyBinder.cc (modified) (1 diff)
• core/input/KeyDetector.cc (modified) (1 diff)
• network/ClientConnection.cc (modified) (2 diffs)
• network/PacketDecoder.cc (modified) (1 diff)
• orxonox/GraphicsEngine.cc (modified) (1 diff)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
• orxonox/console/InGameConsole.cc (modified) (2 diffs)
• orxonox/hud/HUD.cc (modified) (1 diff)
• orxonox/hud/Navigation.cc (modified) (1 diff)
• orxonox/objects/Ambient.cc (modified) (3 diffs)
• orxonox/objects/Camera.cc (modified) (1 diff)
• orxonox/objects/Skybox.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)
• util/Convert.h (modified) (3 diffs)
• util/Debug.h (moved) (moved from code/branches/core3/src/core/Debug.h) (2 diffs)
• util/OutputBuffer.cc (moved) (moved from code/branches/core3/src/core/OutputBuffer.cc)
• util/OutputBuffer.h (moved) (moved from code/branches/core3/src/core/OutputBuffer.h) (4 diffs)
• util/OutputHandler.cc (moved) (moved from code/branches/core3/src/core/OutputHandler.cc) (8 diffs)
• util/OutputHandler.h (moved) (moved from code/branches/core3/src/core/OutputHandler.h) (7 diffs)
• util/String.h (modified) (2 diffs)
• util/UtilPrereqs.h (modified) (1 diff)

code/branches/core3/src/asylum/audio/_AudioObject.cc

@@ -30 +30 @@
 #include <string>
 
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "AudioObject.h"
 

code/branches/core3/src/asylum/loader/LevelLoader.cc

@@ -31 +31 @@
 #include <OgreOverlayManager.h>
 
+#include "core/BaseObject.h"
 #include "core/Error.h"
-#include "core/Debug.h"
 #include "core/CoreIncludes.h"
 
 #include "audio/AudioManager.h"
-#include "core/BaseObject.h"
 #include "orxonox/Orxonox.h"
 

code/branches/core3/src/asylum/orxonox/SpaceshipSteering.cc

@@ -31 +31 @@
 #include <OgreSceneNode.h>
 
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "util/Math.h"
 #include "SpaceshipSteering.h"

code/branches/core3/src/asylum/util/String2Number.h

@@ -36 +36 @@
 #include <iostream>
 
-#include "core/Debug.h"
+#include "util/Debug.h"
 
 /**

code/branches/core3/src/audio/AudioManager.cc

@@ -35 +35 @@
 #include "AudioStream.h"
 #include "core/Error.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 
 namespace audio

code/branches/core3/src/audio/AudioStream.cc

@@ -28 +28 @@
 #include "AudioStream.h"
 
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/Error.h"
 

code/branches/core3/src/core/CMakeLists.txt

@@ -7 +7 @@
   ObjectListBase.cc
   OrxonoxClass.cc
-  OutputBuffer.cc
-  OutputHandler.cc
   Script.cc
   SignalHandler.cc

code/branches/core3/src/core/ClassFactory.h

@@ -43 +43 @@
 #include "Factory.h"
 #include "Identifier.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/CommandEvaluation.cc

@@ -30 +30 @@
 #include "ConsoleCommand.h"
 #include "Identifier.h"
-#include "Debug.h"
+#include "util/Debug.h"
 #include "util/String.h"
 

code/branches/core3/src/core/CommandExecutor.cc

@@ -31 +31 @@
 #include "util/String.h"
 #include "util/Convert.h"
+#include "util/Debug.h"
 #include "Identifier.h"
 #include "Language.h"
-#include "Debug.h"
 #include "TclBind.h"
 

code/branches/core3/src/core/ConsoleCommandCompilation.cc

@@ -29 +29 @@
 #include "ConsoleCommandCompilation.h"
 #include "ConsoleCommand.h"
-#include "Debug.h"
+#include "util/Debug.h"
 #include "util/ExprParser.h"
 

code/branches/core3/src/core/Core.cc

@@ -107 +107 @@
             this->softDebugLevel_ = this->softDebugLevelShell_;
 
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_All,     this->softDebugLevel_);
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_Console, this->softDebugLevelConsole_);
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_Logfile, this->softDebugLevelLogfile_);
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_Shell,   this->softDebugLevelShell_);
 
         std::string temp = this->language_;
@@ -158 +162 @@
             else if (device == OutputHandler::LD_Shell)
                 Core::getInstance().softDebugLevelShell_ = level;
+
+            OutputHandler::setSoftDebugLevel(device, level);
         }
      }
@@ -199 +205 @@
     }
 }
-
-/**
-    @brief Returns the soft debug level, stored in the only existing instance of the DebugLevel class, configured in the config-file.
-    @return The soft debug level
-*/
-int getSoftDebugLevel()
-{
-    return orxonox::Core::getSoftDebugLevel();
-}

code/branches/core3/src/core/Core.h

@@ -41 +41 @@
 
 #include "OrxonoxClass.h"
-#include "OutputHandler.h"
+#include "util/OutputHandler.h"
 
 namespace orxonox

code/branches/core3/src/core/CoreIncludes.h

@@ -46 +46 @@
 #include "Factory.h"
 #include "ClassFactory.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 

code/branches/core3/src/core/CorePrereqs.h

@@ -139 +139 @@
   class ObjectListBaseElement;
   class OrxonoxClass;
-  class OutputBuffer;
-  class OutputBufferListener;
-  class OutputHandler;
   class Shell;
   class ShellListener;

code/branches/core3/src/core/Error.cc

@@ -33 +33 @@
 
 #include "Error.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Executor.h

@@ -37 +37 @@
 #include "util/Math.h"
 #include "Functor.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 

code/branches/core3/src/core/Factory.cc

@@ -34 +34 @@
 #include "Factory.h"
 #include "Identifier.h"
-#include "Debug.h"
 #include "BaseObject.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Functor.h

@@ -34 +34 @@
 
 #include "util/MultiTypeMath.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 #define MAX_FUNCTOR_ARGUMENTS 5

code/branches/core3/src/core/Identifier.h

@@ -60 +60 @@
 #include <utility>
 
-#include "Debug.h"
 #include "Iterator.h"
+#include "util/Debug.h"
 #include "util/String.h"
 

code/branches/core3/src/core/Language.cc

@@ -37 +37 @@
 
 #include "Core.h"
-
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Loader.cc

@@ -33 +33 @@
 #include "Iterator.h"
 #include "ObjectList.h"
-#include "Debug.h"
 #include "CoreIncludes.h"
 #include "Script.h"
 #include "Namespace.h"
+#include "util/Debug.h"
 
 #include "tinyxml/ticpp.h"

code/branches/core3/src/core/MetaObjectList.cc

@@ -33 +33 @@
 
 #include "MetaObjectList.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/NamespaceNode.cc

@@ -28 +28 @@
 
 #include "NamespaceNode.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Shell.cc

@@ -34 +34 @@
 #include "ConsoleCommand.h"
 #include "input/InputInterfaces.h"
+#include "util/OutputHandler.h"
 
 #define SHELL_UPDATE_LISTENERS(function) \
@@ -43 +44 @@
     SetConsoleCommand(Shell, clearShell, true);
     SetConsoleCommand(Shell, history, true);
+
+    SetConsoleCommandShortcutGeneric(log,     createConsoleCommand(createFunctor(&OutputHandler::log),     "log"    ));
+    SetConsoleCommandShortcutGeneric(error,   createConsoleCommand(createFunctor(&OutputHandler::error),   "error"  ));
+    SetConsoleCommandShortcutGeneric(warning, createConsoleCommand(createFunctor(&OutputHandler::warning), "warning"));
+    SetConsoleCommandShortcutGeneric(info,    createConsoleCommand(createFunctor(&OutputHandler::info),    "info"   ));
+    SetConsoleCommandShortcutGeneric(debug,   createConsoleCommand(createFunctor(&OutputHandler::debug),   "debug"  ));
 
     Shell::Shell()

code/branches/core3/src/core/Shell.h

@@ -37 +37 @@
 #include "OrxonoxClass.h"
 #include "input/InputBuffer.h"
-#include "OutputBuffer.h"
+#include "util/OutputBuffer.h"
 
 namespace orxonox

code/branches/core3/src/core/SignalHandler.cc

@@ -36 +36 @@
 #include <assert.h>
 #include <iostream>
-
-#include "Debug.h"
 
 SignalHandler * SignalHandler::singletonRef = NULL;

code/branches/core3/src/core/TclBind.cc

@@ -32 +32 @@
 #include "ConsoleCommand.h"
 #include "CommandExecutor.h"
-#include "Debug.h"
 #include "TclThreadManager.h"
 #include "TclBind.h"
+#include "util/Debug.h"
 #include "util/String.h"
 

code/branches/core3/src/core/TclThreadManager.cc

@@ -38 +38 @@
 #include "ConsoleCommand.h"
 #include "CommandExecutor.h"
-#include "Debug.h"
 #include "TclBind.h"
 #include "TclThreadManager.h"
+#include "util/Debug.h"
 #include "util/Convert.h"
 

code/branches/core3/src/core/XMLPort.h

@@ -32 +32 @@
 #include "CorePrereqs.h"
 
+#include "util/Debug.h"
 #include "util/XMLIncludes.h"
 #include "util/MultiTypeMath.h"
 #include "tinyxml/ticpp.h"
 #include "Executor.h"
-#include "Debug.h"
 #include "CoreIncludes.h"
 #include "BaseObject.h"

code/branches/core3/src/core/input/Button.cc

@@ -36 +36 @@
 #include "util/SubString.h"
 #include "util/String.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/ConsoleCommand.h"
 #include "core/CommandEvaluation.h"

code/branches/core3/src/core/input/InputManager.cc

@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Debug.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
 #include "core/Shell.h"               // hack!
+#include "util/Debug.h"
 
 #include "InputBuffer.h"

code/branches/core3/src/core/input/KeyBinder.cc

@@ -36 +36 @@
 #include <string>
 #include "util/Convert.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"

code/branches/core3/src/core/input/KeyDetector.cc

@@ -33 +33 @@
 
 #include "KeyDetector.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/CommandExecutor.h"

code/branches/core3/src/network/ClientConnection.cc

@@ -45 +45 @@
 
 #include "util/Sleep.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 
 namespace network
@@ -91 +91 @@
     return getPacket(address);
   }*/
-  
+
   ENetEvent *ClientConnection::getEvent(){
     if(!buffer.isEmpty())

code/branches/core3/src/network/PacketDecoder.cc

@@ -40 +40 @@
 #include <iostream>
 
-#include "core/Debug.h"
+#include "util/Debug.h"
 
 namespace network

code/branches/core3/src/orxonox/GraphicsEngine.cc

@@ -47 +47 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Debug.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
+#include "util/Debug.h"
 
 #include "console/InGameConsole.h"

code/branches/core3/src/orxonox/Orxonox.cc

@@ -55 +55 @@
 #include "core/ConfigFileManager.h"
 #include "core/ConsoleCommand.h"
-#include "core/Debug.h"
 #include "core/Loader.h"
 #include "core/input/InputManager.h"
 #include "core/TclBind.h"
 #include "core/Core.h"
+#include "util/Debug.h"
 
 // audio

code/branches/core3/src/orxonox/OrxonoxStableHeaders.h

@@ -92 +92 @@
 
 #include "util/Convert.h"
+#include "util/Debug.h"
 #include "util/Math.h"
 #include "util/Multitype.h"
 #include "util/MultiTypeMath.h"
+#include "util/OutputBuffer.h"
+#include "util/OutputHandler.h"
 #include "util/Sleep.h"
 #include "util/String.h"
@@ -104 +107 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Debug.h"
-#include "core/OutputBuffer.h"
-#include "core/OutputHandler.h"
 #include "core/Executor.h"
 #include "core/XMLPort.h"

code/branches/core3/src/orxonox/console/InGameConsole.cc

@@ -38 +38 @@
 #include <OgreStringConverter.h>
 
-#include "core/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
+#include "util/Debug.h"
 #include "util/Math.h"
 #include "GraphicsEngine.h"
@@ -457 +457 @@
             this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.40, 0.20, 0.40, 1.00));
             this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(0.80, 0.60, 0.80, 1.00));
+        }
+        else if (colourcode == 6)
+        {
+            this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.30, 0.20, 0.30, 1.00));
+            this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(0.50, 0.40, 0.50, 1.00));
         }
         else

code/branches/core3/src/orxonox/hud/HUD.cc

@@ -37 +37 @@
 #include <OgreStringConverter.h>
 
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"

code/branches/core3/src/orxonox/hud/Navigation.cc

@@ -41 +41 @@
 #include "RadarOverlayElement.h"
 #include "HUD.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "util/Math.h"
 

code/branches/core3/src/orxonox/objects/Ambient.cc

@@ -39 +39 @@
 #include "util/Convert.h"
 #include "util/Math.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
-#include "GraphicsEngine.h"
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -68 +68 @@
       return Synchronisable::create();
     }
-    
+
     void Ambient::registerAllVariables(){
       registerVar(&ambientLight_, sizeof(ColourValue), network::DATA);
-      
+
     }
-    
+
     void Ambient::loadParams(TiXmlElement* xmlElem)
     {
@@ -94 +94 @@
    {
         GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
-      ambientLight_=colour;     
+      ambientLight_=colour;
    }
 

code/branches/core3/src/orxonox/objects/Camera.cc

@@ -42 +42 @@
 #include "util/Convert.h"
 #include "util/Math.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"

code/branches/core3/src/orxonox/objects/Skybox.cc

@@ -37 +37 @@
 #include "GraphicsEngine.h"
 #include "core/CoreIncludes.h"
-#include "core/Debug.h"
 #include "core/XMLPort.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/orxonox/objects/SpaceShip.cc

@@ -38 +38 @@
 #include "util/Convert.h"
 #include "util/Math.h"
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Debug.h"
-#include "GraphicsEngine.h"
 #include "core/input/InputManager.h"
+#include "core/XMLPort.h"
+#include "core/ConsoleCommand.h"
 #include "tools/ParticleInterface.h"
+#include "network/Client.h"
+#include "hud/HUD.h"
 #include "RotatingProjectile.h"
 #include "ParticleProjectile.h"
-#include "core/XMLPort.h"
-#include "core/ConsoleCommand.h"
-#include "network/Client.h"
-#include "hud/HUD.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox

code/branches/core3/src/util/CMakeLists.txt

@@ -7 +7 @@
   MultiTypeString.cc
   MultiTypeMath.cc
+  OutputBuffer.cc
+  OutputHandler.cc
   String.cc
   SubString.cc

code/branches/core3/src/util/Convert.h

@@ -41 +41 @@
 
 #include "Math.h"
+#include "Debug.h"
 #include "SubString.h"
 #include "MultiTypeMath.h"
@@ -74 +75 @@
     enum { specialized = false };
     static bool convert(ToType* output, const FromType& input)
-    { return false; }
+    {
+        COUT(2) << "Warning: Couldn't convert a value." << std::endl;
+        return false;
+    }
 };
 
@@ -139 +143 @@
     static bool convert(ToType* output, const FromType& input)
     {
+        COUT(2) << "Warning: Couldn't convert a value." << std::endl;
         return false;
     }

code/branches/core3/src/util/Debug.h

@@ -37 +37 @@
 #define _Debug_H__
 
-#include "CorePrereqs.h"
+#include "UtilPrereqs.h"
 
 #include <stdio.h>
@@ -43 +43 @@
 #include "OutputHandler.h"
 
-extern "C" _CoreExport int getSoftDebugLevel();
+
+/**
+    @brief Returns the soft debug level, stored in the only existing instance of the OutputHandler class, configured in the config-file.
+    @return The soft debug level
+*/
+static inline int getSoftDebugLevel()
+{
+    return orxonox::OutputHandler::getSoftDebugLevel();
+}
+
 
 // DEFINE ERROR MODES

code/branches/core3/src/util/OutputBuffer.h

@@ -34 +34 @@
 #include <iostream>
 
-#include "CorePrereqs.h"
+#include "UtilPrereqs.h"
 
 namespace orxonox
 {
-    class _CoreExport OutputBufferListener
+    class _UtilExport OutputBufferListener
     {
         friend class OutputBuffer;
@@ -49 +49 @@
     };
 
-    class _CoreExport OutputBuffer
+    class _UtilExport OutputBuffer
     {
         public:
@@ -59 +59 @@
             {
                 this->stream_ << object;
+                this->callListeners();
+                return *this;
+            }
+
+            template <const OutputBuffer&>
+            inline OutputBuffer& operator<<(const OutputBuffer& object)
+            {
+                this->stream_ << object.stream_;
                 this->callListeners();
                 return *this;
@@ -97 +105 @@
             void unregisterListener(OutputBufferListener* listener);
 
+            inline std::stringstream& getStream()
+                { return this->stream_; }
+
         private:
             void callListeners();

code/branches/core3/src/util/OutputHandler.cc

@@ -33 +33 @@
 
 #include "OutputHandler.h"
-#include "Core.h"
-#include "ConsoleCommand.h"
-#include "Shell.h"
 
 namespace orxonox
 {
-    SetConsoleCommandShortcutGeneric(log,     createConsoleCommand(createFunctor(&OutputHandler::log),     "log"    ));
-    SetConsoleCommandShortcutGeneric(error,   createConsoleCommand(createFunctor(&OutputHandler::error),   "error"  ));
-    SetConsoleCommandShortcutGeneric(warning, createConsoleCommand(createFunctor(&OutputHandler::warning), "warning"));
-    SetConsoleCommandShortcutGeneric(info,    createConsoleCommand(createFunctor(&OutputHandler::info),    "info"   ));
-    SetConsoleCommandShortcutGeneric(debug,   createConsoleCommand(createFunctor(&OutputHandler::debug),   "debug"  ));
-
     /**
         @brief Constructor: Opens the logfile and writes the first line.
@@ -51 +42 @@
     OutputHandler::OutputHandler(const std::string& logfilename)
     {
+        this->outputBuffer_ = &this->fallbackBuffer_;
+        this->softDebugLevel_[0] = this->softDebugLevel_[1] = this->softDebugLevel_[2] = this->softDebugLevel_[3] = 2;
         this->logfilename_ = logfilename;
         this->logfile_.open(this->logfilename_.c_str(), std::fstream::out);
@@ -77 +70 @@
 
     /**
+        @brief Sets the soft debug level for a given output device.
+        @param device The output device
+        @param level The debug level
+    */
+    void OutputHandler::setSoftDebugLevel(OutputHandler::OutputDevice device, int level)
+    {
+        OutputHandler::getOutStream().softDebugLevel_[(unsigned int)device] = level;
+    }
+
+    /**
         @brief Returns the soft debug level for a given output device.
         @param device The output device
@@ -83 +86 @@
     int OutputHandler::getSoftDebugLevel(OutputHandler::OutputDevice device)
     {
-        return Core::getSoftDebugLevel(device);
+        return OutputHandler::getOutStream().softDebugLevel_[(unsigned int)device];
     }
 
     /**
-        @brief Returns the Shell's OutputBuffer. This is mere placed here to avoid
-               recompiling the entire project when Shell.h changes.
-        @return The OutputBuffer of the Shell
+        @brief Sets the OutputBuffer, representing the third output stream.
+        @param buffer The OutputBuffer
     */
-    OutputBuffer& OutputHandler::getShellOutputBuffer()
+    void OutputHandler::setOutputBuffer(OutputBuffer& buffer)
     {
-        return Shell::getInstance().getOutputBuffer();
+        buffer.getStream() >> this->outputBuffer_->getStream().rdbuf();
+        this->outputBuffer_ = &buffer;
     }
 
@@ -113 +116 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << sb;
+            (*this->outputBuffer_) << sb;
 
         return *this;
@@ -135 +138 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << manipulator;
+            (*this->outputBuffer_) << manipulator;
 
         return *this;
@@ -157 +160 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << manipulator;
+            (*this->outputBuffer_) << manipulator;
 
         return *this;
@@ -179 +182 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << manipulator;
+            (*this->outputBuffer_) << manipulator;
 
         return *this;

code/branches/core3/src/util/OutputHandler.h

@@ -38 +38 @@
 #define _OutputHandler_H__
 
-#include "CorePrereqs.h"
+#include "UtilPrereqs.h"
 
 #include <iostream>
@@ -49 +49 @@
 {
     //! The OutputHandler acts like std::cout, but redirects output to the console AND the logfile.
-    class _CoreExport OutputHandler
+    class _UtilExport OutputHandler
     {
         public:
             enum OutputDevice
             {
-                LD_All,
-                LD_Console,
-                LD_Logfile,
-                LD_Shell
+                LD_All = 0,
+                LD_Console = 1,
+                LD_Logfile = 2,
+                LD_Shell = 3
             };
 
@@ -86 +86 @@
                 { return this->logfile_; }
 
+            /** @brief Returns a pointer to the OutputBuffer. @return The OutputBuffer */
+            inline OutputBuffer* getOutputBuffer()
+                { return this->outputBuffer_; }
+
             /** @brief Sets the level of the incoming output. @param level The level of the incoming output @return The OutputHandler itself */
             inline OutputHandler& setOutputLevel(int level)
@@ -94 +98 @@
                 { return this->outputLevel_; }
 
-            static int getSoftDebugLevel(OutputHandler::OutputDevice device);
-
-            OutputBuffer& getShellOutputBuffer();
+            static void setSoftDebugLevel(OutputHandler::OutputDevice device, int level);
+            static int getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);
+
+            void setOutputBuffer(OutputBuffer& buffer);
 
             template <class T>
@@ -136 +141 @@
             OutputHandler(const OutputHandler& oh);  // don't copy
             virtual ~OutputHandler();
-            std::ofstream logfile_;     //!< The logfile where the output is logged
-            std::string logfilename_;   //!< The name of the logfile
-            int outputLevel_;           //!< The level of the incoming output
+
+            std::ofstream logfile_;              //!< The logfile where the output is logged
+            std::string logfilename_;            //!< The name of the logfile
+            OutputBuffer fallbackBuffer_;        //!< The OutputBuffer that gets used if there is no other OutputBuffer
+            OutputBuffer* outputBuffer_;         //!< The OutputBuffer to put output in (usually used by the Shell)
+            int outputLevel_;                    //!< The level of the incoming output
+            int softDebugLevel_[4];              //!< The soft debug level for each OutputDevice - the configurable maximal output level
     };
 
@@ -159 +168 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            OutputHandler::getOutStream().getShellOutputBuffer() << output;
+            (*this->outputBuffer_) << output;
 
         return *this;
@@ -183 +192 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= out.getOutputLevel())
-            OutputHandler::getOutStream().getShellOutputBuffer() << output;
+            (*out.getOutputBuffer()) << output;
 
         return out;
     }
-
 }
 

code/branches/core3/src/util/String.h

@@ -129 +129 @@
             std::string input = "3.14";
             float f;
-            bool success = string2Number(&f, input);
+            bool success = FromString(&f, input);
         */
         template <typename T>
@@ -151 +151 @@
             std::string input = "3.14";
             float f;
-            bool success = string2Number(&f, input, 0.000000);
+            bool success = FromString(&f, input, 0.000000);
         */
         template <typename T>

code/branches/core3/src/util/UtilPrereqs.h

@@ -65 +65 @@
 class MultiTypeString;
 class MultiTypeMath;
-template <class T>
-class String2Number;
+class OutputHandler;
 class SubString;
 
+namespace orxonox
+{
+    class OutputBuffer;
+    class OutputBufferListener;
+}
+
 #endif /* _UtilPrereqs_H__ */