Changeset 5630 for code/branches

Timestamp:

Aug 12, 2009, 12:59:51 AM (15 years ago)

Author:

landauf

Message:

added OverlaysPrereqs.h
added _OverlaysExport macro

Location:

code/branches/libraries/src/orxonox/overlays

Files:

• FadeoutText.h (modified) (2 diffs)
• GUIOverlay.h (modified) (2 diffs)
• OverlayText.h (modified) (2 diffs)
• OverlaysPrereqs.h (added)
• debug/DebugFPSText.h (modified) (2 diffs)
• debug/DebugRTRText.h (modified) (2 diffs)
• hud/AnnounceMessage.h (modified) (2 diffs)
• hud/ChatOverlay.h (modified) (2 diffs)
• hud/DeathMessage.h (modified) (2 diffs)
• hud/GametypeStatus.h (modified) (2 diffs)
• hud/HUDBar.h (modified) (3 diffs)
• hud/HUDHealthBar.h (modified) (2 diffs)
• hud/HUDNavigation.h (modified) (2 diffs)
• hud/HUDRadar.h (modified) (2 diffs)
• hud/HUDSpeedBar.h (modified) (2 diffs)
• hud/HUDTimer.h (modified) (2 diffs)
• hud/KillMessage.h (modified) (2 diffs)
• hud/PongScore.h (modified) (2 diffs)
• hud/TeamBaseMatchScore.h (modified) (2 diffs)
• hud/UnderAttackHealthBar.h (modified) (2 diffs)
• notifications/NotificationOverlay.h (modified) (4 diffs)
• notifications/NotificationQueue.h (modified) (2 diffs)
• stats/CreateLines.h (modified) (1 diff)
• stats/Scoreboard.h (modified) (2 diffs)
• stats/Stats.h (modified) (2 diffs)

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

@@ -30 +30 @@
 #define _FadeoutText_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "tools/Timer.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport FadeoutText : public OverlayText, public Tickable
+    class _OverlaysExport FadeoutText : public OverlayText, public Tickable
     {
         public:

code/branches/libraries/src/orxonox/overlays/GUIOverlay.h

@@ -30 +30 @@
 #define _GUIOverlay_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <string>
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GUIOverlay : public OrxonoxOverlay
+    class _OverlaysExport GUIOverlay : public OrxonoxOverlay
     {
         public:

code/branches/libraries/src/orxonox/overlays/OverlayText.h

@@ -30 +30 @@
 #define _OverlayText_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <string>
@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport OverlayText : public OrxonoxOverlay
+    class _OverlaysExport OverlayText : public OrxonoxOverlay
     {
     public:

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

@@ -30 +30 @@
 #define _DebugFPSText_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/Tickable.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport DebugFPSText : public OverlayText, public Tickable
+    class _OverlaysExport DebugFPSText : public OverlayText, public Tickable
     {
     public:

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

@@ -30 +30 @@
 #define _DebugRTRText_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/Tickable.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport DebugRTRText : public OverlayText, public Tickable
+    class _OverlaysExport DebugRTRText : public OverlayText, public Tickable
     {
     public:

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

@@ -30 +30 @@
 #define _AnnounceMessage_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/GametypeMessageListener.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport AnnounceMessage : public FadeoutText, public GametypeMessageListener
+    class _OverlaysExport AnnounceMessage : public FadeoutText, public GametypeMessageListener
     {
         public:

code/branches/libraries/src/orxonox/overlays/hud/ChatOverlay.h

@@ -30 +30 @@
 #define _ChatOverlay_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <list>
@@ -40 +40 @@
 namespace orxonox
 {
-    class _OrxonoxExport ChatOverlay : public OverlayText, public ChatListener
+    class _OverlaysExport ChatOverlay : public OverlayText, public ChatListener
     {
         public:

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

@@ -30 +30 @@
 #define _DeathMessage_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/GametypeMessageListener.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport DeathMessage : public FadeoutText, public GametypeMessageListener
+    class _OverlaysExport DeathMessage : public FadeoutText, public GametypeMessageListener
     {
         public:

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

@@ -30 +30 @@
 #define _GametypeStatus_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/Tickable.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GametypeStatus : public OverlayText, public Tickable
+    class _OverlaysExport GametypeStatus : public OverlayText, public Tickable
     {
         public:

code/branches/libraries/src/orxonox/overlays/hud/HUDBar.h

@@ -32 +32 @@
 #define _HUDBar_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <map>
@@ -44 +44 @@
 namespace orxonox
 {
-    class _OrxonoxExport BarColour : public BaseObject
+    class _OverlaysExport BarColour : public BaseObject
     {
     public:
@@ -64 +64 @@
 
 
-    class _OrxonoxExport HUDBar : public OrxonoxOverlay
+    class _OverlaysExport HUDBar : public OrxonoxOverlay
     {
     public:

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

@@ -30 +30 @@
 #define _HUDHealthBar_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "util/Math.h"
@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport HUDHealthBar : public HUDBar, public Tickable
+    class _OverlaysExport HUDHealthBar : public HUDBar, public Tickable
     {
         public:

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

@@ -30 +30 @@
 #define _HUDNavigation_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "util/OgreForwardRefs.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport HUDNavigation : public OrxonoxOverlay, public Tickable
+    class _OverlaysExport HUDNavigation : public OrxonoxOverlay, public Tickable
     {
     public:

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

@@ -31 +31 @@
 #define _HUDRadar_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <map>
@@ -43 +43 @@
 namespace orxonox
 {
-    class _OrxonoxExport HUDRadar : public OrxonoxOverlay, public RadarListener
+    class _OverlaysExport HUDRadar : public OrxonoxOverlay, public RadarListener
     {
     public:

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

@@ -31 +31 @@
 #define _HUDSpeedBar_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/Tickable.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport HUDSpeedBar : public HUDBar, public Tickable
+    class _OverlaysExport HUDSpeedBar : public HUDBar, public Tickable
     {
     public:

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

@@ -30 +30 @@
 #define _HUDTimer_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/Tickable.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport HUDTimer : public OverlayText, public Tickable
+    class _OverlaysExport HUDTimer : public OverlayText, public Tickable
     {
     public:

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

@@ -30 +30 @@
 #define _KillMessage_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/GametypeMessageListener.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport KillMessage : public FadeoutText, public GametypeMessageListener
+    class _OverlaysExport KillMessage : public FadeoutText, public GametypeMessageListener
     {
         public:

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

@@ -30 +30 @@
 #define _PongScore_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/Tickable.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport PongScore : public OverlayText, public Tickable
+    class _OverlaysExport PongScore : public OverlayText, public Tickable
     {
         public:

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

@@ -30 +30 @@
 #define _TeamBaseMatchScore_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "interfaces/Tickable.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport TeamBaseMatchScore : public OverlayText, public Tickable
+    class _OverlaysExport TeamBaseMatchScore : public OverlayText, public Tickable
     {
         public:

code/branches/libraries/src/orxonox/overlays/hud/UnderAttackHealthBar.h

@@ -30 +30 @@
 #define _UnderAttackHealthBar_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "util/Math.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport UnderAttackHealthBar : public HUDHealthBar
+    class _OverlaysExport UnderAttackHealthBar : public HUDHealthBar
     {
         public:

code/branches/libraries/src/orxonox/overlays/notifications/NotificationOverlay.h

@@ -36 +36 @@
 #define _NotificationOverlay_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <string>
@@ -50 +50 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport NotificationOverlay : public OverlayText
+    class _OverlaysExport NotificationOverlay : public OverlayText
     {
 
@@ -57 +57 @@
             NotificationOverlay(NotificationQueue* queue, Notification* notification);
             virtual ~NotificationOverlay();
-            
+
             bool processNotification(Notification* notification); //!< Processes the input Notification.
 
@@ -66 +66 @@
             inline void setFontSize(float size)
                 { this->setTextSize(size); }
-        
+
         protected:
             std::string clipMessage(const std::string & message); //!< Clips the input message if too long.

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

@@ -35 +35 @@
 #define _NotificationOueue_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <ctime>
@@ -85 +85 @@
     */
 
-    class _OrxonoxExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
+    class _OverlaysExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
     {
 

code/branches/libraries/src/orxonox/overlays/stats/CreateLines.h

@@ -28 +28 @@
 #define _CreateLines_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CreateLines
+    class _OverlaysExport CreateLines
     {
 

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

@@ -29 +29 @@
 
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport Scoreboard : public OrxonoxOverlay, public Tickable
+    class _OverlaysExport Scoreboard : public OrxonoxOverlay, public Tickable
     {
     public: // functions

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

@@ -30 +30 @@
 #define _Stats_H__
 
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
 
 #include "util/OgreForwardRefs.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport Stats : public OrxonoxOverlay, public Tickable
+    class _OverlaysExport Stats : public OrxonoxOverlay, public Tickable
     {
     public: // functions