Changeset 1640 for code/branches/gui

Timestamp:

Jul 21, 2008, 8:39:14 PM (16 years ago)

Author:

rgrieder

Message:

When starting with no arguments, the GUI is loaded, which consists merely of 2 buttons: start and exit (quite self explanatory). But it does work on my box (still no cmake support).

Location:

code/branches/gui/src/orxonox

Files:

• GraphicsEngine.cc (modified) (2 diffs)
• GraphicsEngine.h (modified) (2 diffs)
• Orxonox.cc (modified) (6 diffs)
• gui/GUIManager.cc (modified) (7 diffs)
• gui/GUIManager.h (modified) (2 diffs)
• objects/CameraHandler.cc (modified) (1 diff)

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

@@ -85 +85 @@
         , renderWindow_(0)
         , levelSceneManager_(0)
-        , levelViewport_(0)
+        , viewport_(0)
     {
         RegisterObject(GraphicsEngine);
@@ -308 +308 @@
         // The GUI uses its own one to be able to render on top of everything.
         // That explains why the Z order here is only 1 and not 0 (top most)
-        this->levelViewport_ = this->renderWindow_->addViewport(0, 1);
+        this->viewport_ = this->renderWindow_->addViewport(0, 1);
 
         return true;

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

@@ -68 +68 @@
         Ogre::SceneManager* getLevelSceneManager() { return levelSceneManager_; }
 
-        Ogre::Viewport* getLevelViewport() { return this->levelViewport_; }
+        Ogre::Viewport* getViewport() { return this->viewport_; }
 
         // several window properties
@@ -107 +107 @@
         Ogre::RenderWindow* renderWindow_;          //!< the current render window
         Ogre::SceneManager* levelSceneManager_;     //!< scene manager of the game
-        Ogre::Viewport*     levelViewport_;         //!< default full size viewport for the level
+        Ogre::Viewport*     viewport_;              //!< default full size viewport
 
         // stats

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

@@ -250 +250 @@
                 ogre_->getWindowWidth(), ogre_->getWindowHeight(), true, true, true);
           KeyBinder* keyBinder = new KeyBinder();
+          keyBinder->loadBindings();
           InputManager::createSimpleInputState("game", 20)->setHandler(keyBinder);
 
@@ -277 +278 @@
         {
           // show main menu
-          //GraphicsEngine::getSingleton().createNewScene();
-          GUIManager::getInstance().showGUI("MainMenu", true);
+          GUIManager::getInstance().showGUI("MainMenu", 0);
+          GraphicsEngine::getSingleton().getViewport()->setCamera(GUIManager::getInstance().getCamera());
         }
     }
@@ -340 +341 @@
       
       if (success)
+      {
         InputManager::requestEnterState("game");
+        this->mode_ = mode;
+      }
 
       return success;
@@ -450 +454 @@
     unsigned long frameCount = 0;
     
-    const unsigned long refreshTime = debugRefreshTime_ * 1000000.0f;
+    const unsigned long refreshTime = 50000.0f;
+    //const unsigned long refreshTime = debugRefreshTime_ * 1000000.0f;
     unsigned long refreshStartTime = 0;
     unsigned long tickTime = 0;
@@ -458 +463 @@
     unsigned long timeBeforeTickOld = 0;
     unsigned long timeAfterTick = 0;
-
-    int sleepTime = 0;
 
     // TODO: Update time in seconds every 7 seconds to avoid any overflow (7 secs is very tight)
@@ -511 +514 @@
           GraphicsEngine::getSingleton().setAverageFramesPerSecond(avgFPS);
 
-          if (avgFPS > 60.0)
-            sleepTime++;
-          else
-            sleepTime--;
-          if (sleepTime < 0)
-              sleepTime = 0;
-
           oldFrameCount = frameCount;
           tickTime = 0;
           refreshStartTime = timeAfterTick;
         }
-
-        // do some sleeping when the frameRate is over 60
-        if (sleepTime > 0)
-          msleep(sleepTime);
-
 
         // don't forget to call _fireFrameStarted in ogre to make sure

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

@@ -59 +59 @@
 
     GUIManager::GUIManager()
-        : emptySceneManager_(0)
-        , backgroundSceneManager_(0)
-        , emptyCamera_(0)
+        //: emptySceneManager_(0)
+        : backgroundSceneManager_(0)
+        //, emptyCamera_(0)
         , backgroundCamera_(0)
-        , viewport_(0)
+        //, viewport_(0)
         , renderWindow_(0)
         , guiRenderer_(0)
@@ -91 +91 @@
 
                 // Full screen viewport with Z order = 0 (top most). Don't yet feed a camera (so nothing gets rendered)
-                this->viewport_ = renderWindow_->addViewport(0, 3);
-                this->viewport_->setOverlaysEnabled(false);
-                this->viewport_->setShadowsEnabled(false);
-                this->viewport_->setSkiesEnabled(false);
-                this->viewport_->setClearEveryFrame(false);
+                //this->viewport_ = renderWindow_->addViewport(0, 3);
+                //this->viewport_->setOverlaysEnabled(false);
+                //this->viewport_->setShadowsEnabled(false);
+                //this->viewport_->setSkiesEnabled(false);
+                //this->viewport_->setClearEveryFrame(false);
 
                 // Note: No SceneManager specified yet
@@ -145 +145 @@
         // But in order to realise that, we also need a SceneManager with an empty scene,
         // because the SceneManager is responsible for the render queue.
-        this->emptySceneManager_ = Ogre::Root::getSingleton()
-            .createSceneManager(Ogre::ST_GENERIC, "GUI/EmptySceneManager");
+        //this->emptySceneManager_ = Ogre::Root::getSingleton()
+        //    .createSceneManager(Ogre::ST_GENERIC, "GUI/EmptySceneManager");
 
         // we also need a camera or we won't see anything at all.
         // The camera settings don't matter at all for an empty scene since the GUI
         // gets rendered on top of the screen rather than into the scene.
-        this->emptyCamera_ = this->emptySceneManager_->createCamera("GUI/EmptyCamera");
+        //this->emptyCamera_ = this->emptySceneManager_->createCamera("GUI/EmptyCamera");
 
         // Create another SceneManager that enables to display some 3D
@@ -171 +171 @@
     }
 
-    void GUIManager::showGUI(const std::string& name, bool showBackground)
+    void GUIManager::showGUI(const std::string& name, Ogre::SceneManager* sceneManager)// bool showBackground)
     {
         if (state_ != Uninitialised)
@@ -181 +181 @@
             try
             {
-                if (showBackground)
+                if (!sceneManager)
                 {
                     // currently, only an image is loaded. We could do 3D, see loadBackground.
-                    this->viewport_->setClearEveryFrame(true);
+                    //this->viewport_->setClearEveryFrame(true);
                     this->guiRenderer_->setTargetSceneManager(this->backgroundSceneManager_);
-                    this->viewport_->setCamera(this->backgroundCamera_);
+                    //this->viewport_->setCamera(this->backgroundCamera_);
 
                     lua_pushboolean(this->scriptModule_->getLuaState(), true);
@@ -193 +193 @@
                 else
                 {
-                    this->viewport_->setClearEveryFrame(false);
-                    this->guiRenderer_->setTargetSceneManager(this->emptySceneManager_);
-                    this->viewport_->setCamera(this->emptyCamera_);
+                    //this->viewport_->setClearEveryFrame(false);
+                    this->guiRenderer_->setTargetSceneManager(sceneManager);
+                    //this->viewport_->setCamera(this->emptyCamera_);
 
                     lua_pushboolean(this->scriptModule_->getLuaState(), false);
@@ -226 +226 @@
         if (this->state_ != OnDisplay)
             return;
-        this->viewport_->setCamera(0);
+        //this->viewport_->setCamera(0);
+        this->guiRenderer_->setTargetSceneManager(0);
         this->state_ = Ready;
         InputManager::requestLeaveState("gui");

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

@@ -70 +70 @@
         bool initialise();
         void tick(float dt);
-        void showGUI(const std::string& name, bool showBackground); // tolua_export
+        void showGUI(const std::string& name, Ogre::SceneManager* sceneManager);// bool showBackground); // tolua_export
         void _hideGUI(); // tolua_export
 
+        Ogre::Camera* getCamera() { return this->backgroundCamera_; }
+
         static GUIManager& getInstance(); // tolua_export
-        static void showGUI_s(const std::string& name, bool showBackground)
+        static void showGUI_s(const std::string& name, Ogre::SceneManager* sceneManager)//bool showBackground)
         {
-            getInstance().showGUI(name, showBackground);
+            getInstance().showGUI(name, sceneManager);
         }
 
@@ -104 +106 @@
         void loadScenes();
 
-        Ogre::SceneManager*       emptySceneManager_;
+        //Ogre::SceneManager*       emptySceneManager_;
         Ogre::SceneManager*       backgroundSceneManager_;
-        Ogre::Camera*             emptyCamera_;
+        //Ogre::Camera*             emptyCamera_;
         Ogre::Camera*             backgroundCamera_;
-        Ogre::Viewport*           viewport_;
+        //Ogre::Viewport*           viewport_;
         Ogre::RenderWindow*       renderWindow_;
         CEGUI::OgreCEGUIRenderer* guiRenderer_;

code/branches/gui/src/orxonox/objects/CameraHandler.cc

@@ -45 +45 @@
   {
     this->cam_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createCamera("Cam");
-    GraphicsEngine::getSingleton().getLevelViewport()->setCamera(this->cam_);
-    GraphicsEngine::getSingleton().getRenderWindow()->addViewport(this->cam_, 2, 0.4, 0.4, 0.2, 0.2);
+    GraphicsEngine::getSingleton().getViewport()->setCamera(this->cam_);
+    //GraphicsEngine::getSingleton().getRenderWindow()->addViewport(this->cam_, 2, 0.4, 0.4, 0.2, 0.2);
     /*this->activeCamera_ = *ObjectList<Camera>::begin();
     this->activeCamera_->cam_ = this->cam_;*/