Changeset 10916 for code/branches/cpp11_v2/src/libraries/core/input

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

Location:

code/branches/cpp11_v2/src/libraries/core/input

Files:

• Button.cc (modified) (1 diff)
• InputBuffer.cc (modified) (4 diffs)
• InputDevice.h (modified) (3 diffs)
• InputManager.cc (modified) (4 diffs)
• JoyStick.cc (modified) (1 diff)
• KeyBinder.cc (modified) (6 diffs)
• KeyBinder.h (modified) (1 diff)
• Mouse.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/libraries/core/input/Button.cc

@@ -196 +196 @@
 
                     // add command to the buffer if not yet existing
-                    for (auto & elem : *paramCommandBuffer_)
-                    {
-                        if (elem->evaluation_.getConsoleCommand()
+                    for (BufferedParamCommand* command : *paramCommandBuffer_)
+                    {
+                        if (command->evaluation_.getConsoleCommand()
                             == eval.getConsoleCommand())
                         {
                             // already in list
-                            cmd->paramCommand_ = elem;
+                            cmd->paramCommand_ = command;
                             break;
                         }

code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.cc

@@ -110 +110 @@
     void InputBuffer::insert(const std::string& input, bool update)
     {
-        for (auto & elem : input)
-        {
-            this->insert(elem, false);
+        for (const char& inputChar : input)
+        {
+            this->insert(inputChar, false);
 
             if (update)
-                this->updated(elem, false);
+                this->updated(inputChar, false);
         }
 
@@ -170 +170 @@
     void InputBuffer::updated()
     {
-        for (auto & elem : this->listeners_)
-        {
-            if ((elem)->bListenToAllChanges_)
-                (elem)->callFunction();
+        for (BaseInputBufferListenerTuple* listener : this->listeners_)
+        {
+            if (listener->bListenToAllChanges_)
+                listener->callFunction();
         }
     }
@@ -179 +179 @@
     void InputBuffer::updated(const char& update, bool bSingleInput)
     {
-        for (auto & elem : this->listeners_)
-        {
-            if ((!(elem)->trueKeyFalseChar_) && ((elem)->bListenToAllChanges_ || ((elem)->char_ == update)) && (!(elem)->bOnlySingleInput_ || bSingleInput))
-                (elem)->callFunction();
+        for (BaseInputBufferListenerTuple* listener : this->listeners_)
+        {
+            if ((!listener->trueKeyFalseChar_) && (listener->bListenToAllChanges_ || (listener->char_ == update)) && (!listener->bOnlySingleInput_ || bSingleInput))
+                listener->callFunction();
         }
     }
@@ -201 +201 @@
             return;
 
-        for (auto & elem : this->listeners_)
-        {
-            if ((elem)->trueKeyFalseChar_ && ((elem)->key_ == evt.getKeyCode()))
-                (elem)->callFunction();
+        for (BaseInputBufferListenerTuple* listener : this->listeners_)
+        {
+            if (listener->trueKeyFalseChar_ && (listener->key_ == evt.getKeyCode()))
+                listener->callFunction();
         }
 

code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h

@@ -158 +158 @@
 
             // Call all the states with the held button event
-            for (auto & button : pressedButtons_)
-                for (auto & state : inputStates_)
+            for (ButtonType& button : pressedButtons_)
+                for (InputState* state : inputStates_)
                     state->template buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
                         this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
 
             // Call states with device update events
-            for (auto & elem : inputStates_)
-                elem->update(time.getDeltaTime(), this->getDeviceID());
+            for (InputState* state : inputStates_)
+                state->update(time.getDeltaTime(), this->getDeviceID());
 
             static_cast<DeviceClass*>(this)->updateImpl(time);
@@ -196 +196 @@
 
             // Call states
-            for (auto & elem : inputStates_)
-                elem->template buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+            for (InputState* state : inputStates_)
+                state->template buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 
@@ -218 +218 @@
 
             // Call states
-            for (auto & elem : inputStates_)
-                elem->template buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+            for (InputState* state : inputStates_)
+                state->template buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 

code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc

@@ -373 +373 @@
         // check whether a state has changed its EMPTY situation
         bool bUpdateRequired = false;
-        for (auto & elem : activeStates_)
-        {
-            if (elem.second->hasExpired())
-            {
-                elem.second->resetExpiration();
+        for (auto& mapEntry : activeStates_)
+        {
+            if (mapEntry.second->hasExpired())
+            {
+                mapEntry.second->resetExpiration();
                 bUpdateRequired = true;
             }
@@ -391 +391 @@
 
         // Collect function calls for the update
-        for (auto & elem : activeStatesTicked_)
-            elem->update(time.getDeltaTime());
+        for (InputState* state : activeStatesTicked_)
+            state->update(time.getDeltaTime());
 
         // Execute all cached function calls in order
@@ -401 +401 @@
         // If we delay the calls, then OIS and and the InputStates are not anymore
         // in the call stack and can therefore be edited.
-        for (auto & elem : this->callBuffer_)
-            elem();
+        for (auto& function : this->callBuffer_)
+            function();
 
         this->callBuffer_.clear();
@@ -437 +437 @@
         // Using an std::set to avoid duplicates
         std::set<InputState*> tempSet;
-        for (auto & elem : devices_)
-            if (elem != nullptr)
-                for (unsigned int iState = 0; iState < elem->getStateListRef().size(); ++iState)
-                    tempSet.insert(elem->getStateListRef()[iState]);
+        for (InputDevice* device : devices_)
+            if (device != nullptr)
+                for (unsigned int iState = 0; iState < device->getStateListRef().size(); ++iState)
+                    tempSet.insert(device->getStateListRef()[iState]);
 
         // Copy the content of the std::set back to the actual vector
         activeStatesTicked_.clear();
-        for (const auto & elem : tempSet)
-            activeStatesTicked_.push_back(elem);
+        for (InputState* state : tempSet)
+            activeStatesTicked_.push_back(state);
 
         // Check whether we have to change the mouse mode

code/branches/cpp11_v2/src/libraries/core/input/JoyStick.cc

@@ -186 +186 @@
     void JoyStick::clearBuffersImpl()
     {
-        for (auto & elem : povStates_)
-            elem = 0;
+        for (int& state : povStates_)
+            state = 0;
     }
 

code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc

@@ -153 +153 @@
     void KeyBinder::buttonThresholdChanged()
     {
-        for (auto & elem : allHalfAxes_)
-            if (!elem->bButtonThresholdUser_)
-                elem->buttonThreshold_ = this->buttonThreshold_;
+        for (HalfAxis* halfAxis : allHalfAxes_)
+            if (!halfAxis->bButtonThresholdUser_)
+                halfAxis->buttonThreshold_ = this->buttonThreshold_;
     }
 
@@ -383 +383 @@
             it->second->clear();
 
-        for (auto & elem : paramCommandBuffer_)
-            delete elem;
+        for (BufferedParamCommand* command : paramCommandBuffer_)
+            delete command;
         paramCommandBuffer_.clear();
     }
@@ -394 +394 @@
     {
         // iterate over all buttons
-        for (const auto & elem : this->allButtons_)
-        {
-            Button* button = elem.second;
+        for (const auto& mapEntry : this->allButtons_)
+        {
+            Button* button = mapEntry.second;
 
             // iterate over all modes
@@ -465 +465 @@
         this->mousePosition_[1] = 0.0f;
 
-        for (auto & elem : mouseAxes_)
-            elem.reset();
+        for (HalfAxis& axis : mouseAxes_)
+            axis.reset();
     }
 
@@ -505 +505 @@
         }
 
-        for (auto & elem : mouseAxes_)
+        for (HalfAxis& axis : mouseAxes_)
         {
             // Why dividing relative value by dt? The reason lies in the simple fact, that when you
@@ -515 +515 @@
             {
                 // just ignore if dt == 0.0 because we have multiplied by 0.0 anyway..
-                elem.relVal_ /= dt;
-            }
-
-            tickHalfAxis(elem);
+                axis.relVal_ /= dt;
+            }
+
+            tickHalfAxis(axis);
         }
     }

code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h

@@ -226 +226 @@
     {
         // execute all buffered bindings (additional parameter)
-        for (auto & elem : paramCommandBuffer_)
+        for (BufferedParamCommand* command : paramCommandBuffer_)
         {
-            elem->rel_ *= dt;
-            elem->execute();
+            command->rel_ *= dt;
+            command->execute();
         }
 
         // always reset the relative movement of the mouse
-        for (auto & elem : mouseAxes_)
-            elem.relVal_ = 0.0f;
+        for (HalfAxis& axis : mouseAxes_)
+            axis.relVal_ = 0.0f;
     }
 }// tolua_export

code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc

@@ -82 +82 @@
             IntVector2 rel(e.state.X.rel, e.state.Y.rel);
             IntVector2 clippingSize(e.state.width, e.state.height);
-            for (auto & elem : inputStates_)
-                elem->mouseMoved(abs, rel, clippingSize);
+            for (InputState* state : inputStates_)
+                state->mouseMoved(abs, rel, clippingSize);
         }
 
@@ -89 +89 @@
         if (e.state.Z.rel != 0)
         {
-            for (auto & elem : inputStates_)
-                elem->mouseScrolled(e.state.Z.abs, e.state.Z.rel);
+            for (InputState* state : inputStates_)
+                state->mouseScrolled(e.state.Z.abs, e.state.Z.rel);
         }