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:

• 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)

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

@@ -28 +28 @@
 ADD_SUBDIRECTORY(gamestates)
 ADD_SUBDIRECTORY(gui)
+ADD_SUBDIRECTORY(interfaces)
 ADD_SUBDIRECTORY(objects)
 ADD_SUBDIRECTORY(overlays)

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

@@ -63 +63 @@
 #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

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

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

@@ -39 +39 @@
 
 #include "core/GameState.h"
-#include "tools/WindowEventListener.h"
+#include "interfaces/WindowEventListener.h"
 
 namespace orxonox

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

@@ -44 +44 @@
 #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

@@ -34 +34 @@
 #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

@@ -27 +27 @@
  */
 
+/**
+@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

@@ -3 +3 @@
   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

@@ -39 +39 @@
 #include "core/ConsoleCommand.h"
 #include "core/ObjectList.h"
-#include "RadarListener.h"
+#include "interfaces/RadarListener.h"
 
 namespace orxonox

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

@@ -41 +41 @@
 
 #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

@@ -41 +41 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 
 namespace orxonox

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

@@ -33 +33 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "Tickable.h"
+#include "interfaces/Tickable.h"
 
 

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

@@ -33 +33 @@
 
 #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

@@ -33 +33 @@
 
 #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

@@ -34 +34 @@
 #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

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

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

@@ -37 +37 @@
 #include "core/Identifier.h"
 #include "objects/worldentities/ControllableEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "objects/infos/GametypeInfo.h"
 

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

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
 #include "objects/worldentities/TeamSpawnPoint.h"
 

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

@@ -33 +33 @@
 
 #include "TeamDeathmatch.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "interfaces/PawnListener.h"
 
 namespace orxonox

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

@@ -33 +33 @@
 #include "network/NetworkFunction.h"
 #include "network/Host.h"
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
 
 namespace orxonox

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

@@ -33 +33 @@
 
 #include "Item.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "util/Math.h"
 

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

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

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

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

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "interfaces/PawnListener.h"
 #include "objects/worldentities/MovableEntity.h"
 #include "objects/worldentities/pawns/Pawn.h"

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"

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

@@ -33 +33 @@
 
 #include "tools/Timer.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

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

@@ -42 +42 @@
 #include "util/Math.h"
 #include "core/BaseObject.h"
-#include "tools/WindowEventListener.h"
+#include "interfaces/WindowEventListener.h"
 
 namespace orxonox

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

@@ -35 +35 @@
 #include <string>
 #include "core/Shell.h"
-#include "tools/WindowEventListener.h"
+#include "interfaces/WindowEventListener.h"
 
 namespace orxonox

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
 #include "overlays/FadeoutText.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
 #include "overlays/FadeoutText.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

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

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 #include "HUDBar.h"

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

@@ -33 +33 @@
 
 #include <OgrePrerequisites.h>
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
 

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

@@ -37 +37 @@
 #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

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "HUDBar.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
 #include "overlays/FadeoutText.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

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

@@ -53 +53 @@
 #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

@@ -33 +33 @@
 
 #include "util/UtilPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
 

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

@@ -43 +43 @@
 
 #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

@@ -33 +33 @@
 #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

@@ -32 +32 @@
 #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

@@ -31 +31 @@
 
 #include <list>
-#include "orxonox/objects/Tickable.h"
+#include "interfaces/Tickable.h"
 
 namespace orxonox

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

@@ -5 +5 @@
   Mesh.cc
   ParticleInterface.cc
-  PawnListener.cc
   Shader.cc
   TextureGenerator.cc
-  TimeFactorListener.cc
   Timer.cc
-  WindowEventListener.cc
 )

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

@@ -33 +33 @@
 
 #include <OgrePrerequisites.h>
-#include "tools/TimeFactorListener.h"
+#include "interfaces/TimeFactorListener.h"
 
 #define getAllEmitters() \

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

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

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

@@ -65 +65 @@
 #include "core/Executor.h"
 #include "core/OrxonoxClass.h"
-#include "tools/TimeFactorListener.h"
+#include "interfaces/TimeFactorListener.h"
 
 namespace orxonox