Changeset 3245 for code/branches/core4

Timestamp:

Jun 29, 2009, 1:32:40 PM (16 years ago)

Author:

rgrieder

Message:

Moved Game::getLevel to LevelManager::getStartLevel and Game::setLevel to LevelManager::setStartLevel.

Location:

code/branches/core4/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/Game.cc (modified) (1 diff)
• core/Game.h (modified) (4 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (4 diffs)
• orxonox/LevelManager.h (modified) (3 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (4 diffs)
• orxonox/gamestates/GSLevel.h (modified) (1 diff)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (3 diffs)
• orxonox/gamestates/GSRoot.h (modified) (1 diff)

code/branches/core4/src/core/CMakeLists.txt

@@ -68 +68 @@
   TOLUA_FILES
     CommandExecutor.h
-    Game.h
     LuaBind.h
   DEFINE_SYMBOL

code/branches/core4/src/core/Game.cc

@@ -149 +149 @@
         SetConfigValue(statisticsAvgLength_, 1000000)
             .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
-        SetConfigValue(levelName_, "presentation_dm.oxw")
-            .description("Sets the preselection of the level in the main menu.");
-    }
-
-    void Game::setLevel(std::string levelName)
-    {
-        ModifyConfigValue(levelName_, set, levelName);
-    }
-
-    std::string Game::getLevel()
-    {
-        std::string levelName;
-        CommandLine::getValue("level", &levelName);
-        if (levelName == "")
-            return levelName_;
-        else
-            return levelName;
     }
 

code/branches/core4/src/core/Game.h

@@ -64 +64 @@
         Main class responsible for running the game.
     */
-    class _CoreExport Game
-    // tolua_end
-        : public OrxonoxClass
-    // tolua_begin
+    class _CoreExport Game : public OrxonoxClass
     {
-    //tolua_end
     public:
         Game(int argc, char** argv);
@@ -94 +90 @@
         template <class T>
         static bool declareGameState(const std::string& className, const std::string& stateName, bool bIgnoreTickTime, bool bConsoleMode);
-        static Game& getInstance() { assert(singletonRef_s); return *singletonRef_s; } //tolua_export
-
-        void setLevel(std::string levelName); //tolua_export
-        std::string getLevel(); //tolua_export
+        static Game& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
     private:
@@ -163 +156 @@
         unsigned int                    statisticsRefreshCycle_;
         unsigned int                    statisticsAvgLength_;
-        std::string                     levelName_;
 
         static std::map<std::string, GameStateInfo> gameStateDeclarations_s;
         static Game* singletonRef_s;        //!< Pointer to the Singleton
-    }; // tolua_export
+    };
 
     template <class T>
@@ -193 +185 @@
         return true;
     }
-} // tolua_export
+}
 
 #endif /* _Game_H__ */

code/branches/core4/src/orxonox/CMakeLists.txt

@@ -42 +42 @@
   FIND_HEADER_FILES
   TOLUA_FILES
+    LevelManager.h
     gui/GUIManager.h
     objects/pickup/BaseItem.h

code/branches/core4/src/orxonox/LevelManager.cc

@@ -30 +30 @@
 
 #include <map>
+
+#include "core/CommandLine.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "PlayerManager.h"
 #include "objects/Level.h"
@@ -42 +46 @@
         assert(singletonRef_s == 0);
         singletonRef_s = this;
+
+        RegisterRootObject(LevelManager);
+        this->setConfigValues();
+
+        // check override
+        if (!CommandLine::getArgument("level")->hasDefaultValue())
+        {
+            ModifyConfigValue(startLevelName_, tset, CommandLine::getValue("mediaPath").getString());
+        }
     }
 
@@ -48 +61 @@
         assert(singletonRef_s != 0);
         singletonRef_s = 0;
+    }
+
+    void LevelManager::setConfigValues()
+    {
+        SetConfigValue(startLevelName_, "presentation_dm.oxw")
+            .description("Sets the preselection of the level in the main menu.");
     }
 
@@ -93 +112 @@
         }
     }
+
+    void LevelManager::setStartLevel(const std::string& levelName)
+    {
+        ModifyConfigValue(startLevelName_, set, levelName);
+    }
+
+    const std::string& LevelManager::getStartLevel()
+    {
+        return startLevelName_;
+    }
 }

code/branches/core4/src/orxonox/LevelManager.h

@@ -34 +34 @@
 #include <cassert>
 #include <list>
+#include "core/OrxonoxClass.h"
 
+// tolua_begin
 namespace orxonox
 {
     class _OrxonoxExport LevelManager
-    {
+    // tolua_end
+        : public OrxonoxClass
+    { // tolua_export
         public:
             LevelManager();
             virtual ~LevelManager();
+
+            void setConfigValues();
 
             void requestActivity(Level* level);
@@ -47 +53 @@
             Level* getActiveLevel();
 
+            void setStartLevel(const std::string& levelName); //tolua_export
+            const std::string& getStartLevel(); //tolua_export
+
             static LevelManager* getInstancePtr() { return singletonRef_s; }
-            static LevelManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
+            static LevelManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
 
         private:
@@ -57 +66 @@
             std::list<Level*> levels_s;
 
+            // config values
+            std::string startLevelName_;
+
             static LevelManager* singletonRef_s;
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _LevelManager_H__ */

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

@@ -71 +71 @@
         , radar_(0)
         , cameraManager_(0)
-        , levelManager_(0)
     {
         RegisterObject(GSLevel);
@@ -120 +119 @@
         if (GameMode::isMaster())
         {
-            // create the global LevelManager
-            this->levelManager_ = new LevelManager();
-
             this->loadLevel();
         }
@@ -202 +198 @@
         }
 
-        if (this->levelManager_)
-        {
-            delete this->levelManager_;
-            this->levelManager_ = 0;
-        }
-
         if (this->playerManager_)
         {
@@ -255 +245 @@
         CommandLine::getValue("level", &levelName);
         if (levelName == "")
-            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + Game::getInstance().getLevel());
+            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getStartLevel());
         else
             startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);

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

@@ -68 +68 @@
         Radar*                radar_;                   //!< represents the Radar (not the HUD part)
         CameraManager*        cameraManager_;           //!< camera manager for this level
-        LevelManager*         levelManager_;            //!< global level manager
         PlayerManager*        playerManager_;           //!< player manager for this level
         QuestManager*         questManager_;

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

@@ -67 +67 @@
 
         // show main menu
-        GUIManager::getInstance().showGUI("mainmenu_2");
+        GUIManager::getInstance().showGUI("mainmenu_3");
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);

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

@@ -37 +37 @@
 #include "interfaces/TimeFactorListener.h"
 #include "interfaces/Tickable.h"
+#include "LevelManager.h"
 
 namespace orxonox
@@ -83 +84 @@
         }
 
+        // create the global LevelManager
+        this->levelManager_ = new LevelManager();
+
         // Load level directly?
         bool loadLevel = false;
@@ -129 +133 @@
         }
 */
+
+        delete this->levelManager_;
     }
 

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

@@ -52 +52 @@
 
     private:
-        float                 timeFactor_;       //!< A factor that sets the gamespeed. 1 is normal.
+        float                 timeFactor_;              //!< A factor that sets the gamespeed. 1 is normal.
         bool                  bPaused_;
         float                 timeFactorPauseBackup_;
+
+        LevelManager*         levelManager_;            //!< global level manager
 
         // console commands