Changeset 1662 for code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

Timestamp:

Aug 19, 2008, 8:12:15 PM (16 years ago)

Author:

rgrieder

Message:

• Changed static Executor/Functor in ConsoleCommand to generic one that enables console commands for member functions. (This is more of a temporary solution, but can be made permanent with right adjustments)
• The whole GameState thing seems to works so far. But I there's only standalone mode at the moment
• Console now shows in GUI too. I will have to implement a master InputState in the InputManager (little bit of a break with the concept, but probably necessary)

File:

• code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) (3 diffs)

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

@@ -35 +35 @@
 #include <OgreWindowEventUtilities.h>
 
+#include "core/ConsoleCommand.h"
+#include "core/ConfigValueIncludes.h"
 #include "core/input/InputManager.h"
-#include "core/input/SimpleInputState.h"
-#include "core/input/KeyBinder.h"
 #include "core/Core.h"
-
-#include "GraphicsEngine.h"
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -88 +87 @@
         guiManager_ = new GUIManager();
         guiManager_->initialise();
+
+        // use the ogre timer class to measure time.
+        timer_ = new Ogre::Timer();
+
+        // add console commands
+        FunctorMember<GSGraphics>* functor = createFunctor(&GSGraphics::exitGame);
+        functor->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "exit"));
     }
 
     void GSGraphics::leave()
     {
-        if (this->guiManager_)
-          delete guiManager_;
-
-        if (this->console_)
-          delete this->console_;
-
-        if (inputManager_)
-          delete inputManager_;
-
-        // TODO: deintialise graphics
-    }
-
+        delete this->timer_;
+
+        delete this->guiManager_;
+
+        delete this->console_;
+
+        delete this->inputManager_;
+
+        // TODO: destroy render window
+    }
+
+    /**
+        Main loop of the orxonox game.
+        We use the Ogre::Timer to measure time since it uses the most precise
+        method an a platform (however the windows timer lacks time when under
+        heavy kernel load!).
+        There is a simple mechanism to measure the average time spent in our
+        ticks as it may indicate performance issues.
+        A note about the Ogre::FrameListener: Even though we don't use them,
+        they still get called. However, the delta times are not correct (except
+        for timeSinceLastFrame, which is the most important). A little research
+        as shown that there is probably only one FrameListener that doesn't even
+        need the time. So we shouldn't run into problems.
+    */
     bool GSGraphics::tick(float dt)
     {
+        // note: paramter 'dt' is of no meaning
+
         Ogre::Root& ogreRoot = Ogre::Root::getSingleton();
-
-        // use the ogre timer class to measure time.
-        if (!timer_)
-            timer_ = new Ogre::Timer();
 
         unsigned long frameCount = 0;
@@ -146 +163 @@
                     this->getActiveChild()->tick(dt);
 
+                // tick console
+                this->console_->tick(dt);
+
                 // get current time once again
                 timeAfterTick = timer_->getMicroseconds();