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

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/orxonox/objects

Files:

• Ambient.cc (modified) (3 diffs)
• Camera.cc (modified) (1 diff)
• Skybox.cc (modified) (1 diff)
• SpaceShip.cc (modified) (1 diff)

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