Changeset 1672 for code/branches/gui/src/orxonox/gamestates

Timestamp:

Aug 27, 2008, 10:21:39 PM (16 years ago)

Author:

rgrieder

Message:

• Changed GameState so that the new RootGameState can override 2 virtual methods
• added RootGameState that takes care of state transitions (can only happen between ticks)
• moved main loop to GSRoot instead of GSGraphics
• network GameStates not yet finished
• GraphicsEngine not yet merged into GSGraphics

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (1 diff)
• GSClient.h (modified) (1 diff)
• GSGUI.cc (modified) (1 diff)
• GSGUI.h (modified) (1 diff)
• GSGraphics.cc (modified) (6 diffs)
• GSGraphics.h (modified) (1 diff)
• GSIO.cc (modified) (1 diff)
• GSIO.h (modified) (1 diff)
• GSIOConsole.cc (modified) (1 diff)
• GSIOConsole.h (modified) (1 diff)
• GSLevel.cc (modified) (1 diff)
• GSLevel.h (modified) (1 diff)
• GSRoot.cc (modified) (5 diffs)
• GSRoot.h (modified) (2 diffs)
• GSServer.cc (modified) (1 diff)
• GSServer.h (modified) (1 diff)
• GSStandalone.cc (modified) (1 diff)
• GSStandalone.h (modified) (1 diff)

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

@@ -78 +78 @@
     }
 
-    void GSClient::ticked(float dt)
+    void GSClient::ticked(float dt, uint64_t time)
     {
-        GSLevel::ticked(dt);
+        GSLevel::ticked(dt, time);
         client_->tick(dt);
 
-        this->tickChild(dt);
+        this->tickChild(dt, time);
     }
 }

code/branches/gui/src/orxonox/gamestates/GSClient.h

@@ -46 +46 @@
         void enter();
         void leave();
-        void ticked(float dt);
+        void ticked(float dt, uint64_t time);
 
         network::Client* client_;

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

@@ -58 +58 @@
     }
 
-    void GSGUI::ticked(float dt)
+    void GSGUI::ticked(float dt, uint64_t time)
     {
         // tick CEGUI
         GUIManager::getInstance().tick(dt);
 
-        this->tickChild(dt);
+        this->tickChild(dt, time);
     }
 }

code/branches/gui/src/orxonox/gamestates/GSGUI.h

@@ -44 +44 @@
         void enter();
         void leave();
-        void ticked(float dt);
+        void ticked(float dt, uint64_t time);
 
     };

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

@@ -34 +34 @@
 #include <OgreTimer.h>
 #include <OgreWindowEventUtilities.h>
+#include <OgreRenderWindow.h>
 
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/input/InputManager.h"
-#include "core/TclThreadManager.h"
 //#include "core/Core.h"
 #include "overlays/console/InGameConsole.h"
@@ -48 +48 @@
     GSGraphics::GSGraphics()
         : GameState("graphics")
-        , timer_(0)
         , debugRefreshTime_(0.0f)
         , inputManager_(0)
         , console_(0)
         , guiManager_(0)
+        , frameCount_(0)
     {
     }
@@ -67 +67 @@
     void GSGraphics::enter()
     {
+        this->ogreRoot_ = Ogre::Root::getSingletonPtr();
         this->graphicsEngine_ = GraphicsEngine::getInstancePtr();
 
@@ -87 +88 @@
         guiManager_ = new GUIManager();
         guiManager_->initialise();
-
-        // use the ogre timer class to measure time.
-        timer_ = new Ogre::Timer();
     }
 
     void GSGraphics::leave()
     {
-        delete this->timer_;
-
         delete this->guiManager_;
 
@@ -102 +98 @@
         delete this->inputManager_;
 
+        this->ogreRoot_->detachRenderTarget(GraphicsEngine::getInstance().getRenderWindow());
+        delete GraphicsEngine::getInstance().getRenderWindow();
+        this->ogreRoot_->shutdown
         // TODO: destroy render window
     }
@@ -118 +117 @@
         need the time. So we shouldn't run into problems.
     */
-    void GSGraphics::ticked(float dt)
+    void GSGraphics::ticked(float dt, uint64_t time)
     {
-        // note: paramter 'dt' is of no meaning
+        this->inputManager_->tick(dt);
 
-        Ogre::Root& ogreRoot = Ogre::Root::getSingleton();
+        this->tickChild(dt, time);
 
-        unsigned long frameCount = 0;
+        // tick console
+        this->console_->tick(dt);
 
-        const unsigned long refreshTime = (unsigned long)(debugRefreshTime_ * 1000000.0f);
-        unsigned long refreshStartTime = 0;
-        unsigned long tickTime = 0;
-        unsigned long oldFrameCount = 0;
+        //// get current time once again
+        //timeAfterTick = timer_->getMicroseconds();
 
-        unsigned long timeBeforeTick = 0;
-        unsigned long timeBeforeTickOld = 0;
-        unsigned long timeAfterTick = 0;
+        //tickTime += timeAfterTick - timeBeforeTick;
+        //if (timeAfterTick > refreshStartTime + refreshTime)
+        //{
+        //    GraphicsEngine::getInstance().setAverageTickTime(
+        //        (float)tickTime * 0.001 / (frameCount - oldFrameCount));
+        //    float avgFPS = (float)(frameCount - oldFrameCount) / (timeAfterTick - refreshStartTime) * 1000000.0;
+        //    GraphicsEngine::getInstance().setAverageFramesPerSecond(avgFPS);
 
-        // TODO: Update time in seconds every 7 seconds to avoid any overflow (7 secs is very tight)
+        //    oldFrameCount = frameCount;
+        //    tickTime = 0;
+        //    refreshStartTime = timeAfterTick;
+        //}
 
-        COUT(3) << "Orxonox: Starting the main loop." << std::endl;
+        // don't forget to call _fireFrameStarted in ogre to make sure
+        // everything goes smoothly
+        Ogre::FrameEvent evt;
+        evt.timeSinceLastFrame = dt;
+        evt.timeSinceLastEvent = dt; // note: same time, but shouldn't matter anyway
+        ogreRoot_->_fireFrameStarted(evt);
 
-        try
-        {
-            timer_->reset();
-            while (!this->hasScheduledTransition())
-            {
-                // get current time
-                timeBeforeTickOld = timeBeforeTick;
-                timeBeforeTick    = timer_->getMicroseconds();
-                float dt = (timeBeforeTick - timeBeforeTickOld) / 1000000.0;
+        // Pump messages in all registered RenderWindows
+        // This calls the WindowEventListener objects.
+        Ogre::WindowEventUtilities::messagePump();
+        // make sure the window stays active even when not focused
+        // (probably only necessary on windows)
+        GraphicsEngine::getInstance().setWindowActivity(true);
 
-                this->inputManager_->tick(dt);
-                TclThreadManager::getInstance().tick(dt);
+        // render
+        ogreRoot_->_updateAllRenderTargets();
 
-                this->tickChild(dt);
+        // again, just to be sure ogre works fine
+        ogreRoot_->_fireFrameEnded(evt); // note: uses the same time as _fireFrameStarted
 
-                // tick console
-                this->console_->tick(dt);
+        ++frameCount_;
 
-                // get current time once again
-                timeAfterTick = timer_->getMicroseconds();
-
-                tickTime += timeAfterTick - timeBeforeTick;
-                if (timeAfterTick > refreshStartTime + refreshTime)
-                {
-                    GraphicsEngine::getInstance().setAverageTickTime(
-                        (float)tickTime * 0.001 / (frameCount - oldFrameCount));
-                    float avgFPS = (float)(frameCount - oldFrameCount) / (timeAfterTick - refreshStartTime) * 1000000.0;
-                    GraphicsEngine::getInstance().setAverageFramesPerSecond(avgFPS);
-
-                    oldFrameCount = frameCount;
-                    tickTime = 0;
-                    refreshStartTime = timeAfterTick;
-                }
-
-                // don't forget to call _fireFrameStarted in ogre to make sure
-                // everything goes smoothly
-                Ogre::FrameEvent evt;
-                evt.timeSinceLastFrame = dt;
-                evt.timeSinceLastEvent = dt; // note: same time, but shouldn't matter anyway
-                ogreRoot._fireFrameStarted(evt);
-
-                // Pump messages in all registered RenderWindows
-                // This calls the WindowEventListener objects.
-                Ogre::WindowEventUtilities::messagePump();
-                // make sure the window stays active even when not focused
-                // (probably only necessary on windows)
-                GraphicsEngine::getInstance().setWindowActivity(true);
-
-                // render
-                ogreRoot._updateAllRenderTargets();
-
-                // again, just to be sure ogre works fine
-                ogreRoot._fireFrameEnded(evt); // note: uses the same time as _fireFrameStarted
-
-                ++frameCount;
-            }
-        }
-        catch (std::exception& ex)
-        {
-            // something went wrong.
-            COUT(1) << ex.what() << std::endl;
-            COUT(1) << "Main loop was stopped by an unhandled exception. Shutting down." << std::endl;
-        }
+        //}
+        //catch (std::exception& ex)
+        //{
+        //    // something went wrong.
+        //    COUT(1) << ex.what() << std::endl;
+        //    COUT(1) << "Main loop was stopped by an unhandled exception. Shutting down." << std::endl;
+        //}
     }
 }

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

@@ -48 +48 @@
         void enter();
         void leave();
-        void ticked(float dt);
-
-        Ogre::Timer*          timer_;            //!< Main loop timer
+        void ticked(float dt, uint64_t time);
 
         // config values
         float                 debugRefreshTime_;
 
+        Ogre::Root*           ogreRoot_;
         GraphicsEngine*       graphicsEngine_;   //!< our dearest graphics engine <3
         InputManager*         inputManager_;
         InGameConsole*        console_;
         GUIManager*           guiManager_;
+
+
+        // variables for time statistics
+        unsigned long         frameCount_;
+
+        //const unsigned long refreshTime = (unsigned long)(debugRefreshTime_ * 1000000.0f);
+        //unsigned long refreshStartTime;
+        //unsigned long tickTime;
+        //unsigned long oldFrameCount;
+
+        //unsigned long timeBeforeTick;
+        //unsigned long timeBeforeTickOld;
+        //unsigned long timeAfterTick;
     };
 }

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

@@ -58 +58 @@
     }
 
-    void GSIO::ticked(float dt)
+    void GSIO::ticked(float dt, uint64_t time)
     {
-        this->tickChild(dt);
+        this->tickChild(dt, time);
         //Ogre::Root& ogreRoot = Ogre::Root::getSingleton();
 

code/branches/gui/src/orxonox/gamestates/GSIO.h

@@ -45 +45 @@
         void enter();
         void leave();
-        void ticked(float dt);
+        void ticked(float dt, uint64_t time);
 
         //Ogre::Timer*          timer_;            //!< Main loop timer

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

@@ -58 +58 @@
     }
 
-    void GSIOConsole::ticked(float dt)
+    void GSIOConsole::ticked(float dt, uint64_t time)
     {
-        while (!this->hasScheduledTransition())
-        {
-            std::string command;
-            std::cin >> command;
-            CommandExecutor::execute(command, true);
-        }
+        std::string command;
+        std::getline(std::cin, command);
+        CommandExecutor::execute(command, true);
+        
+        tickChild(dt, time);
     }
 }

code/branches/gui/src/orxonox/gamestates/GSIOConsole.h

@@ -45 +45 @@
         void enter();
         void leave();
-        void ticked(float dt);
+        void ticked(float dt, uint64_t time);
     };
 }

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

@@ -96 +96 @@
     }
 
-    void GSLevel::ticked(float dt)
+    void GSLevel::ticked(float dt, uint64_t time)
     {
         // Call those objects that need the real time

code/branches/gui/src/orxonox/gamestates/GSLevel.h

@@ -49 +49 @@
         virtual void enter();
         virtual void leave();
-        virtual void ticked(float dt);
+        virtual void ticked(float dt, uint64_t time);
 
         void loadLevel();

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

@@ -41 +41 @@
 #include "core/Core.h"
 #include "core/CommandLine.h"
+#include "core/TclThreadManager.h"
 #include "GraphicsEngine.h"
 #include "Settings.h"
@@ -49 +50 @@
 
     GSRoot::GSRoot()
-        : GameState("root")
+        : RootGameState("root")
         , settings_(0)
         , graphicsEngine_(0)
-        , bExit_(false)
     {
     }
@@ -113 +113 @@
         // initialise TCL
         TclBind::getInstance().setDataPath(Settings::getDataPath());
+        TclThreadManager::getInstance();
 
         // initialise graphics engine. Doesn't load the render window yet!
@@ -118 +119 @@
         graphicsEngine_->setup();       // creates ogre root and other essentials
 
-        // console commands
-        FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::loadGame);
-        functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "loadGame"));
+        // add console commands
+        FunctorMember<GSRoot>* functor1 = createFunctor(&GSRoot::exitGame);
+        functor1->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor1, "exit"));
 
         // add console commands
-        functor = createFunctor(&GSRoot::exitGame);
-        functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "exit"));
+        FunctorMember01<GameState, const std::string&>* functor2 = createFunctor(&GameState::requestState);
+        functor2->setObject(this);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor2, "selectGameState"));
     }
 
@@ -137 +138 @@
     }
 
-    void GSRoot::ticked(float dt)
+    void GSRoot::ticked(float dt, uint64_t time)
     {
-        this->tickChild(dt);
-    }
+        TclThreadManager::getInstance().tick(dt);
 
-    /**
-    @brief
-        Requests a state.
-    */
-    void GSRoot::loadGame(const std::string& name)
-    {
-        this->requestState(name);
+        this->tickChild(dt, time);
     }
 }

code/branches/gui/src/orxonox/gamestates/GSRoot.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "core/GameState.h"
+#include "core/RootGameState.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSRoot : public GameState
+    class _OrxonoxExport GSRoot : public RootGameState
     {
     public:
@@ -42 +42 @@
 
         void feedCommandLine(int argc, char** argv);
-        void loadGame(const std::string& name);
 
         void exitGame()
         { requestState("root"); }
-        bool isGameFinished() { return (this->getActiveChild() == 0); }
 
     private:
         void enter();
         void leave();
-        void ticked(float dt);
+        void ticked(float dt, uint64_t time);
 
         Settings*             settings_;
-        GraphicsEngine*       graphicsEngine_;   //!< our dearest graphics engine <3
-        bool                  bExit_;
+        GraphicsEngine*       graphicsEngine_;   //!< Interface to Ogre
     };
 }
 
-#endif /* _GSGraphics_H__ */
+#endif /* _GSRoot_H__ */

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

@@ -83 +83 @@
     }
 
-    void GSServer::ticked(float dt)
+    void GSServer::ticked(float dt, uint64_t time)
     {
-        GSLevel::ticked(dt);
+        GSLevel::ticked(dt, time);
         server_->tick(dt);
-        this->tickChild(dt);
+        this->tickChild(dt, time);
     }
 }

code/branches/gui/src/orxonox/gamestates/GSServer.h

@@ -46 +46 @@
         void enter();
         void leave();
-        void ticked(float dt);
+        void ticked(float dt, uint64_t time);
 
         network::Server*      server_;

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

@@ -70 +70 @@
     }
 
-    void GSStandalone::ticked(float dt)
+    void GSStandalone::ticked(float dt, uint64_t time)
     {
-        GSLevel::ticked(dt);
+        GSLevel::ticked(dt, time);
 
-        this->tickChild(dt);
+        this->tickChild(dt, time);
     }
 }

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

@@ -45 +45 @@
         void enter();
         void leave();
-        void ticked(float dt);
+        void ticked(float dt, uint64_t time);
     };
 }