Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3177

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

Files:

: 2 added
: 6 deleted
: 63 edited
: 10 moved

CMakeLists.txt (modified) (1 diff)
GraphicsManager.cc (modified) (1 diff)
PawnManager.h (modified) (1 diff)
gamestates/GSGraphics.h (modified) (1 diff)
gamestates/GSLevel.cc (modified) (1 diff)
gamestates/GSRoot.cc (modified) (1 diff)
interfaces (added)
interfaces/CMakeLists.txt (added)
interfaces/GametypeMessageListener.h (moved) (moved from code/branches/pch/src/orxonox/objects/GametypeMessageListener.h)
interfaces/InterfaceCompilation.cc (moved) (moved from code/branches/pch/src/orxonox/tools/WindowEventListener.cc) (1 diff)
interfaces/PawnListener.h (moved) (moved from code/branches/pch/src/orxonox/tools/PawnListener.h)
interfaces/RadarListener.h (moved) (moved from code/branches/pch/src/orxonox/objects/RadarListener.h)
interfaces/RadarViewable.cc (moved) (moved from code/branches/pch/src/orxonox/objects/RadarViewable.cc)
interfaces/RadarViewable.h (moved) (moved from code/branches/pch/src/orxonox/objects/RadarViewable.h)
interfaces/Teamcolourable.h (moved) (moved from code/branches/pch/src/orxonox/objects/Teamcolourable.h)
interfaces/Tickable.h (moved) (moved from code/branches/pch/src/orxonox/objects/Tickable.h)
interfaces/TimeFactorListener.h (moved) (moved from code/branches/pch/src/orxonox/tools/TimeFactorListener.h)
interfaces/WindowEventListener.h (moved) (moved from code/branches/pch/src/orxonox/tools/WindowEventListener.h)
objects/CMakeLists.txt (modified) (1 diff)
objects/GametypeMessageListener.cc (deleted)
objects/Radar.cc (modified) (1 diff)
objects/Radar.h (modified) (1 diff)
objects/RadarListener.cc (deleted)
objects/Scene.h (modified) (1 diff)
objects/Teamcolourable.cc (deleted)
objects/Test.h (modified) (1 diff)
objects/Tickable.cc (deleted)
objects/controllers/AIController.h (modified) (1 diff)
objects/controllers/ArtificialController.h (modified) (1 diff)
objects/controllers/PongAI.h (modified) (1 diff)
objects/controllers/WaypointController.h (modified) (1 diff)
objects/gametypes/Gametype.h (modified) (1 diff)
objects/gametypes/TeamDeathmatch.cc (modified) (1 diff)
objects/gametypes/UnderAttack.h (modified) (1 diff)
objects/infos/GametypeInfo.cc (modified) (1 diff)
objects/items/Engine.h (modified) (1 diff)
objects/pickup/DroppedItem.h (modified) (1 diff)
objects/pickup/PickupSpawner.h (modified) (1 diff)
objects/weaponsystem/projectiles/Projectile.h (modified) (1 diff)
objects/worldentities/Backlight.h (modified) (1 diff)
objects/worldentities/Billboard.h (modified) (1 diff)
objects/worldentities/BlinkingBillboard.h (modified) (1 diff)
objects/worldentities/Camera.h (modified) (1 diff)
objects/worldentities/FadingBillboard.h (modified) (1 diff)
objects/worldentities/ForceField.h (modified) (1 diff)
objects/worldentities/Light.h (modified) (1 diff)
objects/worldentities/MobileEntity.h (modified) (1 diff)
objects/worldentities/Planet.h (modified) (1 diff)
objects/worldentities/pawns/Pawn.cc (modified) (1 diff)
objects/worldentities/pawns/Pawn.h (modified) (1 diff)
objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) (1 diff)
objects/worldentities/triggers/CheckPoint.h (modified) (1 diff)
objects/worldentities/triggers/Trigger.h (modified) (1 diff)
overlays/FadeoutText.h (modified) (1 diff)
overlays/OrxonoxOverlay.h (modified) (1 diff)
overlays/console/InGameConsole.h (modified) (1 diff)
overlays/debug/DebugFPSText.h (modified) (1 diff)
overlays/debug/DebugRTRText.h (modified) (1 diff)
overlays/hud/AnnounceMessage.h (modified) (1 diff)
overlays/hud/DeathMessage.h (modified) (1 diff)
overlays/hud/GametypeStatus.h (modified) (1 diff)
overlays/hud/HUDHealthBar.h (modified) (1 diff)
overlays/hud/HUDNavigation.h (modified) (1 diff)
overlays/hud/HUDRadar.h (modified) (1 diff)
overlays/hud/HUDSpeedBar.h (modified) (1 diff)
overlays/hud/HUDTimer.h (modified) (1 diff)
overlays/hud/KillMessage.h (modified) (1 diff)
overlays/hud/PongScore.h (modified) (1 diff)
overlays/hud/TeamBaseMatchScore.h (modified) (1 diff)
overlays/map/Map.cc (modified) (1 diff)
overlays/map/Map.h (modified) (1 diff)
overlays/notifications/NotificationQueue.h (modified) (1 diff)
overlays/stats/Scoreboard.h (modified) (1 diff)
overlays/stats/Stats.h (modified) (1 diff)
sound/SoundManager.h (modified) (1 diff)
tools/CMakeLists.txt (modified) (1 diff)
tools/ParticleInterface.h (modified) (1 diff)
tools/PawnListener.cc (deleted)
tools/Shader.h (modified) (1 diff)
tools/TimeFactorListener.cc (deleted)
tools/Timer.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

r3167	r3177
28	28	ADD_SUBDIRECTORY(gamestates)
29	29	ADD_SUBDIRECTORY(gui)
	30	ADD_SUBDIRECTORY(interfaces)
30	31	ADD_SUBDIRECTORY(objects)
31	32	ADD_SUBDIRECTORY(overlays)

code/branches/pch/src/orxonox/GraphicsManager.cc

-                      r3172
+                      r3177
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "tools/WindowEventListener.h"
 #include "tools/ParticleInterface.h"
+#include "interfaces/WindowEventListener.h"
 // HACK!

code/branches/pch/src/orxonox/PawnManager.h

r2662	r3177
31	31
32	32	#include "OrxonoxPrereqs.h"
33		#include "~~object~~s/Tickable.h"
	33	#include "interfaces/Tickable.h"
34	34
35	35	namespace orxonox

code/branches/pch/src/orxonox/gamestates/GSGraphics.h

r3173	r3177
39	39
40	40	#include "core/GameState.h"
41		#include "~~tool~~s/WindowEventListener.h"
	41	#include "interfaces/WindowEventListener.h"
42	42
43	43	namespace orxonox

code/branches/pch/src/orxonox/gamestates/GSLevel.cc

-                      r3173
+                      r3177
 #include "core/XMLFile.h"
+#include "interfaces/Tickable.h"
 #include "objects/Radar.h"
-#include "objects/Tickable.h"
 #include "objects/quest/QuestManager.h"
 #include "overlays/notifications/NotificationManager.h"

code/branches/pch/src/orxonox/gamestates/GSRoot.cc

-                      r3173
+                      r3177
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "tools/TimeFactorListener.h"
 #include "tools/Timer.h"
+#include "objects/Tickable.h"
+#include "interfaces/TimeFactorListener.h"
+#include "interfaces/Tickable.h"
 namespace orxonox

code/branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc

-                      r3167
+                      r3177
  */
+/**
+@file
+@brief
+    Compiles all the interfaces (except RadarViewable) with mostly just a constructor.
+*/
+#include "GametypeMessageListener.h"
+#include "PawnListener.h"
+#include "RadarListener.h"
+#include "Teamcolourable.h"
+#include "Tickable.h"
+#include "TimeFactorListener.h"
 #include "WindowEventListener.h"
 #include "core/CoreIncludes.h"
 namespace orxonox
+{
+    //----------------------------
+    // GametypeMessageListener
+    //----------------------------
+    GametypeMessageListener::GametypeMessageListener()
+    {
+        RegisterRootObject(GametypeMessageListener);
+    }
+    //----------------------------
+    // PawnListener
+    //----------------------------
+    /**
+        @brief Constructor for the PawnListener.
+    */
+    PawnListener::PawnListener()
+    {
+        RegisterRootObject(PawnListener);
+    }
+    //----------------------------
+    // RadarListener
+    //----------------------------
+    RadarListener::RadarListener()
+    {
+        RegisterRootObject(RadarListener);
+    }
+    //----------------------------
+    // Teamcolourable
+    //----------------------------
+    Teamcolourable::Teamcolourable()
+    {
+        RegisterRootObject(Teamcolourable);
+    }
+    //----------------------------
+    // TimeFactorListener
+    //----------------------------
+    float TimeFactorListener::timefactor_s = 1.0f;
+    TimeFactorListener::TimeFactorListener()
+    {
+        RegisterRootObject(TimeFactorListener);
+    }
+    //----------------------------
+    // Tickable
+    //----------------------------
+    /**
+        @brief Constructor: Registers the object in the Tickable-list
+    */
+    Tickable::Tickable()
+    {
+        RegisterRootObject(Tickable);
+    }
+    //----------------------------
+    // WindowEventListener
+    //----------------------------
     /**
         @brief Constructor for the WindowEventListener.

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"

code/branches/pch/src/orxonox/overlays/FadeoutText.h

r3144	r3177
33	33
34	34	#include "tools/Timer.h"
35		#include "~~object~~s/Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36	#include "overlays/OverlayText.h"
37	37

code/branches/pch/src/orxonox/overlays/OrxonoxOverlay.h

r3144	r3177
42	42	#include "util/Math.h"
43	43	#include "core/BaseObject.h"
44		#include "~~tool~~s/WindowEventListener.h"
	44	#include "interfaces/WindowEventListener.h"
45	45
46	46	namespace orxonox

code/branches/pch/src/orxonox/overlays/console/InGameConsole.h

r3144	r3177
35	35	#include <string>
36	36	#include "core/Shell.h"
37		#include "~~tool~~s/WindowEventListener.h"
	37	#include "interfaces/WindowEventListener.h"
38	38
39	39	namespace orxonox

code/branches/pch/src/orxonox/overlays/debug/DebugFPSText.h

r3144	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35	#include "overlays/OverlayText.h"
36	36

code/branches/pch/src/orxonox/overlays/debug/DebugRTRText.h

r3144	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35	#include "overlays/OverlayText.h"
36	36

code/branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h

r3158	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/GametypeMessageListener.h"
	34	#include "interfaces/GametypeMessageListener.h"
35	35	#include "overlays/FadeoutText.h"
36	36

code/branches/pch/src/orxonox/overlays/hud/DeathMessage.h

r3158	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/GametypeMessageListener.h"
	34	#include "interfaces/GametypeMessageListener.h"
35	35	#include "overlays/FadeoutText.h"
36	36

code/branches/pch/src/orxonox/overlays/hud/GametypeStatus.h

r3144	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35	#include "overlays/OverlayText.h"
36	36

code/branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h

r3144	r3177
33	33
34	34	#include "util/Math.h"
35		#include "~~object~~s/Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36	#include "overlays/OverlayText.h"
37	37	#include "HUDBar.h"

code/branches/pch/src/orxonox/overlays/hud/HUDNavigation.h

r3158	r3177
33	33
34	34	#include <OgrePrerequisites.h>
35		#include "~~object~~s/Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36	#include "overlays/OrxonoxOverlay.h"
37	37

code/branches/pch/src/orxonox/overlays/hud/HUDRadar.h

-                      r3144
+                      r3177
 #include <OgrePrerequisites.h>
+#include "interfaces/RadarListener.h"
+#include "interfaces/RadarViewable.h"
 #include "overlays/OrxonoxOverlay.h"
-#include "objects/RadarListener.h"
-#include "objects/RadarViewable.h"
 namespace orxonox

code/branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h

r3144	r3177
33	33	#include "OrxonoxPrereqs.h"
34	34
35		#include "~~object~~s/Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36	#include "HUDBar.h"
37	37

code/branches/pch/src/orxonox/overlays/hud/HUDTimer.h

r3144	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35	#include "overlays/OverlayText.h"
36	36

code/branches/pch/src/orxonox/overlays/hud/KillMessage.h

r3158	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/GametypeMessageListener.h"
	34	#include "interfaces/GametypeMessageListener.h"
35	35	#include "overlays/FadeoutText.h"
36	36

code/branches/pch/src/orxonox/overlays/hud/PongScore.h

r3144	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35	#include "overlays/OverlayText.h"
36	36

code/branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h

r3144	r3177
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~object~~s/Tickable.h"
	34	#include "interfaces/Tickable.h"
35	35	#include "overlays/OverlayText.h"
36	36

code/branches/pch/src/orxonox/overlays/map/Map.cc

-                      r3172
+                      r3177
 #include "core/ObjectList.h"
 #include "core/XMLPort.h"
+#include "interfaces/RadarViewable.h"
 #include "objects/Scene.h"
-#include "objects/RadarViewable.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/worldentities/CameraPosition.h"

code/branches/pch/src/orxonox/overlays/map/Map.h

r3172	r3177
33	33
34	34	#include "util/UtilPrereqs.h"
35		#include "~~object~~s/Tickable.h"
	35	#include "interfaces/Tickable.h"
36	36	#include "overlays/OrxonoxOverlay.h"
37	37

code/branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h

-                      r3158
+                      r3177
 #include "util/Math.h"
 #include "orxonox/objects/Tickable.h"
 #include "orxonox/overlays/OverlayGroup.h"
+#include "interfaces/Tickable.h"
+#include "overlays/OverlayGroup.h"
 namespace orxonox

code/branches/pch/src/orxonox/overlays/stats/Scoreboard.h

-                      r3140
+                      r3177
 #include <string>
 #include <vector>
+#include "interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
 namespace orxonox

code/branches/pch/src/orxonox/overlays/stats/Stats.h

-                      r3140
+                      r3177
 #include "OrxonoxPrereqs.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
 namespace orxonox

code/branches/pch/src/orxonox/sound/SoundManager.h

r3156	r3177
31	31
32	32	#include <list>
33		#include "~~orxonox/object~~s/Tickable.h"
	33	#include "interfaces/Tickable.h"
34	34
35	35	namespace orxonox

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

-                      r3176
+                      r3177
   Mesh.cc
   ParticleInterface.cc
-  PawnListener.cc
   Shader.cc
   TextureGenerator.cc
-  TimeFactorListener.cc
   Timer.cc
-  WindowEventListener.cc
+)

code/branches/pch/src/orxonox/tools/ParticleInterface.h

r3158	r3177
33	33
34	34	#include <OgrePrerequisites.h>
35		#include "~~tool~~s/TimeFactorListener.h"
	35	#include "interfaces/TimeFactorListener.h"
36	36
37	37	#define getAllEmitters() \

code/branches/pch/src/orxonox/tools/Shader.h

r3131	r3177
37	37	#include <OgrePrerequisites.h>
38	38
39		#include "~~object~~s/Tickable.h"
	39	#include "interfaces/Tickable.h"
40	40
41	41	namespace orxonox

code/branches/pch/src/orxonox/tools/Timer.h

r3131	r3177
65	65	#include "core/Executor.h"
66	66	#include "core/OrxonoxClass.h"
67		#include "~~tool~~s/TimeFactorListener.h"
	67	#include "interfaces/TimeFactorListener.h"
68	68
69	69	namespace orxonox

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

Context Navigation

Changeset 3177

Legend:

Download in other formats: