[Orxonox-commit 1302] r6020 - in code/branches/ingamemenu/src: libraries/core orxonox/gamestates

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-11-03 22:08:26 +0100 (Tue, 03 Nov 2009)
New Revision: 6020

Modified:
   code/branches/ingamemenu/src/libraries/core/GUIManager.cc
   code/branches/ingamemenu/src/libraries/core/GUIManager.h
   code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc
Log:
fixed an issue with the OS/CEGUI mouse pointer


Modified: code/branches/ingamemenu/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/ingamemenu/src/libraries/core/GUIManager.cc	2009-11-03 10:53:47 UTC (rev 6019)
+++ code/branches/ingamemenu/src/libraries/core/GUIManager.cc	2009-11-03 21:08:26 UTC (rev 6020)
@@ -257,6 +257,11 @@
         }
     }
 
+    /*static*/ void GUIManager::hideCursor()
+    {
+        GUIManager::getInstance().executeCode("hideCursor()");
+    }
+
     void GUIManager::keyPressed(const KeyEvent& evt)
     {
         guiSystem_->injectKeyDown(evt.getKeyCode());

Modified: code/branches/ingamemenu/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/ingamemenu/src/libraries/core/GUIManager.h	2009-11-03 10:53:47 UTC (rev 6019)
+++ code/branches/ingamemenu/src/libraries/core/GUIManager.h	2009-11-03 21:08:26 UTC (rev 6020)
@@ -70,6 +70,7 @@
         static void showGUI(const std::string& name);
         void showGUIExtra(const std::string& name, const std::string& ptr);
         static void hideGUI(const std::string& name);
+        static void hideCursor();
 
         void setCamera(Ogre::Camera* camera);
         Ogre::Camera* getCamera() { return this->camera_; }

Modified: code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc	2009-11-03 10:53:47 UTC (rev 6019)
+++ code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc	2009-11-03 21:08:26 UTC (rev 6020)
@@ -82,6 +82,7 @@
     {
         // show main menu
         GUIManager::showGUI("MainMenu");
+        GUIManager::hideCursor();
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);