Changeset 2805 for code/branches/gui

Timestamp:

Mar 19, 2009, 4:59:30 PM (16 years ago)

Author:

rgrieder

Message:

Added new class: Game
It represents basic operation related to the running game like start and stop or managing the new GameStates.
And since only three lines were left in Main.cc I thought I could move that to the very beginning of 'Game'.

Location:

code/branches/gui/src

Files:

• core/Clock.h (modified) (2 diffs)
• core/GameState.h (modified) (1 diff)
• core/RootGameState.cc (modified) (2 diffs)
• core/RootGameState.h (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/Game.cc (added)
• orxonox/Game.h (added)
• orxonox/GraphicsManager.h (modified) (2 diffs)
• orxonox/Main.cc (deleted)
• orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (2 diffs)
• orxonox/gamestates/GSRoot.h (modified) (2 diffs)

code/branches/gui/src/core/Clock.h

@@ -45 +45 @@
     class _CoreExport Clock
     {
-        friend class RootGameState;
-
     public:
         Clock();
         ~Clock();
+
+        void capture();
 
         unsigned long long getMicroseconds()   const { return tickTime_; }
@@ -63 +63 @@
     private:
         Clock(const Clock& instance);
-        void capture();
 
         Ogre::Timer*       timer_;

code/branches/gui/src/core/GameState.h

@@ -65 +65 @@
         template <class ParentType>
         friend class GameState;
+        // Hack
+        friend class Game;
 
     public:

code/branches/gui/src/core/RootGameState.cc

@@ -32 +32 @@
 #include "util/Exception.h"
 #include "Clock.h"
-#include "CommandLine.h"
 
 namespace orxonox
 {
-    SetCommandLineArgument(state, "gui").shortcut("s");
-
     RootGameState::RootGameState(const std::string& name)
         : GameState<GameStateBase>(name)
@@ -119 +116 @@
         this->stateRequest_ = name;
     }
-
-    /**
-    @brief
-        Main loop of the orxonox game.
-        Starts the game. The little 'while' denotes the main loop.
-        Whenever the root state is selected, the game ends.
-    @param name
-        State to start with (usually main menu or specified by command line)
-    @note
-        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!).
-    */
-    void RootGameState::start()
-    {
-        // Don't catch errors when having a debugger in msvc
-#if !defined(ORXONOX_COMPILER_MSVC) || defined(NDEBUG)
-        try
-        {
-#endif
-            // start global orxonox time
-            Clock clock;
-
-            this->activate();
-
-            // get initial state from command line
-            gotoState(CommandLine::getValue("state"));
-
-            while (this->activeChild_)
-            {
-                clock.capture();
-
-                this->tick(clock);
-
-                if (this->stateRequest_ != "")
-                    gotoState(stateRequest_);
-            }
-
-            this->deactivate();
-#if !defined(ORXONOX_COMPILER_MSVC) || defined(NDEBUG)
-        }
-        // Note: These are all unhandled exceptions that should not have made its way here!
-        // almost complete game catch block to display the messages appropriately.
-        catch (std::exception& ex)
-        {
-            COUT(0) << ex.what() << std::endl;
-            COUT(0) << "Program aborted." << std::endl;
-            abort();
-        }
-        // anything that doesn't inherit from std::exception
-        catch (...)
-        {
-            COUT(0) << "An unidentifiable exception has occured. Program aborted." << std::endl;
-            abort();
-        }
-#endif
-    }
 }

code/branches/gui/src/core/RootGameState.h

@@ -37 +37 @@
     class _CoreExport RootGameState : public GameState<GameStateBase>
     {
+        // Hack!
+        friend class Game;
+
     public:
         RootGameState(const std::string& name);
@@ -42 +45 @@
 
         void requestState(const std::string& name);
-        void start();
 
     private:

code/branches/gui/src/orxonox/CMakeLists.txt

@@ -20 +20 @@
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
   CameraManager.cc
+  Game.cc
   GraphicsManager.cc
   LevelManager.cc
-  Main.cc
   PawnManager.cc
   PlayerManager.cc

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

@@ -34 +34 @@
  */
 
-#ifndef _GraphicsEngine_H__
-#define _GraphicsEngine_H__
+#ifndef _GraphicsManager_H__
+#define _GraphicsManager_H__
 
 #include "OrxonoxPrereqs.h"
@@ -131 +131 @@
 }
 
-#endif /* _GraphicsEngine_H__ */
+#endif /* _GraphicsManager_H__ */

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

@@ -75 +75 @@
         Core::setShowsGraphics(true);
 
-        // initialise graphics engine. Doesn't load the render window yet!
+        // initialise graphics manager. Doesn't load the render window yet!
         this->graphicsManager_ = new GraphicsManager();
         this->graphicsManager_->initialise();

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

@@ -80 +80 @@
         {
             // add console commands
-            FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::exitGame);
-            functor->setObject(this);
-            this->ccExit_ = createConsoleCommand(functor, "exit");
-            CommandExecutor::addConsoleCommandShortcut(this->ccExit_);
-        }
-
-        {
-            // add console commands
             FunctorMember01<GameStateBase, const std::string&>* functor = createFunctor(&GameStateBase::requestState);
             functor->setObject(this);
@@ -114 +106 @@
     {
         // destroy console commands
-        delete this->ccExit_;
         delete this->ccSelectGameState_;
 

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

@@ -53 +53 @@
         ~GSRoot();
 
-        void exitGame()
-        { requestState("root"); }
-
         // this has to be public because proteced triggers a bug in msvc
         // when taking the function address.
@@ -93 +90 @@
 
         // console commands
-        ConsoleCommand*       ccExit_;
         ConsoleCommand*       ccSelectGameState_;
         ConsoleCommand*       ccSetTimeFactor_;