Changeset 5735 for code/branches/libraries2/src/orxonox/worldentities

Timestamp:

Sep 1, 2009, 12:38:36 AM (15 years ago)

Author:

landauf

Message:

Removed /objects/ from all paths (except from those in the objects module of course).
Compiles again.

Location:

code/branches/libraries2/src/orxonox/worldentities

Files:

• Backlight.cc (modified) (1 diff)
• BigExplosion.cc (modified) (1 diff)
• Billboard.cc (modified) (2 diffs)
• Camera.cc (modified) (1 diff)
• Camera.h (modified) (1 diff)
• CameraPosition.h (modified) (1 diff)
• ControllableEntity.cc (modified) (2 diffs)
• ExplosionChunk.cc (modified) (1 diff)
• Light.cc (modified) (1 diff)
• MobileEntity.cc (modified) (1 diff)
• Model.cc (modified) (1 diff)
• MovableEntity.cc (modified) (1 diff)
• ParticleEmitter.cc (modified) (1 diff)
• SpawnPoint.cc (modified) (1 diff)
• SpawnPoint.h (modified) (1 diff)
• TeamSpawnPoint.h (modified) (1 diff)
• WorldEntity.cc (modified) (1 diff)
• pawns/Destroyer.cc (modified) (1 diff)
• pawns/Pawn.cc (modified) (1 diff)
• pawns/Pawn.h (modified) (2 diffs)
• pawns/SpaceShip.cc (modified) (1 diff)
• pawns/Spectator.cc (modified) (1 diff)
• pawns/Spectator.h (modified) (1 diff)
• pawns/TeamBaseMatchBase.cc (modified) (1 diff)

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

@@ -38 +38 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 
 namespace orxonox

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

@@ -37 +37 @@
 #include "core/GameMode.h"
 #include "tools/ParticleInterface.h"
-#include "objects/Scene.h"
-#include "objects/worldentities/ParticleSpawner.h"
+#include "Scene.h"
+#include "worldentities/ParticleSpawner.h"
 #include "Model.h"
 

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

@@ -32 +32 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 
 namespace orxonox
@@ -111 +111 @@
             this->billboard_.setColour(this->colour_);
     }
-    
+
 /*
     void Billboard::changedRotation()

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

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 #include "CameraManager.h"
 

code/branches/libraries2/src/orxonox/worldentities/Camera.h

@@ -34 +34 @@
 #include "util/OgreForwardRefs.h"
 #include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox

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

@@ -37 +37 @@
 #include "core/XMLPort.h"
 
-#include "objects/Scene.h"
-#include "objects/infos/PlayerInfo.h"
-#include "objects/controllers/Controller.h"
-#include "objects/worldentities/Camera.h"
-#include "objects/worldentities/CameraPosition.h"
+#include "Scene.h"
+#include "infos/PlayerInfo.h"
+#include "controllers/Controller.h"
+#include "worldentities/Camera.h"
+#include "worldentities/CameraPosition.h"
 #include "overlays/OverlayGroup.h"
 
@@ -383 +383 @@
         registerVariable(this->client_orientation_,      VariableDirection::ToServer, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientOrientation));
         registerVariable(this->client_angular_velocity_, VariableDirection::ToServer, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientAngularVelocity));
-        
+
 
         registerVariable(this->playerID_,                VariableDirection::ToClient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID));

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

@@ -33 +33 @@
 #include "core/GameMode.h"
 #include "util/Exception.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 #include "tools/ParticleInterface.h"
 

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

@@ -38 +38 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox

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

@@ -39 +39 @@
 #include "core/XMLPort.h"
 #include "tools/ParticleInterface.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 
 namespace orxonox

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

@@ -32 +32 @@
 #include "core/Template.h"
 #include "core/XMLPort.h"
-#include "objects/gametypes/Gametype.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "gametypes/Gametype.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.h

@@ -34 +34 @@
 #include <string>
 #include "core/Identifier.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/TeamSpawnPoint.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
 #include "SpawnPoint.h"
 

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

@@ -44 +44 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
-#include "objects/collisionshapes/WorldEntityCollisionShape.h"
+#include "Scene.h"
+#include "collisionshapes/WorldEntityCollisionShape.h"
 
 namespace orxonox

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

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "objects/gametypes/UnderAttack.h"
+#include "gametypes/UnderAttack.h"
 
 namespace orxonox

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

@@ -38 +38 @@
 #include "interfaces/PawnListener.h"
 #include "PawnManager.h"
-#include "objects/infos/PlayerInfo.h"
-#include "objects/gametypes/Gametype.h"
-#include "objects/worldentities/ParticleSpawner.h"
-#include "objects/worldentities/ExplosionChunk.h"
-#include "objects/worldentities/BigExplosion.h"
-#include "objects/weaponsystem/WeaponSystem.h"
-#include "objects/weaponsystem/WeaponSlot.h"
-#include "objects/weaponsystem/WeaponPack.h"
-#include "objects/weaponsystem/WeaponSet.h"
+#include "infos/PlayerInfo.h"
+#include "gametypes/Gametype.h"
+#include "worldentities/ParticleSpawner.h"
+#include "worldentities/ExplosionChunk.h"
+#include "worldentities/BigExplosion.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "weaponsystem/WeaponSlot.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSet.h"
 
 

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

@@ -34 +34 @@
 #include <string>
 #include "interfaces/RadarViewable.h"
-#include "objects/worldentities/ControllableEntity.h"
-#include "objects/pickup/PickupCollection.h"
+#include "worldentities/ControllableEntity.h"
+#include "pickup/PickupCollection.h"
 
 namespace orxonox
@@ -114 +114 @@
             virtual void useItem()
                 { this->pickups_.useItem(); }
-            
+
             virtual void startLocalHumanControl();
 

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

@@ -35 +35 @@
 #include "core/Template.h"
 #include "core/XMLPort.h"
-#include "objects/items/Engine.h"
+#include "items/Engine.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 
 #include "tools/BillboardSet.h"
-#include "objects/Scene.h"
-#include "objects/infos/PlayerInfo.h"
+#include "Scene.h"
+#include "infos/PlayerInfo.h"
 
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox

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

@@ -33 +33 @@
 #include "interfaces/PawnListener.h"
 #include "interfaces/TeamColourable.h"
-#include "objects/gametypes/TeamBaseMatch.h"
+#include "gametypes/TeamBaseMatch.h"
 
 namespace orxonox