Changeset 1672 for code/branches/gui/src/orxonox/gamestates/GSRoot.h

Timestamp:

Aug 27, 2008, 10:21:39 PM (17 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

File:

• code/branches/gui/src/orxonox/gamestates/GSRoot.h (modified) (2 diffs)

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__ */