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

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/overlays

Files:

• FadeoutText.h (modified) (1 diff)
• OrxonoxOverlay.h (modified) (1 diff)
• console/InGameConsole.h (modified) (1 diff)
• debug/DebugFPSText.h (modified) (1 diff)
• debug/DebugRTRText.h (modified) (1 diff)
• hud/AnnounceMessage.h (modified) (1 diff)
• hud/DeathMessage.h (modified) (1 diff)
• hud/GametypeStatus.h (modified) (1 diff)
• hud/HUDHealthBar.h (modified) (1 diff)
• hud/HUDNavigation.h (modified) (1 diff)
• hud/HUDRadar.h (modified) (1 diff)
• hud/HUDSpeedBar.h (modified) (1 diff)
• hud/HUDTimer.h (modified) (1 diff)
• hud/KillMessage.h (modified) (1 diff)
• hud/PongScore.h (modified) (1 diff)
• hud/TeamBaseMatchScore.h (modified) (1 diff)
• map/Map.cc (modified) (1 diff)
• map/Map.h (modified) (1 diff)
• notifications/NotificationQueue.h (modified) (1 diff)
• stats/Scoreboard.h (modified) (1 diff)
• stats/Stats.h (modified) (1 diff)

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