Changeset 1660

Timestamp:

Aug 17, 2008, 7:27:36 PM (16 years ago)

Author:

rgrieder

Message:

GameState class added. Tested and working, but now comes the hard part: Implementing the actual states…

Location:

code/branches/gui

Files:

• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/Exception.h (modified) (4 diffs)
• src/core/GameState.cc (added)
• src/core/GameState.h (added)
• src/core/input/InputManager.cc (modified) (1 diff)
• src/orxonox/Main.cc (modified) (2 diffs)
• visual_studio/vc8/core.vcproj (modified) (2 diffs)

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

@@ -5 +5 @@
   Error.cc
   Exception.cc
+  GameState.cc
   Language.cc
   OrxonoxClass.cc

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

@@ -43 +43 @@
 #include "core/Debug.h"
 
+// Define some ugly macros to make things more clear
+#define CREATE_ORXONOX_EXCEPTION(name) typedef SpecificException<Exception::name> name##Exception;
+#define RETURN_EXCEPTION_CODE(name) \
+    case Exception::name:           \
+        return #name;
+
+
 namespace orxonox
 {
@@ -54 +61 @@
             PluginsNotFound,
             InitialisationFailed,
-            NotImplemented
+            NotImplemented,
+            GameState
         };
 
@@ -106 +114 @@
         std::string getTypeName() const
         {
-            // note: break is not necessary due to the return. Keep in mind!
+            // note: break is not necessary due to the return in the macros.
             switch (Type)
             {
-            case Exception::General:
-                return "General";
-            case Exception::FileNotFound:
-                return "FileNotFound";
-            case Exception::PluginsNotFound:
-                return "PluginsNotFound";
-            case Exception::InitialisationFailed:
-                return "InitialisationFailed";
-            case Exception::NotImplemented:
-                return "NotImplemented";
+            RETURN_EXCEPTION_CODE(General)
+            RETURN_EXCEPTION_CODE(FileNotFound);
+            RETURN_EXCEPTION_CODE(PluginsNotFound);
+            RETURN_EXCEPTION_CODE(InitialisationFailed);
+            RETURN_EXCEPTION_CODE(NotImplemented);
+            RETURN_EXCEPTION_CODE(GameState);
             default:
                 return "";
@@ -125 +129 @@
     };
 
-    typedef SpecificException<Exception::General> GeneralException;
-    typedef SpecificException<Exception::FileNotFound> FileNotFoundException;
-    typedef SpecificException<Exception::PluginsNotFound> PluginsNotFoundException;
-    typedef SpecificException<Exception::InitialisationFailed> InitialisationFailedException;
-    typedef SpecificException<Exception::NotImplemented> NotImplementedException;
+    // define the template spcialisations
+    CREATE_ORXONOX_EXCEPTION(General);
+    CREATE_ORXONOX_EXCEPTION(FileNotFound);
+    CREATE_ORXONOX_EXCEPTION(PluginsNotFound);
+    CREATE_ORXONOX_EXCEPTION(InitialisationFailed);
+    CREATE_ORXONOX_EXCEPTION(NotImplemented);
+    CREATE_ORXONOX_EXCEPTION(GameState);
 
 #define ThrowException(type, description) \

code/branches/gui/src/core/input/InputManager.cc

@@ -498 +498 @@
 
             joySticks_.clear();
-            _redimensionLists();
+            // don't use _redimensionLists(), might mess with registered handler if
+            // downgrading from 2 to 1 joystick
+            //_redimensionLists();
+            joySticksSize_ = 0;
         }
         CCOUT(4) << "Joy sticks destroyed." << std::endl;

code/branches/gui/src/orxonox/Main.cc

@@ -110 +110 @@
 }
 
+#include "core/GameState.h"
+
 #ifdef __cplusplus
 extern "C" {
@@ -125 +127 @@
         return 0;
     }
+
+
+    /*GameState* state1 = new GameState("state1");
+    GameState* state2 = new GameState("state2");
+    GameState* state3 = new GameState("state3");
+    GameState* state4 = new GameState("state4");
+    GameState* state5 = new GameState("state5");
+    GameState* state6 = new GameState("state6");
+
+    state1->addChild(state4);
+    state1->addChild(state6);
+    state2->addChild(state3);
+    state2->addChild(state5);
+    state3->addChild(state1);
+    state6->addChild(state2);
+
+    state5->requestState("state3");
+    COUT(2) << std::endl;
+    state2->requestState("state2");
+    COUT(2) << std::endl;
+    state2->requestState("state1");
+    COUT(2) << std::endl;
+    state4->requestState("state3");
+    COUT(2) << std::endl;
+    state1->requestState("state4");
+    COUT(2) << std::endl;
+    state1->requestState("state2");
+    COUT(2) << std::endl;
+    state1->requestState("stat");
+    COUT(2) << std::endl;
+    state1->requestState("state5");
+    COUT(2) << std::endl;*/
+
+
 
     Orxonox orxonoxInstance;

code/branches/gui/visual_studio/vc8/core.vcproj

@@ -169 +169 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\GameState.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\Language.cc"
                                 >
@@ -400 +404 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\GameState.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\Language.h"
                                 >