Changeset 5638

Timestamp:

Aug 12, 2009, 5:13:28 PM (15 years ago)

Author:

landauf

Message:

Put all gamestates into a new plugin (gamestates)

Location:

code/branches/libraries/src/orxonox/gamestates

Files:

• CMakeLists.txt (modified) (2 diffs)
• GSClient.h (modified) (2 diffs)
• GSDedicated.h (modified) (4 diffs)
• GSGraphics.h (modified) (2 diffs)
• GSIOConsole.h (modified) (1 diff)
• GSLevel.h (modified) (2 diffs)
• GSMainMenu.h (modified) (2 diffs)
• GSRoot.h (modified) (1 diff)
• GSServer.h (modified) (2 diffs)
• GSStandalone.h (modified) (1 diff)
• GamestatesPrereqs.h (added)

code/branches/libraries/src/orxonox/gamestates/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+SET_SOURCE_FILES(GAMESTATES_SRC_FILES
   GSClient.cc
   GSDedicated.cc
@@ -10 +10 @@
   GSStandalone.cc
 )
+
+ORXONOX_ADD_LIBRARY(gamestates
+  PLUGIN
+  DEFINE_SYMBOL
+    "GAMESTATES_SHARED_BUILD"
+  LINK_LIBRARIES
+    orxonox
+  SOURCE_FILES ${GAMESTATES_SRC_FILES}
+)

code/branches/libraries/src/orxonox/gamestates/GSClient.h

@@ -30 +30 @@
 #define _GSClient_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 
 #include "core/GameState.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSClient : public GameState
+    class _GamestatesExport GSClient : public GameState
     {
     public:

code/branches/libraries/src/orxonox/gamestates/GSDedicated.h

@@ -30 +30 @@
 #define _GSDedicated_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 
 #include "core/GameState.h"
@@ -44 +44 @@
 namespace orxonox
 {
-    
-    class _OrxonoxExport GSDedicated : public GameState
+
+    class _GamestatesExport GSDedicated : public GameState
     {
     public:
@@ -61 +61 @@
         void setTerminalMode();
         static void resetTerminalMode();
-        
+
         void insertCharacter( unsigned int position, char c );
         void deleteCharacter( unsigned int position );
-        
+
         Server*                 server_;
-        
+
         boost::thread           *inputThread_;
         boost::recursive_mutex  inputLineMutex_;
@@ -76 +76 @@
         std::queue<std::string> commandQueue_;
         static termios*         originalTerminalSettings_;
-        
+
         unsigned int            cursorX_;
         unsigned int            cursorY_;

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

@@ -36 +36 @@
 #define _GSGraphics_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 #include "core/GameState.h"
 
@@ -47 +47 @@
         This game state is only left out if we start a dedicated server where no graphics are present.
     */
-    class _OrxonoxExport GSGraphics : public GameState
+    class _GamestatesExport GSGraphics : public GameState
     {
     public:

code/branches/libraries/src/orxonox/gamestates/GSIOConsole.h

@@ -30 +30 @@
 #define _GSIOConsole_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 #include "core/GameState.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSIOConsole : public GameState
+    class _GamestatesExport GSIOConsole : public GameState
     {
     public:

code/branches/libraries/src/orxonox/gamestates/GSLevel.h

@@ -30 +30 @@
 #define _GSLevel_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSLevel : public GameState, public OrxonoxClass
+    class _GamestatesExport GSLevel : public GameState, public OrxonoxClass
     {
     public:

code/branches/libraries/src/orxonox/gamestates/GSMainMenu.h

@@ -30 +30 @@
 #define _GSMainMenu_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 
 #include "util/OgreForwardRefs.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSMainMenu : public GameState
+    class _GamestatesExport GSMainMenu : public GameState
     {
     public:

code/branches/libraries/src/orxonox/gamestates/GSRoot.h

@@ -30 +30 @@
 #define _GSRoot_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 #include "core/GameState.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSRoot : public GameState
+    class _GamestatesExport GSRoot : public GameState
     {
     public:

code/branches/libraries/src/orxonox/gamestates/GSServer.h

@@ -30 +30 @@
 #define _GSServer_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 
 #include "core/GameState.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSServer : public GameState
+    class _GamestatesExport GSServer : public GameState
     {
     public:

code/branches/libraries/src/orxonox/gamestates/GSStandalone.h

@@ -30 +30 @@
 #define _GSStandalone_H__
 
-#include "OrxonoxPrereqs.h"
+#include "gamestates/GamestatesPrereqs.h"
 #include "core/GameState.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSStandalone : public GameState
+    class _GamestatesExport GSStandalone : public GameState
     {
     public: