Changeset 5693 for code/trunk/src/orxonox/overlays

Timestamp:

Aug 29, 2009, 10:19:38 PM (15 years ago)

Author:

landauf

Message:

merged libraries branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/overlays/FadeoutText.h (modified) (1 diff)
• src/orxonox/overlays/GUIOverlay.cc (modified) (2 diffs)
• src/orxonox/overlays/GUIOverlay.h (modified) (3 diffs)
• src/orxonox/overlays/OverlayText.h (modified) (2 diffs)
• src/orxonox/overlays/OverlaysPrereqs.h (copied) (copied from code/branches/libraries/src/orxonox/overlays/OverlaysPrereqs.h)
• src/orxonox/overlays/console (deleted)
• src/orxonox/overlays/debug/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/debug/DebugFPSText.h (modified) (1 diff)
• src/orxonox/overlays/debug/DebugRTRText.h (modified) (1 diff)
• src/orxonox/overlays/hud/AnnounceMessage.h (modified) (2 diffs)
• src/orxonox/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/hud/ChatOverlay.h (modified) (2 diffs)
• src/orxonox/overlays/hud/DeathMessage.h (modified) (2 diffs)
• src/orxonox/overlays/hud/GametypeStatus.h (modified) (1 diff)
• src/orxonox/overlays/hud/HUDBar.h (modified) (3 diffs)
• src/orxonox/overlays/hud/HUDHealthBar.h (modified) (2 diffs)
• src/orxonox/overlays/hud/HUDNavigation.h (modified) (1 diff)
• src/orxonox/overlays/hud/HUDRadar.h (modified) (2 diffs)
• src/orxonox/overlays/hud/HUDSpeedBar.h (modified) (1 diff)
• src/orxonox/overlays/hud/HUDTimer.h (modified) (1 diff)
• src/orxonox/overlays/hud/KillMessage.h (modified) (2 diffs)
• src/orxonox/overlays/hud/PongScore.h (modified) (1 diff)
• src/orxonox/overlays/hud/TeamBaseMatchScore.h (modified) (1 diff)
• src/orxonox/overlays/hud/UnderAttackHealthBar.h (modified) (2 diffs)
• src/orxonox/overlays/map (deleted)
• src/orxonox/overlays/notifications (deleted)
• src/orxonox/overlays/stats/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/stats/CreateLines.h (modified) (1 diff)
• src/orxonox/overlays/stats/Scoreboard.h (modified) (1 diff)
• src/orxonox/overlays/stats/Stats.h (modified) (1 diff)

code/trunk/src/orxonox/overlays/CMakeLists.txt

@@ -2 +2 @@
   OrxonoxOverlay.cc
   OverlayGroup.cc
+)
+
+SET_SOURCE_FILES(OVERLAYS_SRC_FILES
   OverlayText.cc
   FadeoutText.cc
@@ -7 +10 @@
 )
 
-ADD_SUBDIRECTORY(console)
 ADD_SUBDIRECTORY(debug)
 ADD_SUBDIRECTORY(hud)
-ADD_SUBDIRECTORY(map)
-ADD_SUBDIRECTORY(notifications)
 ADD_SUBDIRECTORY(stats)
 
+ORXONOX_ADD_LIBRARY(overlays
+  MODULE
+  FIND_HEADER_FILES
+  DEFINE_SYMBOL
+    "OVERLAYS_SHARED_BUILD"
+  PCH_FILE
+    ../OrxonoxPrecompiledHeaders.h
+  LINK_LIBRARIES
+    orxonox
+  SOURCE_FILES ${OVERLAYS_SRC_FILES}
+)

code/trunk/src/orxonox/overlays/FadeoutText.h

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

code/trunk/src/orxonox/overlays/GUIOverlay.cc

@@ -36 +36 @@
 #include "core/GUIManager.h"
 #include "core/XMLPort.h"
+#include "objects/infos/PlayerInfo.h"
 
 namespace orxonox
@@ -79 +80 @@
     }
 
+    void GUIOverlay::setGUIName(const std::string& name)
+    {
+        this->guiName_ = name;
+        GUIManager::getInstance().setPlayer(name, orxonox_cast<PlayerInfo*>(this->getOwner()));
+    }
 }

code/trunk/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:
@@ -46 +46 @@
             virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-            inline void setGUIName(const std::string& name) { this->guiName_ = name; }
+            void setGUIName(const std::string& name);
             inline const std::string& getGUIName() const { return this->guiName_; }
 

code/trunk/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/trunk/src/orxonox/overlays/debug/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(OVERLAYS_SRC_FILES
   DebugFPSText.cc
   DebugRTRText.cc

code/trunk/src/orxonox/overlays/debug/DebugFPSText.h

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

code/trunk/src/orxonox/overlays/debug/DebugRTRText.h

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

code/trunk/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/trunk/src/orxonox/overlays/hud/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(OVERLAYS_SRC_FILES
   HUDBar.cc
   HUDNavigation.cc

code/trunk/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/trunk/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/trunk/src/orxonox/overlays/hud/GametypeStatus.h

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

code/trunk/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/trunk/src/orxonox/overlays/hud/HUDHealthBar.h

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

code/trunk/src/orxonox/overlays/hud/HUDNavigation.h

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

code/trunk/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/trunk/src/orxonox/overlays/hud/HUDSpeedBar.h

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

code/trunk/src/orxonox/overlays/hud/HUDTimer.h

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

code/trunk/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/trunk/src/orxonox/overlays/hud/PongScore.h

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

code/trunk/src/orxonox/overlays/hud/TeamBaseMatchScore.h

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

code/trunk/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/trunk/src/orxonox/overlays/stats/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(OVERLAYS_SRC_FILES
   CreateLines.cc
   Scoreboard.cc

code/trunk/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/trunk/src/orxonox/overlays/stats/Scoreboard.h

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

code/trunk/src/orxonox/overlays/stats/Stats.h

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