Changeset 1662 for code/branches/gui/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Aug 19, 2008, 8:12:15 PM (16 years ago)

Author:

rgrieder

Message:

• Changed static Executor/Functor in ConsoleCommand to generic one that enables console commands for member functions. (This is more of a temporary solution, but can be made permanent with right adjustments)
• The whole GameState thing seems to works so far. But I there's only standalone mode at the moment
• Console now shows in GUI too. I will have to implement a master InputState in the InputManager (little bit of a break with the concept, but probably necessary)

File:

• code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) (6 diffs)

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

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Fabian 'x3n' Landau
  *
  */
@@ -30 +30 @@
 #include "GSLevel.h"
 
-#include "GraphicsEngine.h"
 #include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
 #include "core/input/KeyBinder.h"
+#include "core/Loader.h"
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
+#include "objects/Backlight.h"
+#include "tools/ParticleInterface.h"
+#include "Radar.h"
+#include "Settings.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -43 +48 @@
         : GameState("level")
         , timefactor_(1.0f)
+        , keyBinder_(0)
+        , radar_(0)
+        , startLevel_(0)
+        , hud_(0)
     {
     }
@@ -52 +61 @@
     void GSLevel::enter()
     {
-        KeyBinder* keyBinder = new KeyBinder();
-        keyBinder->loadBindings();
-        InputManager::getInstance().createInputState<SimpleInputState>("game", 20)->setHandler(keyBinder);
+        keyBinder_ = new KeyBinder();
+        keyBinder_->loadBindings();
+        InputManager::getInstance().createInputState<SimpleInputState>("game", 20)->setHandler(keyBinder_);
+
+        // create Ogre SceneManager for the level
+        GraphicsEngine::getInstance().createNewScene();
+
+        // Start the Radar
+        this->radar_ = new Radar();
+
+        // Load the HUD
+        COUT(3) << "Orxonox: Loading HUD" << std::endl;
+        hud_ = new Level(Settings::getDataPath() + "overlay/hud.oxo");
+        Loader::load(hud_);
+
+        // call the loader
+        COUT(0) << "Loading level..." << std::endl;
+        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
+        Loader::open(startLevel_);
 
         // add console commands
-        //ConsoleCommand* command = createConsoleCommand(createFunctor(&classname::function), )
-        //CommandExecutor::addConsoleCommandShortcut(command);
+        FunctorMember<GSLevel>* functor = createFunctor(&GSLevel::setTimeFactor);
+        functor->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "setTimeFactor"));
+
+        // level is loaded: we can start capturing the input
+        InputManager::getInstance().requestEnterState("game");
     }
 
     void GSLevel::leave()
     {
+        InputManager::getInstance().requestLeaveState("game");
+
+        // TODO: Remove and destroy console command
+
+        Loader::unload(startLevel_);
+        delete this->startLevel_;
+
+        Loader::unload(hud_);
+        delete this->hud_;
+
+        // this call will delete every BaseObject!
+        // But currently this will call methods of objects that exist no more
+        // The only 'memory leak' is the ParticleSpawer. They would be deleted here
+        // and call a sceneNode method that has already been destroy by the corresponding space ship.
+        //Loader::close();
+
+        delete this->radar_;
+
+        // TODO: delete SceneManager
+
+        InputManager::getInstance().destroyState("game");
+        delete this->keyBinder_;
     }
 
@@ -74 +125 @@
             it->tick(dt * this->timefactor_);
 
+        // TODO: split file into server/client/standalone
         // call server/client with normal dt
         //if (client_g)
@@ -87 +139 @@
         Changes the speed of Orxonox
     */
-    //void GSLevel::setTimeFactor(float factor)
-    //{
-    //    float change = factor / Orxonox::getInstance().getTimeFactor();
-    //    Orxonox::getInstance().timefactor_ = factor;
-    //    for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
-    //        it->setSpeedFactor(it->getSpeedFactor() * change);
+    void GSLevel::setTimeFactor(float factor)
+    {
+        float change = factor / this->timefactor_;
+        this->timefactor_ = factor;
+        for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
+            it->setSpeedFactor(it->getSpeedFactor() * change);
 
-    //    for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
-    //        it->setTimeFactor(Orxonox::getInstance().getTimeFactor());
-    //}
+        for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
+            it->setTimeFactor(timefactor_);
+    }
 }