[Orxonox-commit 1016] r5737 - in code/branches/libraries2/src: modules/objects modules/weapons modules/weapons/projectiles modules/weapons/weaponmodes orxonox orxonox/gametypes orxonox/graphics orxonox/pickup orxonox/sound orxonox/worldentities orxonox/worldentities/pawns
landauf at orxonox.net
landauf at orxonox.net
Tue Sep 1 01:13:50 CEST 2009
Author: landauf
Date: 2009-09-01 01:13:50 +0200 (Tue, 01 Sep 2009)
New Revision: 5737
Modified:
code/branches/libraries2/src/modules/objects/Planet.cc
code/branches/libraries2/src/modules/weapons/MuzzleFlash.h
code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc
code/branches/libraries2/src/orxonox/CameraManager.cc
code/branches/libraries2/src/orxonox/gametypes/Gametype.cc
code/branches/libraries2/src/orxonox/graphics/Billboard.h
code/branches/libraries2/src/orxonox/graphics/Light.h
code/branches/libraries2/src/orxonox/graphics/Model.h
code/branches/libraries2/src/orxonox/graphics/ParticleEmitter.h
code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc
code/branches/libraries2/src/orxonox/sound/SoundManager.cc
code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc
code/branches/libraries2/src/orxonox/worldentities/CameraPosition.cc
code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc
code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc
Log:
Adjusted paths to the files in graphics.
Compiles again.
Modified: code/branches/libraries2/src/modules/objects/Planet.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/Planet.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/modules/objects/Planet.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -36,7 +36,7 @@
#include "core/GameMode.h"
#include "core/XMLPort.h"
#include "Scene.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
#include "CameraManager.h"
namespace orxonox
Modified: code/branches/libraries2/src/modules/weapons/MuzzleFlash.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/MuzzleFlash.h 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/modules/weapons/MuzzleFlash.h 2009-08-31 23:13:50 UTC (rev 5737)
@@ -32,7 +32,7 @@
#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
-#include "worldentities/Billboard.h"
+#include "graphics/Billboard.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -34,7 +34,7 @@
#include "core/GameMode.h"
#include "objects/collisionshapes/SphereCollisionShape.h"
#include "worldentities/pawns/Pawn.h"
-#include "worldentities/ParticleSpawner.h"
+#include "graphics/ParticleSpawner.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -31,7 +31,7 @@
#include "core/CoreIncludes.h"
#include "core/Executor.h"
#include "core/XMLPort.h"
-#include "worldentities/Model.h"
+#include "graphics/Model.h"
#include "weapons/projectiles/Projectile.h"
#include "weapons/MuzzleFlash.h"
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -31,7 +31,7 @@
#include "core/CoreIncludes.h"
#include "core/Executor.h"
#include "core/XMLPort.h"
-#include "worldentities/Model.h"
+#include "graphics/Model.h"
#include "weapons/projectiles/Projectile.h"
#include "weapons/MuzzleFlash.h"
Modified: code/branches/libraries2/src/orxonox/CameraManager.cc
===================================================================
--- code/branches/libraries2/src/orxonox/CameraManager.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/CameraManager.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -36,7 +36,7 @@
#include "core/GUIManager.h"
#include "core/ObjectList.h"
#include "tools/Shader.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
#include "Scene.h"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/Gametype.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/gametypes/Gametype.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -35,7 +35,7 @@
#include "infos/PlayerInfo.h"
#include "infos/Bot.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
#include "worldentities/ControllableEntity.h"
#include "worldentities/SpawnPoint.h"
#include "worldentities/pawns/Spectator.h"
Modified: code/branches/libraries2/src/orxonox/graphics/Billboard.h
===================================================================
--- code/branches/libraries2/src/orxonox/graphics/Billboard.h 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/graphics/Billboard.h 2009-08-31 23:13:50 UTC (rev 5737)
@@ -34,7 +34,7 @@
#include "util/Math.h"
#include "tools/BillboardSet.h"
#include "interfaces/TeamColourable.h"
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/graphics/Light.h
===================================================================
--- code/branches/libraries2/src/orxonox/graphics/Light.h 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/graphics/Light.h 2009-08-31 23:13:50 UTC (rev 5737)
@@ -34,7 +34,7 @@
#include <string>
#include "util/Math.h"
#include "interfaces/TeamColourable.h"
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/graphics/Model.h
===================================================================
--- code/branches/libraries2/src/orxonox/graphics/Model.h 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/graphics/Model.h 2009-08-31 23:13:50 UTC (rev 5737)
@@ -33,7 +33,7 @@
#include <string>
#include "tools/Mesh.h"
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- code/branches/libraries2/src/orxonox/graphics/ParticleEmitter.h 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/graphics/ParticleEmitter.h 2009-08-31 23:13:50 UTC (rev 5737)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <string>
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -32,8 +32,8 @@
#include "core/CoreIncludes.h"
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/libraries2/src/orxonox/sound/SoundManager.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/sound/SoundManager.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -32,7 +32,7 @@
#include "util/Math.h"
#include "CameraManager.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
#include "SoundBase.h"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -37,8 +37,8 @@
#include "core/GameMode.h"
#include "tools/ParticleInterface.h"
#include "Scene.h"
-#include "worldentities/ParticleSpawner.h"
-#include "Model.h"
+#include "graphics/ParticleSpawner.h"
+#include "graphics/Model.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/CameraPosition.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/CameraPosition.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/worldentities/CameraPosition.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "Camera.h"
+#include "graphics/Camera.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -39,7 +39,7 @@
#include "Scene.h"
#include "infos/PlayerInfo.h"
#include "controllers/Controller.h"
-#include "worldentities/Camera.h"
+#include "graphics/Camera.h"
#include "worldentities/CameraPosition.h"
#include "overlays/OverlayGroup.h"
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc 2009-08-31 23:02:10 UTC (rev 5736)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc 2009-08-31 23:13:50 UTC (rev 5737)
@@ -39,7 +39,7 @@
#include "PawnManager.h"
#include "infos/PlayerInfo.h"
#include "gametypes/Gametype.h"
-#include "worldentities/ParticleSpawner.h"
+#include "graphics/ParticleSpawner.h"
#include "worldentities/ExplosionChunk.h"
#include "worldentities/BigExplosion.h"
#include "weaponsystem/WeaponSystem.h"
More information about the Orxonox-commit
mailing list