Changeset 1670 for code/branches/gui/src/core/input/InputManager.h

Timestamp:

Aug 26, 2008, 4:26:04 PM (16 years ago)

Author:

rgrieder

Message:

Still working on the GameStates, but I have to save the work because of some major changes.

• Exported InputManager- and TclThreadManager-tick to GSGraphics instead of Core
• Fixed a few bugs in GameState by adding an internal state variable as bitfield (quite practical)
• Fixed a bug in InputManager that occurred when destroying an active InputState
• Added GSIO and GSIOConsole (3 lines of loop code with std::cin, but works )
• Added more boost thread includes to OrxonoxStableHeaders.h
• Many changes in all GameState derived classes

File:

• code/branches/gui/src/core/input/InputManager.h (modified) (3 diffs)

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

@@ -127 +127 @@
         }
 
-        bool destroyState          (const std::string& name);
         InputState* getState       (const std::string& name);
         InputState* getCurrentState();
+        bool requestDestroyState   (const std::string& name);
         bool requestEnterState     (const std::string& name);
         bool requestLeaveState     (const std::string& name);
+
+        void tick(float dt);
 
         static InputManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; }
@@ -167 +169 @@
         void _updateActiveStates();
         bool _configureInputState(InputState* state, const std::string& name, int priority);
-
-        void tick(float dt);
 
         // input events
@@ -204 +204 @@
         std::map<int, InputState*>          inputStatesByPriority_;
 
-        std::vector<InputState*>            stateEnterRequests_;   //!< Request to enter a new state
-        std::vector<InputState*>            stateLeaveRequests_;   //!< Request to leave the current state
+        std::set<InputState*>               stateEnterRequests_;   //!< Request to enter a new state
+        std::set<InputState*>               stateLeaveRequests_;   //!< Request to leave a running state
+        std::set<InputState*>               stateDestroyRequests_; //!< Request to destroy a state
 
         std::map<int, InputState*>          activeStates_;