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

Timestamp:

Aug 31, 2008, 6:07:57 PM (16 years ago)

Author:

rgrieder

Message:

• renamed:

GameState —> GameStateBase
GameStateTyped<T> —> GameState

• moved command line parsing from GSRoot to RootGameState.

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSGUI.cc (modified) (1 diff)
• GSGUI.h (modified) (1 diff)
• GSGraphics.cc (modified) (1 diff)
• GSGraphics.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) (2 diffs)
• GSRoot.h (modified) (1 diff)

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

@@ -39 +39 @@
 {
     GSGUI::GSGUI()
-        : GameStateTyped<GSGraphics>("gui")
+        : GameState<GSGraphics>("gui")
     {
     }

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

@@ -36 +36 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSGUI : public GameStateTyped<GSGraphics>
+    class _OrxonoxExport GSGUI : public GameState<GSGraphics>
     {
     public:

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

@@ -57 +57 @@
 {
     GSGraphics::GSGraphics()
-        : GameStateTyped<GSRoot>("graphics")
+        : GameState<GSRoot>("graphics")
         , ogreRoot_(0)
         , inputManager_(0)

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

@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSGraphics : public GameStateTyped<GSRoot>, public OrxonoxClass, public Ogre::WindowEventListener
+    class _OrxonoxExport GSGraphics : public GameState<GSRoot>, public OrxonoxClass, public Ogre::WindowEventListener
     {
         friend class ClassIdentifier<GSGraphics>;

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

@@ -42 +42 @@
 {
     GSIOConsole::GSIOConsole()
-        : GameStateTyped<GSRoot>("ioConsole")
+        : GameState<GSRoot>("ioConsole")
     {
     }

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

@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSIOConsole : public GameStateTyped<GSRoot>
+    class _OrxonoxExport GSIOConsole : public GameState<GSRoot>
     {
     public:

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

@@ -45 +45 @@
 {
     GSLevel::GSLevel(const std::string& name)
-        : GameStateTyped<GSGraphics>(name)
+        : GameState<GSGraphics>(name)
         , timeFactor_(1.0f)
         , sceneManager_(0)

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

@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSLevel : public GameStateTyped<GSGraphics>
+    class _OrxonoxExport GSLevel : public GameState<GSGraphics>
     {
     public:

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

@@ -91 +91 @@
     }
 
-    //SetCommandLineArgument(asdf1, "haha").setShortcut("a").setUsageInformation("1|2|3");
-    //SetCommandLineArgument(asdf2, 3).setShortcut("b");
-    //SetCommandLineArgument(asdf3, Vector2()).setShortcut("c");
-    //SetCommandLineArgument(adsf4, 1.4f).setShortcut("d");
-    //SetCommandLineSwitch(showGraphics).setShortcut("g");
-
-    void GSRoot::feedCommandLine(int argc, char** argv)
-    {
-        std::vector<std::string> args;
-        for (int i = 1; i < argc; ++i)
-            args.push_back(argv[i]);
-
-        //std::string line = "-a --asdf3 (3,3) -d -5 -b - 5.4";
-        //SubString tokens(line, " ", " ", false, 92, false, 34, true, 40, 41, false, 0);
-
-        try
-        {
-            orxonox::CommandLine::parse(args);
-            //CommandLine::parse(tokens.getAllStrings());
-        }
-        catch (orxonox::ArgumentException& ex)
-        {
-            COUT(1) << ex.what() << std::endl;
-            COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
-        }
-    }
-
     void GSRoot::enter()
     {
@@ -165 +138 @@
 
         // add console commands
-        FunctorMember01<GameState, const std::string&>* functor2 = createFunctor(&GameState::requestState);
+        FunctorMember01<GameStateBase, const std::string&>* functor2 = createFunctor(&GameStateBase::requestState);
         functor2->setObject(this);
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor2, "selectGameState"));

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

@@ -44 +44 @@
         ~GSRoot();
 
-        void feedCommandLine(int argc, char** argv);
-
         void exitGame()
         { requestState("root"); }