Changeset 1640 for code/branches/gui/src/orxonox/Orxonox.cc

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).

File:

• code/branches/gui/src/orxonox/Orxonox.cc (modified) (6 diffs)

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