Changeset 2790 for code/trunk/src/orxonox

Timestamp:

Mar 16, 2009, 11:47:06 AM (16 years ago)

Author:

bknecht

Message:

Ugly hack to use GUI ingame. Hack itself needs improvement AND of course it should be hackfree!

Location:

code/trunk/src/orxonox

Files:

• gamestates/GSGUI.cc (modified) (1 diff)
• gamestates/GSLevel.h (modified) (2 diffs)
• gamestates/GSStandalone.cc (modified) (4 diffs)
• gamestates/GSStandalone.h (modified) (2 diffs)
• gui/GUIManager.cc (modified) (4 diffs)
• gui/GUIManager.h (modified) (1 diff)

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

@@ -51 +51 @@
 
         // show main menu
+        guiManager_->loadScene("MainMenu");
         guiManager_->showGUI("MainMenu", 0);
         getParent()->getViewport()->setCamera(guiManager_->getCamera());

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

@@ -43 +43 @@
         ~GSLevel();
 
+        // was private before (is public now because of console command in GSStandalone)
+        void setConfigValues();
+
     protected:
         void enter(Ogre::Viewport* viewport);
@@ -71 +74 @@
         ConsoleCommand*       ccTkeybind_;
 
-    private:
-        void setConfigValues();
-
     };
 }

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

@@ -30 +30 @@
 #include "GSStandalone.h"
 
+#include <OgreViewport.h>
+#include <OgreCamera.h>
 #include "core/Core.h"
+#include "core/ConsoleCommand.h"
+#include "gui/GUIManager.h"
 
 namespace orxonox
 {
+    SetConsoleCommand(GSStandalone, showGUI, true).setAsInputCommand();
+
+    bool GSStandalone::guiShowing_s = false;
+
     GSStandalone::GSStandalone()
         : GameState<GSGraphics>("standalone")
@@ -43 +51 @@
     }
 
+    void GSStandalone::showGUI()
+    {
+        GSStandalone::guiShowing_s = true;
+    }
+
     void GSStandalone::enter()
     {
@@ -48 +61 @@
 
         GSLevel::enter(this->getParent()->getViewport());
+
+        guiManager_ = getParent()->getGUIManager();
+        // not sure if necessary
+        // guiManager_->loadScene("IngameMenu");
     }
 
@@ -59 +76 @@
     void GSStandalone::ticked(const Clock& time)
     {
+        if (guiShowing_s)
+        {
+            guiManager_->showGUI("IngameMenu", this->getParent()->getViewport()->getCamera()->getSceneManager());
+        }
+        else
+        {
+            if (guiManager_)
+                guiManager_->hideGUI();
+        }
+        // tick CEGUI
+        guiManager_->tick(time.getDeltaTime());
+
         GSLevel::ticked(time);
         this->tickChild(time);

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

@@ -41 +41 @@
         GSStandalone();
         ~GSStandalone();
+        static void showGUI();
 
     private:
@@ -46 +47 @@
         void leave();
         void ticked(const Clock& time);
+
+        GUIManager*     guiManager_;
+        static bool     guiShowing_s;
     };
 }

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -172 +172 @@
 
                 // load the background scene
-                loadScenes();
+                //loadScenes();
                 //CEGUI::KeyEventArgs e;
                 //e.codepoint
@@ -190 +190 @@
 
         return true;
+    }
+
+    void GUIManager::loadScene(const std::string& name)
+    {
+        if (name.compare("IngameMenu") == 0)
+        {
+            try
+            {
+                /*this->scriptModule_ = new LuaScriptModule();
+                this->luaState_ = this->scriptModule_->getLuaState();
+                this->guiSystem_ = new System(this->guiRenderer_, this->resourceProvider_, 0, this->scriptModule_);
+                tolua_Core_open(this->scriptModule_->getLuaState());
+                tolua_Orxonox_open(this->scriptModule_->getLuaState());
+                */
+                this->scriptModule_->executeScriptFile("ingameGUI.lua", "GUI");
+            }
+            catch (CEGUI::Exception& ex)
+            {
+#if CEGUI_VERSION_MINOR < 6
+                throw GeneralException(ex.getMessage().c_str());
+#else
+                throw GeneralException(ex.getMessage().c_str(), ex.getLine(),
+                                       ex.getFileName().c_str(), ex.getName().c_str());
+#endif
+            }
+        }
+        else
+        {
+            loadScenes();
+        }
     }
 
@@ -241 +271 @@
             try
             {
+                COUT (0) << "************* sceneManager: " << sceneManager << std::endl;
                 if (!sceneManager)
                 {
@@ -287 +318 @@
             return;
         //this->viewport_->setCamera(0);
-        this->guiRenderer_->setTargetSceneManager(0);
+        // has no effect since you cannot assign 0 as SceneManager
+        //this->guiRenderer_->setTargetSceneManager(0);
         this->state_ = Ready;
         InputManager::getInstance().requestLeaveState("gui");

code/trunk/src/orxonox/gui/GUIManager.h

@@ -70 +70 @@
 
         bool initialise(Ogre::RenderWindow* renderWindow);
+        void loadScene(const std::string& name);
         void tick(float dt)
         {