From 3aeeb3cad5e7aa3c9743e3bde3c4a27eb1eaf90d Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Sat, 23 Jan 2016 11:54:03 +0100
Subject: [PATCH] Moved FirstPersonInputController implementation out of header

---
 .../Engine/Input/FirstPersonInputController.h | 74 ++--------------
 .../Input/FirstPersonInputController.cpp      | 87 +++++++++++++++++++
 2 files changed, 94 insertions(+), 67 deletions(-)
 create mode 100644 src/Engine/Input/FirstPersonInputController.cpp

diff --git a/include/Engine/Input/FirstPersonInputController.h b/include/Engine/Input/FirstPersonInputController.h
index cd80fb21..4a55bf39 100644
--- a/include/Engine/Input/FirstPersonInputController.h
+++ b/include/Engine/Input/FirstPersonInputController.h
@@ -9,75 +9,15 @@ template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
 {
 public:
-    FirstPersonInputController(EventBroker* eventBroker, int playerID)
-        : InputController(eventBroker)
-        , m_PlayerID(playerID)
-    {
-        EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
-        EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
-    }
+    FirstPersonInputController(EventBroker* eventBroker, int playerID);
 
     virtual const glm::vec3 Movement() const { return m_Movement; }
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
     
-    void LockMouse()
-    {
-        Events::LockMouse e;
-        m_EventBroker->Publish(e);
-        m_MouseLocked = true;
-    }
-
-    void UnlockMouse()
-    {
-        Events::UnlockMouse e;
-        m_EventBroker->Publish(e);
-        m_MouseLocked = false;
-    }
-
-    virtual bool OnCommand(const Events::InputCommand& e) override
-    {
-        if (m_PlayerID != e.PlayerID) {
-            return false;
-        }
-
-        if (e.Command == "Pitch") {
-            float val = glm::radians(e.Value);
-            m_Rotation.x += -val;
-            m_Rotation.x = glm::clamp(m_Rotation.x, -glm::half_pi<float>(), glm::half_pi<float>());
-            //m_Rotation = m_Rotation * glm::angleAxis<float>(-val, glm::vec3(1.f, 0, 0));
-            return true;
-        }
-
-        if (e.Command == "Yaw") {
-            float val = glm::radians(e.Value);
-            m_Rotation.y += -val;
-            //m_Rotation = glm::angleAxis<float>(-val, glm::vec3(0, 1.f, 0)) * m_Rotation;
-            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;
-    }
-    
-    virtual void Reset()
-    {
-        m_Rotation = glm::vec3(0.f, 0.f, 0.f);
-    }
+    void LockMouse();
+    void UnlockMouse();
+    virtual bool OnCommand(const Events::InputCommand& e) override;
+    virtual void Reset();
 
 protected:
     const int m_PlayerID;
@@ -86,9 +26,9 @@ protected:
     glm::vec3 m_Movement;
     
     EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
-    bool OnLockMouse(const Events::LockMouse& e) { m_MouseLocked = true; return true; }
+    bool OnLockMouse(const Events::LockMouse& e);
     EventRelay<EventContext, Events::UnlockMouse> m_EUnlockMouse;
-    bool OnUnlockMouse(const Events::UnlockMouse& e) { m_MouseLocked = false; return true; }
+    bool OnUnlockMouse(const Events::UnlockMouse& e);
 };
 
 #endif
\ No newline at end of file
diff --git a/src/Engine/Input/FirstPersonInputController.cpp b/src/Engine/Input/FirstPersonInputController.cpp
new file mode 100644
index 00000000..cdacc606
--- /dev/null
+++ b/src/Engine/Input/FirstPersonInputController.cpp
@@ -0,0 +1,87 @@
+#include "Input/FirstPersonInputController.h"
+
+template <typename EventContext>
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID) 
+    : InputController(eventBroker)
+    , m_PlayerID(playerID)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
+    EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
+}
+
+template <typename EventContext>
+void FirstPersonInputController<EventContext>::Reset()
+{
+    m_Rotation = glm::vec3(0.f, 0.f, 0.f);
+}
+
+template <typename EventContext>
+void FirstPersonInputController<EventContext>::LockMouse()
+{
+    Events::LockMouse e;
+    m_EventBroker->Publish(e);
+    m_MouseLocked = true;
+}
+
+template <typename EventContext>
+void FirstPersonInputController<EventContext>::UnlockMouse()
+{
+    Events::UnlockMouse e;
+    m_EventBroker->Publish(e);
+    m_MouseLocked = false;
+}
+
+template <typename EventContext>
+bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputCommand& e)
+{
+    if (m_PlayerID != e.PlayerID) {
+        return false;
+    }
+
+    if (e.Command == "Pitch") {
+        float val = glm::radians(e.Value);
+        m_Rotation.x += -val;
+        m_Rotation.x = glm::clamp(m_Rotation.x, -glm::half_pi<float>(), glm::half_pi<float>());
+        //m_Rotation = m_Rotation * glm::angleAxis<float>(-val, glm::vec3(1.f, 0, 0));
+        return true;
+    }
+
+    if (e.Command == "Yaw") {
+        float val = glm::radians(e.Value);
+        m_Rotation.y += -val;
+        //m_Rotation = glm::angleAxis<float>(-val, glm::vec3(0, 1.f, 0)) * m_Rotation;
+        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;
+}
+
+template <typename EventContext>
+bool FirstPersonInputController<EventContext>::OnUnlockMouse(const Events::UnlockMouse& e)
+{
+    m_MouseLocked = false; 
+    return true;
+}
+
+template <typename EventContext>
+bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMouse& e)
+{
+    m_MouseLocked = true; 
+    return true;
+}