MouseInputHandler

include/Engine/Input/InputProxy.h

@@ -20,6 +20,7 @@ public:
     void Process();
     template <typename T>
     void AddHandler();
+    void Publish(const Events::InputCommand& e);
 
 protected:
     EventBroker* m_EventBroker;
@@ -27,7 +28,7 @@ protected:
     std::map<std::string, std::set<InputHandler*>> m_CommandHandlers;
     
     // Represents every unique command (has of PlayerID & Command) and all values reported for that command this frame
-    //std::map<std::pair<unsigned int, std::string>, std::vector<float>> m_CommandQueue;
+    std::map<std::pair<unsigned int, std::string>, std::vector<float>> m_CommandQueue;
 
     std::map<std::string, float> m_CurrentCommandValues;
     std::map<std::string, float> m_LastCommandValues;

include/Engine/Input/MouseInputHandler.h

@@ -13,12 +13,15 @@ public:
     MouseInputHandler(EventBroker* eventBroker, InputProxy* inputProxy);
 
     bool BindOrigin(std::string origin, std::string command, float value) override;
+    virtual float GetCommandValue(std::string command) override;
 
 private:
     std::unordered_map<std::string, int> m_OriginCodes;
     std::unordered_map<std::string, char> m_OriginAxes;
 	std::unordered_map<int, std::tuple<std::string, float>> m_Bindings; // GLFW_MOUSE_BUTTON... -> command string & value
 	std::unordered_map<char, std::tuple<std::string, float>> m_Axes; // Axis -> command string & value
+    std::unordered_map<std::string, float> m_CommandValues;
+    std::unordered_map<std::string, float> m_ContinuousCommandValues;
 
 	EventRelay<InputHandler, Events::MousePress> m_EMousePress;
     bool OnMousePress(const Events::MousePress& e);
@@ -28,6 +31,8 @@ private:
 	bool OnMouseMove(const Events::MouseMove& e);
 
     bool hasOrigin(std::string origin);
+
+
 };
 
 #endif

include/Engine/Rendering/DebugCameraInputController.h

@@ -0,0 +1,48 @@
+#include "../Input/FirstPersonInputController.h"
+
+template <typename EventContext>
+class DebugCameraInputController : public FirstPersonInputController<EventContext>
+{
+public:
+    DebugCameraInputController(EventBroker* eventBroker, unsigned int playerID)
+        : FirstPersonInputController(eventBroker, playerID)
+    { }
+
+    const glm::vec3 Position() const { return m_Position; }
+    void SetBaseSpeed(float speed) { m_BaseSpeed = speed; }
+
+    virtual bool OnCommand(const Events::InputCommand& e) override
+    {
+        if (e.Command == "PrimaryFire") {
+            if (e.Value > 0) {
+                LockMouse();
+            } else {
+                UnlockMouse();
+            }
+            return false;
+        }
+
+        if (e.Command == "Right") {
+            float value = std::max(-1.f, std::min(e.Value, 1.f));
+            m_Velocity.x = value;
+        }
+        if (e.Command == "Forward") {
+            float value = std::max(-1.f, std::min(e.Value, 1.f));
+            m_Velocity.z = -value;
+        }
+
+        return FirstPersonInputController::OnCommand(e);
+    }
+
+    void Update(double dt)
+    {
+        if (glm::length2(m_Velocity) > 0) {
+            m_Position += m_Orientation * (glm::normalize(m_Velocity) * m_BaseSpeed);
+        }
+    }
+
+protected:
+    glm::vec3 m_Position = glm::vec3(0, 0, 0);
+    glm::vec3 m_Velocity = glm::vec3(0, 0, 0);
+    float m_BaseSpeed = 0.1f;
+};