Context Navigation

← Previous Change
Next Change →

objects

Timestamp:

Jun 15, 2009, 11:52:13 AM (16 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

Files:

: 4 deleted
: 31 edited

CMakeLists.txt (modified) (1 diff)
GametypeMessageListener.cc (deleted)
Radar.cc (modified) (1 diff)
Radar.h (modified) (1 diff)
RadarListener.cc (deleted)
Scene.h (modified) (1 diff)
Teamcolourable.cc (deleted)
Test.h (modified) (1 diff)
Tickable.cc (deleted)
controllers/AIController.h (modified) (1 diff)
controllers/ArtificialController.h (modified) (1 diff)
controllers/PongAI.h (modified) (1 diff)
controllers/WaypointController.h (modified) (1 diff)
gametypes/Gametype.h (modified) (1 diff)
gametypes/TeamDeathmatch.cc (modified) (1 diff)
gametypes/UnderAttack.h (modified) (1 diff)
infos/GametypeInfo.cc (modified) (1 diff)
items/Engine.h (modified) (1 diff)
pickup/DroppedItem.h (modified) (1 diff)
pickup/PickupSpawner.h (modified) (1 diff)
weaponsystem/projectiles/Projectile.h (modified) (1 diff)
worldentities/Backlight.h (modified) (1 diff)
worldentities/Billboard.h (modified) (1 diff)
worldentities/BlinkingBillboard.h (modified) (1 diff)
worldentities/Camera.h (modified) (1 diff)
worldentities/FadingBillboard.h (modified) (1 diff)
worldentities/ForceField.h (modified) (1 diff)
worldentities/Light.h (modified) (1 diff)
worldentities/MobileEntity.h (modified) (1 diff)
worldentities/Planet.h (modified) (1 diff)
worldentities/pawns/Pawn.cc (modified) (1 diff)
worldentities/pawns/Pawn.h (modified) (1 diff)
worldentities/pawns/TeamBaseMatchBase.cc (modified) (1 diff)
worldentities/triggers/CheckPoint.h (modified) (1 diff)
worldentities/triggers/Trigger.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/pch/src/orxonox/objects/CMakeLists.txt

-                      r3099
+                      r3177
   EventDispatcher.cc
   EventTarget.cc
-  GametypeMessageListener.cc
   GlobalShader.cc
   Level.cc
   Radar.cc
-  RadarListener.cc
-  RadarViewable.cc
-  Teamcolourable.cc
-  Tickable.cc
   Scene.cc
   Script.cc

code/branches/pch/src/orxonox/objects/Radar.cc

r3174	r3177
39	39	#include "core/ConsoleCommand.h"
40	40	#include "core/ObjectList.h"
41		#include "RadarListener.h"
	41	#include "interfaces/RadarListener.h"
42	42
43	43	namespace orxonox

code/branches/pch/src/orxonox/objects/Radar.h

-                      r3174
+                      r3177
 #include "core/ObjectListIterator.h"
 #include "objects/Tickable.h"
 #include "RadarViewable.h"
+#include "interfaces/RadarViewable.h"
+#include "interfaces/Tickable.h"
 namespace orxonox

code/branches/pch/src/orxonox/objects/Scene.h

r3174	r3177
41	41	#include "core/BaseObject.h"
42	42	#include "network/synchronisable/Synchronisable.h"
43		#include "~~object~~s/Tickable.h"
	43	#include "interfaces/Tickable.h"
44	44
45	45	namespace orxonox

code/branches/pch/src/orxonox/objects/Test.h

r3084	r3177
33	33	#include "core/BaseObject.h"
34	34	#include "network/synchronisable/Synchronisable.h"
35		#include "Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36
37	37

code/branches/pch/src/orxonox/objects/controllers/AIController.h

-                      r3176
+                      r3177
 #include "tools/Timer.h"
+#include "interfaces/Tickable.h"
 #include "ArtificialController.h"
-#include "objects/Tickable.h"
 namespace orxonox

code/branches/pch/src/orxonox/objects/controllers/ArtificialController.h

-                      r3176
+                      r3177
 #include "util/Math.h"
+#include "interfaces/PawnListener.h"
 #include "Controller.h"
-#include "tools/PawnListener.h"
 namespace orxonox

code/branches/pch/src/orxonox/objects/controllers/PongAI.h

-                      r3176
+                      r3177
 #include <list>
 #include "util/Math.h"
+#include "interfaces/Tickable.h"
 #include "Controller.h"
-#include "objects/Tickable.h"
 namespace orxonox

code/branches/pch/src/orxonox/objects/controllers/WaypointController.h

-                      r3176
+                      r3177
 #include <vector>
+#include "interfaces/Tickable.h"
 #include "ArtificialController.h"
-#include "objects/Tickable.h"
 namespace orxonox

code/branches/pch/src/orxonox/objects/gametypes/Gametype.h

r3033	r3177
37	37	#include "core/Identifier.h"
38	38	#include "objects/worldentities/ControllableEntity.h"
39		#include "~~object~~s/Tickable.h"
	39	#include "interfaces/Tickable.h"
40	40	#include "objects/infos/GametypeInfo.h"
41	41

code/branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc

r3110	r3177
31	31	#include "core/CoreIncludes.h"
32	32	#include "core/ConfigValueIncludes.h"
33		#include "~~object~~s/Teamcolourable.h"
	33	#include "interfaces/Teamcolourable.h"
34	34	#include "objects/worldentities/TeamSpawnPoint.h"
35	35

code/branches/pch/src/orxonox/objects/gametypes/UnderAttack.h

r3033	r3177
33	33
34	34	#include "TeamDeathmatch.h"
35		#include "~~objects/worldentities/pawns/Pawn~~.h"
	35	#include "interfaces/PawnListener.h"
36	36
37	37	namespace orxonox

code/branches/pch/src/orxonox/objects/infos/GametypeInfo.cc

r3110	r3177
33	33	#include "network/NetworkFunction.h"
34	34	#include "network/Host.h"
35		#include "~~object~~s/GametypeMessageListener.h"
	35	#include "interfaces/GametypeMessageListener.h"
36	36
37	37	namespace orxonox

code/branches/pch/src/orxonox/objects/items/Engine.h

r3060	r3177
33	33
34	34	#include "Item.h"
35		#include "~~object~~s/Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36	#include "util/Math.h"
37	37

code/branches/pch/src/orxonox/objects/pickup/DroppedItem.h

r3079	r3177
37	37	#include "OrxonoxPrereqs.h"
38	38
39		#include "~~object~~s/Tickable.h"
	39	#include "interfaces/Tickable.h"
40	40	#include "objects/worldentities/StaticEntity.h"
41	41	#include "tools/Timer.h"

code/branches/pch/src/orxonox/objects/pickup/PickupSpawner.h

r3079	r3177
37	37	#include "OrxonoxPrereqs.h"
38	38
39		#include "~~object~~s/Tickable.h"
	39	#include "interfaces/Tickable.h"
40	40	#include "objects/worldentities/StaticEntity.h"
41	41	#include "tools/Timer.h"

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h

r3053	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
	34	#include "interfaces/PawnListener.h"
34	35	#include "objects/worldentities/MovableEntity.h"
35	36	#include "objects/worldentities/pawns/Pawn.h"

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

r3068	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33	#include "FadingBillboard.h"
34		#include "~~tool~~s/TimeFactorListener.h"
	34	#include "interfaces/TimeFactorListener.h"
35	35
36	36	namespace orxonox

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

r3053	r3177
34	34	#include "util/Math.h"
35	35	#include "tools/BillboardSet.h"
36		#include "~~object~~s/Teamcolourable.h"
	36	#include "interfaces/Teamcolourable.h"
37	37
38	38	namespace orxonox

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

r2087	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33	#include "Billboard.h"
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35
36	36	namespace orxonox

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

r3068	r3177
34	34	#include <OgrePrerequisites.h>
35	35	#include "objects/worldentities/StaticEntity.h"
36		#include "~~object~~s/Tickable.h"
	36	#include "interfaces/Tickable.h"
37	37
38	38	namespace orxonox

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

r2662	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33	#include "Billboard.h"
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35	#include "tools/Timer.h"
36	36

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

r3064	r3177
32	32
33	33	#include "StaticEntity.h"
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35
36	36	namespace orxonox

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

r2826	r3177
37	37
38	38	#include "util/Math.h"
39		#include "~~object~~s/Teamcolourable.h"
	39	#include "interfaces/Teamcolourable.h"
40	40
41	41	namespace orxonox

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

r3084	r3177
33	33
34	34	#include "WorldEntity.h"
35		#include "~~object~~s/Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36
37	37	namespace orxonox

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

r2710	r3177
37	37	#include "tools/Mesh.h"
38	38	#include "MovableEntity.h"
39		#include "~~object~~s/Tickable.h"
	39	#include "interfaces/Tickable.h"
40	40
41	41	namespace orxonox

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

r3176	r3177
34	34	#include "util/Math.h"
35	35	#include "PawnManager.h"
	36	#include "interfaces/PawnListener.h"
36	37	#include "objects/infos/PlayerInfo.h"
37	38	#include "objects/gametypes/Gametype.h"

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

r3176	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33	#include "objects/worldentities/ControllableEntity.h"
34		#include "~~object~~s/RadarViewable.h"
	34	#include "interfaces/RadarViewable.h"
35	35	#include "objects/pickup/PickupCollection.h"
36	36

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

-                      r3086
+                      r3177
 #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

r3064	r3177
36	36
37	37	#include "DistanceTrigger.h"
38		#include "~~object~~s/RadarViewable.h"
	38	#include "interfaces/RadarViewable.h"
39	39
40	40	namespace orxonox

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

r3068	r3177
35	35	#include "OrxonoxPrereqs.h"
36	36
37		#include "~~object~~s/Tickable.h"
	37	#include "interfaces/Tickable.h"
38	38	#include "objects/worldentities/StaticEntity.h"
39	39	#include "tools/BillboardSet.h"

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

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

Legend:

Download in other formats: