Changeset 5737

Timestamp:

Sep 1, 2009, 1:13:50 AM (15 years ago)

Author:

landauf

Message:

Adjusted paths to the files in graphics.
Compiles again.

Location:

code/branches/libraries2/src

Files:

• modules/objects/Planet.cc (modified) (1 diff)
• modules/weapons/MuzzleFlash.h (modified) (1 diff)
• modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• orxonox/CameraManager.cc (modified) (1 diff)
• orxonox/gametypes/Gametype.cc (modified) (1 diff)
• orxonox/graphics/Billboard.h (modified) (1 diff)
• orxonox/graphics/Light.h (modified) (1 diff)
• orxonox/graphics/Model.h (modified) (1 diff)
• orxonox/graphics/ParticleEmitter.h (modified) (1 diff)
• orxonox/pickup/DroppedItem.cc (modified) (1 diff)
• orxonox/sound/SoundManager.cc (modified) (1 diff)
• orxonox/worldentities/BigExplosion.cc (modified) (1 diff)
• orxonox/worldentities/CameraPosition.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/libraries2/src/modules/objects/Planet.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "Scene.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
 #include "CameraManager.h"
 

code/branches/libraries2/src/modules/weapons/MuzzleFlash.h

@@ -33 +33 @@
 
 #include "tools/Timer.h"
-#include "worldentities/Billboard.h"
+#include "graphics/Billboard.h"
 
 namespace orxonox

code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc

@@ -35 +35 @@
 #include "objects/collisionshapes/SphereCollisionShape.h"
 #include "worldentities/pawns/Pawn.h"
-#include "worldentities/ParticleSpawner.h"
+#include "graphics/ParticleSpawner.h"
 
 namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -32 +32 @@
 #include "core/Executor.h"
 #include "core/XMLPort.h"
-#include "worldentities/Model.h"
+#include "graphics/Model.h"
 
 #include "weapons/projectiles/Projectile.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc

@@ -32 +32 @@
 #include "core/Executor.h"
 #include "core/XMLPort.h"
-#include "worldentities/Model.h"
+#include "graphics/Model.h"
 
 #include "weapons/projectiles/Projectile.h"

code/branches/libraries2/src/orxonox/CameraManager.cc

@@ -37 +37 @@
 #include "core/ObjectList.h"
 #include "tools/Shader.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
 #include "Scene.h"
 

code/branches/libraries2/src/orxonox/gametypes/Gametype.cc

@@ -36 +36 @@
 #include "infos/PlayerInfo.h"
 #include "infos/Bot.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/SpawnPoint.h"

code/branches/libraries2/src/orxonox/graphics/Billboard.h

@@ -35 +35 @@
 #include "tools/BillboardSet.h"
 #include "interfaces/TeamColourable.h"
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/graphics/Light.h

@@ -35 +35 @@
 #include "util/Math.h"
 #include "interfaces/TeamColourable.h"
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/graphics/Model.h

@@ -34 +34 @@
 #include <string>
 #include "tools/Mesh.h"
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/graphics/ParticleEmitter.h

@@ -33 +33 @@
 
 #include <string>
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc

@@ -33 +33 @@
 #include "core/Executor.h"
 #include "BaseItem.h"
-#include "worldentities/Billboard.h"
-#include "worldentities/Model.h"
+#include "graphics/Billboard.h"
+#include "graphics/Model.h"
 #include "worldentities/pawns/Pawn.h"
 

code/branches/libraries2/src/orxonox/sound/SoundManager.cc

@@ -33 +33 @@
 #include "util/Math.h"
 #include "CameraManager.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
 #include "SoundBase.h"
 

code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc

@@ -38 +38 @@
 #include "tools/ParticleInterface.h"
 #include "Scene.h"
-#include "worldentities/ParticleSpawner.h"
-#include "Model.h"
+#include "graphics/ParticleSpawner.h"
+#include "graphics/Model.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/CameraPosition.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "Camera.h"
+#include "graphics/Camera.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc

@@ -40 +40 @@
 #include "infos/PlayerInfo.h"
 #include "controllers/Controller.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
 #include "worldentities/CameraPosition.h"
 #include "overlays/OverlayGroup.h"

code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -40 +40 @@
 #include "infos/PlayerInfo.h"
 #include "gametypes/Gametype.h"
-#include "worldentities/ParticleSpawner.h"
+#include "graphics/ParticleSpawner.h"
 #include "worldentities/ExplosionChunk.h"
 #include "worldentities/BigExplosion.h"