Refactored InputProxy to gracefully handle cases where multiple origins send the same command

src/Engine/Input/InputProxy.cpp

@@ -22,7 +22,16 @@ void InputProxy::LoadBindings(std::string file)
         e.Origin = origin.first;
         e.Command = origin.second;
         e.Value = 1.f;
-        OnBindOrigin(e);
+        if (!e.Command.empty()) {
+            char prefix = e.Command.at(0);
+            if (prefix == '+' || prefix == '-') {
+                e.Command = e.Command.substr(1);
+                if (prefix == '-') {
+                    e.Value *= -1.f;
+                }
+            }
+            OnBindOrigin(e);
+        }
     }
 }
 
@@ -37,26 +46,26 @@ void InputProxy::Update(double dt)
 
 void InputProxy::Process()
 {
-    // Accumulate the input values of all unique commands published by input handlers
-    for (auto& pair : m_CommandQueue) {
-        Events::InputCommand e;
-        e.PlayerID = pair.first.first;
-        e.Command = pair.first.second;
-        e.Value = 0;
-        for (auto& value : pair.second) {
-            e.Value += value;
+    for (auto& pair : m_CommandHandlers) {
+        const std::string& command = pair.first;
+        auto handlers = pair.second;
+        m_CurrentCommandValues[command] = 0.f;
+        for (auto& handler : handlers) {
+            m_CurrentCommandValues[command] += handler->GetCommandValue(command);
         }
-        //e.Value = std::max(-1.f, std::min(e.Value, 1.f));
-        m_EventBroker->Publish(e);
-        LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
-    }
-    m_CommandQueue.clear();
-}
 
-void InputProxy::Publish(const Events::InputCommand& e)
-{
-    auto key = std::make_pair(e.PlayerID, e.Command);
-    m_CommandQueue[key].push_back(e.Value);
+        auto last = m_LastCommandValues.find(command);
+        float currentValue = m_CurrentCommandValues[command];
+        if (last == m_LastCommandValues.end() || last->second != currentValue) {
+            Events::InputCommand e;
+            e.PlayerID = -1;
+            e.Command = command;
+            e.Value = currentValue;
+            m_EventBroker->Publish(e);
+            LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            m_LastCommandValues[command] = currentValue;
+        }
+    }
 }
 
 bool InputProxy::OnBindOrigin(const Events::BindOrigin& e)
@@ -65,6 +74,8 @@ bool InputProxy::OnBindOrigin(const Events::BindOrigin& e)
     for (auto& handler : m_Handlers) {
         bool result = handler->BindOrigin(e.Origin, e.Command, e.Value);
         if (result) {
+            m_CommandHandlers[e.Command].insert(handler);
+            m_LastCommandValues[e.Command] = 0.f;
             if (originBound) {
                 LOG_WARNING("Multiple handlers responded to binding input origin \"%s\"!", e.Origin.c_str());
             }