Changeset 1672 for code/branches/gui/src/core/input

Timestamp:

Aug 27, 2008, 10:21:39 PM (16 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/core/input/InputManager.cc (modified) (2 diffs)

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

@@ -640 +640 @@
 
         // check for states to leave
-        for (std::set<InputState*>::reverse_iterator it = stateLeaveRequests_.rbegin();
-            it != stateLeaveRequests_.rend(); ++it)
-        {
-            (*it)->onLeave();
+        for (std::set<InputState*>::reverse_iterator rit = stateLeaveRequests_.rbegin();
+            rit != stateLeaveRequests_.rend(); ++rit)
+        {
+            (*rit)->onLeave();
             // just to be sure that the state actually is registered
-            assert(inputStatesByName_.find((*it)->getName()) != inputStatesByName_.end());
-
-            activeStates_.erase((*it)->getPriority());
+            assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
+
+            activeStates_.erase((*rit)->getPriority());
             _updateActiveStates();
         }
@@ -653 +653 @@
 
         // check for states to enter
-        for (std::set<InputState*>::reverse_iterator it = stateEnterRequests_.rbegin();
-            it != stateEnterRequests_.rend(); ++it)
+        for (std::set<InputState*>::reverse_iterator rit = stateEnterRequests_.rbegin();
+            rit != stateEnterRequests_.rend(); ++rit)
         {
             // just to be sure that the state actually is registered
-            assert(inputStatesByName_.find((*it)->getName()) != inputStatesByName_.end());
-
-            activeStates_[(*it)->getPriority()] = (*it);
+            assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
+
+            activeStates_[(*rit)->getPriority()] = (*rit);
             _updateActiveStates();
-            (*it)->onEnter();
+            (*rit)->onEnter();
         }
         stateEnterRequests_.clear();
 
         // check for states to destroy
-        for (std::set<InputState*>::reverse_iterator it = stateDestroyRequests_.rbegin();
-            it != stateDestroyRequests_.rend(); ++it)
-        {
-            _destroyState((*it));
+        for (std::set<InputState*>::reverse_iterator rit = stateDestroyRequests_.rbegin();
+            rit != stateDestroyRequests_.rend(); ++rit)
+        {
+            _destroyState((*rit));
         }