Changeset 2834 for code

Timestamp:

Mar 23, 2009, 4:48:23 PM (16 years ago)

Author:

bknecht

Message:

When you change the camera, the GUI is now newly set. Also: the GUI remembers if it was hidden or not. Only problem at the moment: Input is captured for the wrong thing. Ingame the GUI captures the input.

Location:

code/branches/gui/src/orxonox

Files:

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

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

@@ -41 +41 @@
 #include "tools/Shader.h"
 #include "util/String.h"
+#include "gui/GUIManager.h"
 
 namespace orxonox
@@ -141 +142 @@
 
         this->viewport_->setCamera(camera);
+        GUIManager::getInstancePtr()->setCamera(camera);
 
         // reactivate all visible compositors

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

@@ -58 +58 @@
         // not sure if necessary
         // guiManager_->loadScene("IngameMenu");
-
-        Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
-        guiManager_->showGUI("IngameMenu", viewport->getCamera()->getSceneManager());
     }
 
@@ -72 +69 @@
     void GSStandalone::ticked(const Clock& time)
     {
-        Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
+        //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());
+        //guiManager_->showGUI("IngameMenu", viewport->getCamera()->getSceneManager());
 
         // tick CEGUI

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

@@ -267 +267 @@
     }
 
+    void GUIManager::setCamera(Ogre::Camera* camera)
+    {
+        this->showGUI("default", camera->getSceneManager());
+    }
+
     void GUIManager::showGUI(const std::string& name, Ogre::SceneManager* sceneManager)// bool showBackground)
     {

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

@@ -83 +83 @@
         static void toggleGUI();
 
+        void setCamera(Ogre::Camera* camera);
         Ogre::Camera* getCamera() { return this->backgroundCamera_; }