Changeset 2808 for code/branches

Timestamp:

Mar 21, 2009, 1:07:53 AM (16 years ago)

Author:

bknecht

Message:

You can now toggle visibility ingame. Strangely the SceneManager changes after the initial enter()-function of GSStandalone. That's why - for the moment - the SceneManager is set every tick to be able to keep track of the current SceneManager.

Also there are some strange functions defined not having a real purpose aside from debug (the implementation is not clean at all, but rather full of shortcuts and functional). At least it compiles and runs

Location:

code/branches/gui/src/orxonox

Files:

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

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

@@ -53 +53 @@
 
         // show main menu
-        guiManager_->loadScene("MainMenu");
+        //guiManager_->loadScene("MainMenu");
         guiManager_->showGUI("MainMenu", 0);
         GraphicsManager::getInstance().getViewport()->setCamera(guiManager_->getCamera());

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

@@ -39 +39 @@
 namespace orxonox
 {
-    SetConsoleCommand(GSStandalone, showGUI, true).setAsInputCommand();
-
-    bool GSStandalone::guiShowing_s = false;
-
     GSStandalone::GSStandalone()
         : GameState<GSGraphics>("standalone")
@@ -52 +48 @@
     }
 
-    void GSStandalone::showGUI()
-    {
-        GSStandalone::guiShowing_s = true;
-    }
 
     void GSStandalone::enter()
@@ -66 +58 @@
         // not sure if necessary
         // guiManager_->loadScene("IngameMenu");
+
+        Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
+        guiManager_->showGUI("IngameMenu", viewport->getCamera()->getSceneManager());
     }
 
@@ -77 +72 @@
     void GSStandalone::ticked(const Clock& time)
     {
-        if (guiShowing_s)
-        {
-            Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
-            guiManager_->showGUI("IngameMenu", viewport->getCamera()->getSceneManager());
-        }
-        else
-        {
-            if (guiManager_)
-                guiManager_->hideGUI();
-        }
+        Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
+        //COUT(0) << "** " << viewport->getCamera()->getSceneManager() << std::endl;
+        //guiManager_->testFct();
+        //Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
+        guiManager_->showGUI("IngameMenu", viewport->getCamera()->getSceneManager());
+
         // tick CEGUI
         guiManager_->update(time);

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

@@ -41 +41 @@
         GSStandalone();
         ~GSStandalone();
-        static void showGUI();
 
     private:
@@ -49 +48 @@
 
         GUIManager*     guiManager_;
-        static bool     guiShowing_s;
     };
 }

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

@@ -63 +63 @@
 namespace orxonox
 {
-    SetConsoleCommandShortcut(GUIManager, showGUI_s).keybindMode(KeybindMode::OnPress);
+    SetConsoleCommandShortcut(GUIManager, toggleGUI).keybindMode(KeybindMode::OnPress);
 
     GUIManager* GUIManager::singletonRef_s = 0;
@@ -143 +143 @@
 
                 // Note: No SceneManager specified yet
-                this->guiRenderer_ = new OgreCEGUIRenderer(renderWindow_, Ogre::RENDER_QUEUE_MAIN, true, 3000);
+                this->guiRenderer_ = new OgreCEGUIRenderer(renderWindow_, Ogre::RENDER_QUEUE_OVERLAY, true, 3000);
                 this->resourceProvider_ = guiRenderer_->createResourceProvider();
                 this->resourceProvider_->setDefaultResourceGroup("GUI");
@@ -172 +172 @@
 
                 // load the background scene
-                //loadScenes();
+                loadScenes();
                 //CEGUI::KeyEventArgs e;
                 //e.codepoint
@@ -204 +204 @@
                 tolua_Orxonox_open(this->scriptModule_->getLuaState());
                 */
-                this->scriptModule_->executeScriptFile("ingameGUI.lua", "GUI");
+                this->scriptModule_->executeScriptFile("loadGUI.lua", "GUI");
             }
             catch (CEGUI::Exception& ex)
@@ -261 +261 @@
     }
 
+    void GUIManager::toggleGUI()
+    {
+        //COUT(0) << "********* TOGGLE TOGGLE **********" << std::endl;
+        getInstance().scriptModule_->executeScriptGlobal("toggleGUI");
+    }
+
     void GUIManager::showGUI(const std::string& name, Ogre::SceneManager* sceneManager)// bool showBackground)
     {
@@ -271 +277 @@
             try
             {
-//                COUT (0) << "************* sceneManager: " << sceneManager << std::endl;
+                // COUT (0) << "************* sceneManager: " << sceneManager << std::endl;
                 if (!sceneManager)
                 {
@@ -286 +292 @@
                     //this->viewport_->setClearEveryFrame(false);
                     this->guiRenderer_->setTargetSceneManager(sceneManager);
+                    currentSceneManager_ = sceneManager;
                     //this->viewport_->setCamera(this->emptyCamera_);
 
@@ -311 +318 @@
             COUT(2) << "Warning: GUI Manager not yet initialised, cannot load a GUI" << std::endl;
         }
+    }
+
+    void GUIManager::testFct()
+    {
+        //COUT(0) << "**** " << currentSceneManager_ << std::endl;
+        this->showGUI("IngameMenu", currentSceneManager_);
+    }
+
+    void GUIManager::testOutput(const std::string& str)
+    {
+        COUT(0) << "***" << str << "***" << std::endl;
     }
 

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

@@ -79 +79 @@
         void showGUI(const std::string& name, Ogre::SceneManager* sceneManager);// bool showBackground); // tolua_export
         void hideGUI(); // tolua_export
+        void testOutput(const std::string& str); // tolua_export
+
+        static void toggleGUI();
 
         Ogre::Camera* getCamera() { return this->backgroundCamera_; }
@@ -86 +89 @@
             getInstance().showGUI(name, sceneManager);
         }
+
+        // please remove
+        void testFct();
 
         static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
@@ -128 +134 @@
         CEGUI::Imageset*          backgroundImage_;
         lua_State*                luaState_;
+        Ogre::SceneManager*         currentSceneManager_;
 
         State state_;