Changeset 2808 for code/branches/gui/src/orxonox/gamestates

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/gamestates

Files:

• GSGUI.cc (modified) (1 diff)
• GSStandalone.cc (modified) (4 diffs)
• GSStandalone.h (modified) (2 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;
     };
 }