Changeset 10281 for code/trunk

Timestamp:

Feb 24, 2015, 10:54:24 PM (10 years ago)

Author:

landauf

Message:

added command 'reloadLevel' (by default on F5) which reloads the level while the player's camera remains at the same position

Location:

code/trunk

Files:

• data/defaultConfig/keybindings.ini (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (7 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevelMemento.h (added)
• src/orxonox/gametypes/Gametype.cc (modified) (2 diffs)
• src/orxonox/gametypes/Gametype.h (modified) (4 diffs)

code/trunk/data/defaultConfig/keybindings.ini

@@ -35 +35 @@
 KeyF3="OrxonoxOverlay show QuestGUI"
 KeyF4="OrxonoxOverlay show PickupInventory"
-KeyF5="startchat"
-KeyF6=
+KeyF5="reloadLevel"
+KeyF6="startchat"
 KeyF7=
 KeyF8=

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -77 +77 @@
     class Radar;
     class Scene;
+    class GSLevelMemento;
+    struct GSLevelMementoState;
 
     // chat

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -29 +29 @@
 
 #include "GSLevel.h"
+#include "GSLevelMemento.h"
 
 #include <OgreCompositorManager.h>
@@ -37 +38 @@
 #include "core/input/KeyBinderManager.h"
 #include "core/Core.h"
+#include "core/CoreIncludes.h"
 #include "core/Game.h"
 #include "core/GameMode.h"
@@ -54 +56 @@
     static const std::string __CC_startMainMenu_name = "startMainMenu";
     static const std::string __CC_changeGame_name = "changeGame";
+    static const std::string __CC_reloadLevel_name = "reloadLevel";
 
     SetConsoleCommand(__CC_startMainMenu_name, &GSLevel::startMainMenu).deactivate();
     SetConsoleCommand(__CC_changeGame_name, &GSLevel::changeGame).defaultValues("").deactivate();
+    SetConsoleCommand(__CC_reloadLevel_name, &GSLevel::reloadLevel).deactivate();
 
     GSLevel::GSLevel(const GameStateInfo& info)
@@ -108 +112 @@
 
         if (GameMode::isStandalone())
+        {
             ModifyConsoleCommand(__CC_changeGame_name).activate();
+            ModifyConsoleCommand(__CC_reloadLevel_name).setObject(this).activate();
+        }
     }
 
@@ -140 +147 @@
 
         if (GameMode::isStandalone())
+        {
             ModifyConsoleCommand(__CC_changeGame_name).deactivate();
+            ModifyConsoleCommand(__CC_reloadLevel_name).setObject(NULL).deactivate();
+        }
     }
 
@@ -185 +195 @@
         else
             orxout(internal_info) << " Try harder!" << endl;
+    }
+
+    void GSLevel::reloadLevel()
+    {
+        // export all states
+        std::vector<GSLevelMementoState*> states;
+        for (ObjectList<GSLevelMemento>::iterator it = ObjectList<GSLevelMemento>::begin(); it != ObjectList<GSLevelMemento>::end(); ++it)
+        {
+            GSLevelMementoState* state = it->exportMementoState();
+            if (state)
+                states.push_back(state);
+        }
+
+        // reload level (or better: reload the whole gamestate)
+        this->deactivate();
+        this->activate();
+
+        // import all states
+        for (ObjectList<GSLevelMemento>::iterator it = ObjectList<GSLevelMemento>::begin(); it != ObjectList<GSLevelMemento>::end(); ++it)
+            it->importMementoState(states);
+
+        // delete states
+        for (size_t i = 0; i < states.size(); ++i)
+            delete states[i];
     }
 
@@ -214 +248 @@
         Game::getInstance().requestStates("standalone, level");
     }
+
+
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    RegisterAbstractClass(GSLevelMemento).inheritsFrom(Class(OrxonoxInterface));
+
+    GSLevelMemento::GSLevelMemento()
+    {
+        RegisterObject(GSLevelMemento);
+    }
 }

code/trunk/src/orxonox/gamestates/GSLevel.h

@@ -51 +51 @@
         static void changeGame(const std::string& level); //!< Terminates the current game and starts a new game.
 
+        void reloadLevel();
+
     protected:
         void loadLevel();

code/trunk/src/orxonox/gametypes/Gametype.cc

@@ -45 +45 @@
 #include "worldentities/pawns/Pawn.h"
 #include "overlays/OverlayGroup.h"
+#include "Scene.h"
 
 namespace orxonox
@@ -525 +526 @@
         GSLevel::startMainMenu();
     }
+
+    GSLevelMementoState* Gametype::exportMementoState()
+    {
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+        {
+            if (it->first->isHumanPlayer() && it->first->getControllableEntity() && it->first->getControllableEntity()->getCamera())
+            {
+                Camera* camera = it->first->getControllableEntity()->getCamera();
+
+                GametypeMementoState* state = new GametypeMementoState();
+                state->cameraPosition_ = camera->getWorldPosition();
+                state->cameraOrientation_ = camera->getWorldOrientation();
+                state->sceneName_ = camera->getScene()->getName();
+                return state;
+            }
+        }
+
+        return NULL;
+    }
+
+    void Gametype::importMementoState(const std::vector<GSLevelMementoState*>& states)
+    {
+        // find correct memento state
+        GametypeMementoState* state = NULL;
+        for (size_t i = 0; i < states.size(); ++i)
+        {
+            state = dynamic_cast<GametypeMementoState*>(states[i]);
+            if (state)
+                break;
+        }
+
+        if (!state)
+            return;
+
+        // find correct scene
+        Scene* scene = NULL;
+        for (ObjectList<Scene>::iterator it = ObjectList<Scene>::begin(); it != ObjectList<Scene>::end(); ++it)
+        {
+            if (it->getName() == state->sceneName_)
+            {
+                scene = *it;
+                break;
+            }
+        }
+
+        if (!scene)
+        {
+            orxout(internal_warning) << "Could not find scene with name " << state->sceneName_ << endl;
+            return;
+        }
+
+        // find correct player and assign default entity with original position & orientation
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+        {
+            if (it->first->isHumanPlayer())
+            {
+                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(scene->getContext());
+                entity->setPosition(state->cameraPosition_);
+                entity->setOrientation(state->cameraOrientation_);
+                it->first->startControl(entity);
+                break;
+            }
+        }
+    }
 }

code/trunk/src/orxonox/gametypes/Gametype.h

@@ -41 +41 @@
 #include "infos/GametypeInfo.h"
 #include "tools/Timer.h"
+#include "gamestates/GSLevelMemento.h"
 
 namespace orxonox
@@ -63 +64 @@
     };
 
-    class _OrxonoxExport Gametype : public BaseObject, public Tickable
+    class _OrxonoxExport Gametype : public BaseObject, public Tickable, public GSLevelMemento
     {
         friend class PlayerInfo;
@@ -172 +173 @@
             virtual void spawnDeadPlayersIfRequested();
 
+            virtual GSLevelMementoState* exportMementoState();
+            virtual void importMementoState(const std::vector<GSLevelMementoState*>& states);
+
             SmartPtr<GametypeInfo> gtinfo_;
 
@@ -201 +205 @@
             Timer showMenuTimer_;
     };
+
+    /**
+        @brief Keeps position and orientation of the camera, as well as the name of current scene.
+    */
+    struct _OrxonoxExport GametypeMementoState : public GSLevelMementoState
+    {
+        Vector3 cameraPosition_;
+        Quaternion cameraOrientation_;
+        std::string sceneName_;
+    };
 }