Changeset 1586 for code/branches/core3/src/orxonox

Timestamp:

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

Author:

landauf

Message:

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

Location:

code/branches/core3/src/orxonox

Files:

• GraphicsEngine.cc (modified) (1 diff)
• Orxonox.cc (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (2 diffs)
• console/InGameConsole.cc (modified) (2 diffs)
• hud/HUD.cc (modified) (1 diff)
• hud/Navigation.cc (modified) (1 diff)
• objects/Ambient.cc (modified) (3 diffs)
• objects/Camera.cc (modified) (1 diff)
• objects/Skybox.cc (modified) (1 diff)
• objects/SpaceShip.cc (modified) (1 diff)

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