Changeset 2840

Timestamp:

Mar 25, 2009, 11:15:28 AM (16 years ago)

Author:

bknecht

Message:

GUIManager now behaves how it should. Most things seem to work fine.

However I guess with the new media all other branches stopped working. Sorry if that's the case.

Location:

code/branches/gui/src/orxonox/gui

Files:

• GUIManager.cc (modified) (6 diffs)
• GUIManager.h (modified) (2 diffs)

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

@@ -187 +187 @@
 
             state_ = Ready;
+
         }
 
@@ -249 +250 @@
         {
             this->scriptModule_->executeScriptFile("loadGUI.lua", "GUI");
+            lua_pushfstring(this->scriptModule_->getLuaState(), Core::getMediaPathString().c_str());
+            lua_setglobal(this->scriptModule_->getLuaState(), "datapath");
         }
         catch (CEGUI::Exception& ex)
@@ -264 +267 @@
     {
         //COUT(0) << "********* TOGGLE TOGGLE **********" << std::endl;
-        getInstance().scriptModule_->executeScriptGlobal("toggleGUI");
+        if (getInstance().scriptModule_->executeScriptGlobal("toggleGUI"))
+            InputManager::getInstance().requestEnterState("gui");
+        else
+            InputManager::getInstance().requestLeaveState("gui");
     }
 
     void GUIManager::setCamera(Ogre::Camera* camera)
     {
-        this->showGUI("default", camera->getSceneManager());
+        this->guiRenderer_->setTargetSceneManager(camera->getSceneManager());
     }
 
@@ -304 +310 @@
                 }
 
-                this->scriptModule_->executeScriptGlobal("showMainMenu");
+                lua_pushfstring(this->scriptModule_->getLuaState(), "mainmenu.lua");
+                lua_setglobal(this->scriptModule_->getLuaState(), "filename");
+
+                this->scriptModule_->executeScriptGlobal("showGUI");
 
                 InputManager::getInstance().requestEnterState("gui");
@@ -325 +334 @@
     }
 
-    void GUIManager::testFct()
+    /*void GUIManager::testFct()
     {
         //COUT(0) << "**** " << currentSceneManager_ << std::endl;
@@ -334 +343 @@
     {
         COUT(0) << "***" << str << "***" << std::endl;
-    }
+    }*/
 
     void GUIManager::hideGUI()

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
+        //void testOutput(const std::string& str); // tolua_export
 
         static void toggleGUI();
@@ -92 +92 @@
 
         // please remove
-        void testFct();
+        //void testFct();
 
         static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export