Changeset 3177 for code/branches/pch/src/orxonox/objects/worldentities

Timestamp:

Jun 15, 2009, 11:52:13 AM (15 years ago)

Author:

rgrieder

Message:

Moved interface classes to orxonox/interfaces.
This resolves certain identity problems, for instance Tickable technically isn't an object.
Furthermore this saves the compilation of 6 files by using InterfaceCompilation.cc

Location:

code/branches/pch/src/orxonox/objects/worldentities

Files:

• Backlight.h (modified) (1 diff)
• Billboard.h (modified) (1 diff)
• BlinkingBillboard.h (modified) (1 diff)
• Camera.h (modified) (1 diff)
• FadingBillboard.h (modified) (1 diff)
• ForceField.h (modified) (1 diff)
• Light.h (modified) (1 diff)
• MobileEntity.h (modified) (1 diff)
• Planet.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (1 diff)
• pawns/Pawn.h (modified) (1 diff)
• pawns/TeamBaseMatchBase.cc (modified) (1 diff)
• triggers/CheckPoint.h (modified) (1 diff)
• triggers/Trigger.h (modified) (1 diff)

code/branches/pch/src/orxonox/objects/worldentities/Backlight.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "FadingBillboard.h"
-#include "tools/TimeFactorListener.h"
+#include "interfaces/TimeFactorListener.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/Billboard.h

@@ -34 +34 @@
 #include "util/Math.h"
 #include "tools/BillboardSet.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "Billboard.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/Camera.h

@@ -34 +34 @@
 #include <OgrePrerequisites.h>
 #include "objects/worldentities/StaticEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "Billboard.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "tools/Timer.h"
 

code/branches/pch/src/orxonox/objects/worldentities/ForceField.h

@@ -32 +32 @@
 
 #include "StaticEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/Light.h

@@ -37 +37 @@
 
 #include "util/Math.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.h

@@ -33 +33 @@
 
 #include "WorldEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/Planet.h

@@ -37 +37 @@
 #include "tools/Mesh.h"
 #include "MovableEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -34 +34 @@
 #include "util/Math.h"
 #include "PawnManager.h"
+#include "interfaces/PawnListener.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"

code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "objects/worldentities/ControllableEntity.h"
-#include "objects/RadarViewable.h"
+#include "interfaces/RadarViewable.h"
 #include "objects/pickup/PickupCollection.h"
 

code/branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "objects/gametypes/TeamBaseMatch.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
+#include "interfaces/PawnListener.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h

@@ -36 +36 @@
 
 #include "DistanceTrigger.h"
-#include "objects/RadarViewable.h"
+#include "interfaces/RadarViewable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h

@@ -35 +35 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
 #include "tools/BillboardSet.h"