Basic movement and camera management between players and editor

include/Engine/Input/EInputCommand.h

@@ -9,7 +9,7 @@ namespace Events
 struct InputCommand : Event
 {
 	/** Numerical ID of the player. */
-	unsigned int PlayerID;
+	int PlayerID;
 	/** The command that was sent. */
 	std::string Command;
 	/** The value of the command. */

include/Engine/Input/FirstPersonInputController.h

@@ -9,7 +9,7 @@ template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
 {
 public:
-    FirstPersonInputController(EventBroker* eventBroker, unsigned int playerID)
+    FirstPersonInputController(EventBroker* eventBroker, int playerID)
         : InputController(eventBroker)
         , m_PlayerID(playerID)
     {
@@ -17,7 +17,8 @@ public:
         EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
     }
 
-    const glm::quat Orientation() const { return m_Orientation; }
+    virtual const glm::vec3 Movement() const { return m_Movement; }
+    virtual const glm::vec3 Orientation() const { return m_Orientation; }
     
     void LockMouse()
     {
@@ -42,24 +43,44 @@ public:
         if (m_MouseLocked) {
             if (e.Command == "Pitch") {
                 float val = glm::radians(e.Value);
-                m_Orientation = m_Orientation * glm::angleAxis<float>(-val, glm::vec3(1, 0, 0));
+                m_Orientation.x += -val;
+                m_Orientation.x = glm::clamp(m_Orientation.x, -glm::half_pi<float>(), glm::half_pi<float>());
+                //m_Orientation = m_Orientation * glm::angleAxis<float>(-val, glm::vec3(1.f, 0, 0));
                 return true;
             }
 
             if (e.Command == "Yaw") {
                 float val = glm::radians(e.Value);
-                m_Orientation = glm::angleAxis<float>(-val, glm::vec3(0, 1, 0)) * m_Orientation;
+                m_Orientation.y += -val;
+                //m_Orientation = glm::angleAxis<float>(-val, glm::vec3(0, 1.f, 0)) * m_Orientation;
                 return true;
             }
         }
 
+        if (e.Command == "Forward" || e.Command == "Right") {
+            if (e.Command == "Forward") {
+                float val = glm::clamp(e.Value, -1.f, 1.f);
+                m_Movement.z = -val;
+                return true;
+            }
+            if (e.Command == "Right") {
+                float val = glm::clamp(e.Value, -1.f, 1.f);
+                m_Movement.x = val;
+                return true;
+            }
+            if (glm::length2(m_Movement) > 0) {
+                m_Movement = glm::normalize(m_Movement);
+            }
+        }
+
         return false;
     }
 
 protected:
-    const unsigned int m_PlayerID;
-    glm::quat m_Orientation;
+    const int m_PlayerID;
     bool m_MouseLocked = false;
+    glm::vec3 m_Orientation;
+    glm::vec3 m_Movement;
     
     EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
     bool OnLockMouse(const Events::LockMouse& e) { m_MouseLocked = true; return true; }