Changeset 2805 for code/branches/gui/src/orxonox

Timestamp:

Mar 19, 2009, 4:59:30 PM (15 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/orxonox

Files:

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

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_;