Changeset 3355 for code/branches/resource/src/orxonox

Timestamp:

Jul 26, 2009, 2:15:08 PM (15 years ago)

Author:

rgrieder

Message:

Loading and unloading graphics automatically: As soon as a GameState requires graphics (defined at the GameState declaration with a bool) it gets loaded. And vice versa.

Location:

code/branches/resource/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (1 diff)
• GSClient.h (modified) (1 diff)
• GSDedicated.cc (modified) (1 diff)
• GSDedicated.h (modified) (1 diff)
• GSGraphics.cc (modified) (3 diffs)
• GSGraphics.h (modified) (1 diff)
• GSIOConsole.cc (modified) (1 diff)
• GSIOConsole.h (modified) (1 diff)
• GSLevel.cc (modified) (1 diff)
• GSLevel.h (modified) (1 diff)
• GSMainMenu.cc (modified) (1 diff)
• GSMainMenu.h (modified) (1 diff)
• GSRoot.cc (modified) (2 diffs)
• GSRoot.h (modified) (1 diff)
• GSServer.cc (modified) (1 diff)
• GSServer.h (modified) (1 diff)
• GSStandalone.cc (modified) (1 diff)
• GSStandalone.h (modified) (1 diff)

code/branches/resource/src/orxonox/gamestates/GSClient.cc

@@ -42 +42 @@
     SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as strin in the form #.#.#.#");
 
-    GSClient::GSClient(const GameStateConstrParams& params)
-        : GameState(params)
+    GSClient::GSClient(const GameStateInfo& info)
+        : GameState(info)
         , client_(0)
     {

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

@@ -40 +40 @@
     {
     public:
-        GSClient(const GameStateConstrParams& params);
+        GSClient(const GameStateInfo& info);
         ~GSClient();
 

code/branches/resource/src/orxonox/gamestates/GSDedicated.cc

@@ -55 +55 @@
     termios* GSDedicated::originalTerminalSettings_;
 
-    GSDedicated::GSDedicated(const GameStateConstrParams& params)
-        : GameState(params)
+    GSDedicated::GSDedicated(const GameStateInfo& info)
+        : GameState(info)
         , server_(0)
         , closeThread_(false)

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

@@ -48 +48 @@
     {
     public:
-        GSDedicated(const GameStateConstrParams& params);
+        GSDedicated(const GameStateInfo& info);
         ~GSDedicated();
 

code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

@@ -57 +57 @@
     DeclareGameState(GSGraphics, "graphics", false, true);
 
-    GSGraphics::GSGraphics(const GameStateConstrParams& params)
-        : GameState(params)
+    GSGraphics::GSGraphics(const GameStateInfo& info)
+        : GameState(info)
         , console_(0)
         , soundManager_(0)
@@ -88 +88 @@
     void GSGraphics::activate()
     {
-        // Load OGRE, CEGUI and OIS
-        Core::getInstance().loadGraphics();
-
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
@@ -147 +144 @@
         // HACK: (destroys a resource smart pointer)
         Map::hackDestroyMap();
-
-        // Unload OGRE, CEGUI and OIS
-        Core::getInstance().loadGraphics();
     }
 

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

@@ -50 +50 @@
     {
     public:
-        GSGraphics(const GameStateConstrParams& params);
+        GSGraphics(const GameStateInfo& info);
         ~GSGraphics();
 

code/branches/resource/src/orxonox/gamestates/GSIOConsole.cc

@@ -38 +38 @@
     DeclareGameState(GSIOConsole, "ioConsole", false, false);
 
-    GSIOConsole::GSIOConsole(const GameStateConstrParams& params)
-        : GameState(params)
+    GSIOConsole::GSIOConsole(const GameStateInfo& info)
+        : GameState(info)
     {
     }

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

@@ -38 +38 @@
     {
     public:
-        GSIOConsole(const GameStateConstrParams& params);
+        GSIOConsole(const GameStateInfo& info);
         ~GSIOConsole();
 

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

@@ -60 +60 @@
     XMLFile* GSLevel::startFile_s = NULL;
 
-    GSLevel::GSLevel(const GameStateConstrParams& params)
-        : GameState(params)
+    GSLevel::GSLevel(const GameStateInfo& info)
+        : GameState(info)
         , keyBinder_(0)
         , gameInputState_(0)

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

@@ -41 +41 @@
     {
     public:
-        GSLevel(const GameStateConstrParams& params);
+        GSLevel(const GameStateInfo& info);
         ~GSLevel();
         void setConfigValues();

code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc

@@ -45 +45 @@
     DeclareGameState(GSMainMenu, "mainMenu", false, true);
 
-    GSMainMenu::GSMainMenu(const GameStateConstrParams& params)
-        : GameState(params)
+    GSMainMenu::GSMainMenu(const GameStateInfo& info)
+        : GameState(info)
         , inputState_(0)
     {

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

@@ -40 +40 @@
     {
     public:
-        GSMainMenu(const GameStateConstrParams& params);
+        GSMainMenu(const GameStateInfo& info);
         ~GSMainMenu();
 

code/branches/resource/src/orxonox/gamestates/GSRoot.cc

@@ -53 +53 @@
     SetCommandLineSwitch(standalone).information("Start in standalone mode");
 
-    GSRoot::GSRoot(const GameStateConstrParams& params)
-        : GameState(params)
+    GSRoot::GSRoot(const GameStateInfo& info)
+        : GameState(info)
         , timeFactor_(1.0f)
         , bPaused_(false)
@@ -174 +174 @@
     @brief
         Changes the speed of Orxonox
+    @remark
+        This function is a hack when placed here!
+        Timefactor should be related to the scene (level or so), not the game
     */
     void GSRoot::setTimeFactor(float factor)

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

@@ -38 +38 @@
     {
     public:
-        GSRoot(const GameStateConstrParams& params);
+        GSRoot(const GameStateInfo& info);
         ~GSRoot();
 

code/branches/resource/src/orxonox/gamestates/GSServer.cc

@@ -41 +41 @@
     SetCommandLineArgument(port, 55556).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
 
-    GSServer::GSServer(const GameStateConstrParams& params)
-        : GameState(params)
+    GSServer::GSServer(const GameStateInfo& info)
+        : GameState(info)
         , server_(0)
     {

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

@@ -40 +40 @@
     {
     public:
-        GSServer(const GameStateConstrParams& params);
+        GSServer(const GameStateInfo& info);
         ~GSServer();
 

code/branches/resource/src/orxonox/gamestates/GSStandalone.cc

@@ -36 +36 @@
     DeclareGameState(GSStandalone, "standalone", false, true);
 
-    GSStandalone::GSStandalone(const GameStateConstrParams& params)
-        : GameState(params)
+    GSStandalone::GSStandalone(const GameStateInfo& info)
+        : GameState(info)
     {
     }

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

@@ -38 +38 @@
     {
     public:
-        GSStandalone(const GameStateConstrParams& params);
+        GSStandalone(const GameStateInfo& info);
         ~GSStandalone();