From f80ded20573a6f1d85e79fd42bee1696d47567a0 Mon Sep 17 00:00:00 2001
From: Olly Rybak <ollyrybak@gmail.com>
Date: Thu, 11 May 2023 17:30:20 +1000
Subject: [PATCH] Initial setup

---
 Source/Engine/Input/Enums.h        | 25 +++++++++++++++++++++++++
 Source/Engine/Input/Input.cpp      | 20 ++++++++++++++++++++
 Source/Engine/Input/Input.h        |  8 ++++++++
 Source/Engine/Input/VirtualInput.h |  3 +++
 4 files changed, 56 insertions(+)

diff --git a/Source/Engine/Input/Enums.h b/Source/Engine/Input/Enums.h
index 80e10786f..272231e41 100644
--- a/Source/Engine/Input/Enums.h
+++ b/Source/Engine/Input/Enums.h
@@ -263,6 +263,31 @@ API_ENUM() enum class InputActionMode
     Release = 2,
 };
 
+/// <summary>
+/// The input action event trigger modes.
+/// </summary>
+API_ENUM() enum class InputActionPhase
+{
+    /// <summary>
+    /// User is pressing the key/button.
+    /// </summary>
+    Pressing = 0,
+
+    /// <summary>
+    /// User pressed the key/button (but wasn't pressing it in the previous frame).
+    /// </summary>
+    Press = 1,
+
+    /// <summary>
+    /// User released the key/button (was pressing it in the previous frame).
+    /// </summary>
+    Release = 2,
+
+    Waiting = 3,
+
+    None = 4,
+};
+
 /// <summary>
 /// The input gamepad index.
 /// </summary>
diff --git a/Source/Engine/Input/Input.cpp b/Source/Engine/Input/Input.cpp
index 7a4547c62..32a672635 100644
--- a/Source/Engine/Input/Input.cpp
+++ b/Source/Engine/Input/Input.cpp
@@ -29,11 +29,13 @@ struct ActionData
 {
     bool Active;
     uint64 FrameIndex;
+    InputActionPhase Phase;
 
     ActionData()
     {
         Active = false;
         FrameIndex = 0;
+        Phase = InputActionPhase::None;
     }
 };
 
@@ -597,6 +599,16 @@ bool Input::GetAction(const StringView& name)
     return e ? e->Active : false;
 }
 
+InputActionPhase Input::GetActionPhase(const StringView& name)
+{
+    const auto e = Actions.TryGet(name);
+    if (e != nullptr) 
+    {
+        return e->Phase;
+    }
+    return InputActionPhase::None;
+}
+
 float Input::GetAxis(const StringView& name)
 {
     const auto e = Axes.TryGet(name);
@@ -806,6 +818,7 @@ void InputService::Update()
         ActionData& data = Actions[name];
 
         data.Active = false;
+        data.Phase = InputActionPhase::Waiting;
 
         // Mark as updated in this frame
         data.FrameIndex = frame;
@@ -830,6 +843,13 @@ void InputService::Update()
             isActive = Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton);
         }
 
+        if (Input::GetKeyDown(config.Key) || Input::GetMouseButtonDown(config.MouseButton) || Input::GetGamepadButtonDown(config.Gamepad, config.GamepadButton))
+            data.Phase = InputActionPhase::Press;
+        else if (Input::GetKey(config.Key) || Input::GetMouseButton(config.MouseButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadButton))
+            data.Phase = InputActionPhase::Pressing;
+        else if (Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton))
+            data.Phase = InputActionPhase::Release;
+
         data.Active |= isActive;
     }
 
diff --git a/Source/Engine/Input/Input.h b/Source/Engine/Input/Input.h
index d9f86076b..dd40c485a 100644
--- a/Source/Engine/Input/Input.h
+++ b/Source/Engine/Input/Input.h
@@ -309,6 +309,14 @@ public:
     /// <seealso cref="ActionMappings"/>
     API_FUNCTION() static bool GetAction(const StringView& name);
 
+    /// <summary>
+    /// Gets the value of the virtual action identified by name. Use <see cref="ActionMappings"/> to get the current config.
+    /// </summary>
+    /// <param name="name">The action name.</param>
+    /// <returns>True if action has been triggered in the current frame (e.g. button pressed), otherwise false.</returns>
+    /// <seealso cref="ActionMappings"/>
+    API_FUNCTION() static InputActionPhase GetActionPhase(const StringView& name);
+
     /// <summary>
     /// Gets the value of the virtual axis identified by name. Use <see cref="AxisMappings"/> to get the current config.
     /// </summary>
diff --git a/Source/Engine/Input/VirtualInput.h b/Source/Engine/Input/VirtualInput.h
index 8fd4efeb4..e8f669632 100644
--- a/Source/Engine/Input/VirtualInput.h
+++ b/Source/Engine/Input/VirtualInput.h
@@ -48,6 +48,9 @@ API_STRUCT() struct ActionConfig
     /// </summary>
     API_FIELD(Attributes="EditorOrder(40)")
     InputGamepadIndex Gamepad;
+
+    API_FIELD(Attributes = "EditorOrder(50)")
+    InputActionMode Phase;
 };
 
 /// <summary>