pad_handler: Implement support for registering and updating analog input actions

Author: Souzooka

code/host/pad_handler.cc

@@ -37,8 +37,50 @@ namespace host
     register_button_action(btn_action, input_button, callback);
   }
 
-  // TODO:
-  //void register_analog_action(const std::string_view& action, ... axis);
+  // Register an analog action which corresponds to an input
+  void pad_handler::register_analog_action(const analog_action ana_action, analog analog_axis, std::function<void(f32 axis)> callback)
+  {
+    axis axis_xy;
+    f32 axis_val;
+
+    // Poll the current analog value
+    switch (analog_axis)
+    {
+      case analog::left_x:
+      case analog::left_y:
+        axis_xy = left_stick_axis();
+        if (analog_axis == analog::left_x)
+        {
+          axis_val = axis_xy.x;
+        }
+        else
+        {
+          axis_val = axis_xy.y;
+        }
+        break;
+      case analog::right_x:
+      case analog::right_y:
+        axis_xy = right_stick_axis();
+        if (analog_axis == analog::right_x)
+        {
+          axis_val = axis_xy.x;
+        }
+        else
+        {
+          axis_val = axis_xy.y;
+        }
+        break;
+      default:
+        panicf("Unrecognized analog value {}", common::to_underlying(analog_axis));
+        return;
+    }
+
+    m_analog_actions[ana_action] = {
+      .m_value = axis_val,
+      .m_input_key = analog_axis,
+      .m_callback = callback
+    };
+  }
 
   // Set a callback for a button action
   void pad_handler::set_button_action_callback(const button_action btn_action, std::function<void(bool pressed)> callback)
@@ -118,7 +160,39 @@ namespace host
       action.m_value = pressed;
     }
 
-    // TODO: Update analog
+    // Update analog
+    auto left_axis = left_stick_axis();
+    auto right_axis = right_stick_axis();
+
+    for (auto& kv : m_analog_actions)
+    {
+      auto& action = kv.second;
+
+      switch (action.m_input_key)
+      {
+        case analog::left_x:
+          action.m_value = left_axis.x;
+          break;
+        case analog::left_y:
+          action.m_value = left_axis.y;
+          break;
+        case analog::right_x:
+          action.m_value = right_axis.x;
+          break;
+        case analog::right_y:
+          action.m_value = right_axis.y;
+      }
+
+      // Currently we defer a callback to execute every frame for analog actions
+      if (action.m_callback != nullptr)
+      {
+        m_analog_action_callbacks.push_back(
+        {
+          .m_value = action.m_value,
+          .m_callback = action.m_callback
+        });
+      }
+    }
   }
 
   void pad_handler::do_action_callbacks()

code/host/pad_handler.h

@@ -45,10 +45,10 @@ namespace host
     enum class analog : u32
     {
       // TODO: Check if these properly align with the values in analog_table @ 0x3353E0
-      left_horizonal = 1,
-      left_vertical = 2,
-      right_horizontal = 3,
-      right_vertical = 4,
+      left_x = 1,
+      left_y = 2,
+      right_x = 3,
+      right_y = 4,
     };
 
     // These values come from pad_table @ 0x3351B0
@@ -186,11 +186,8 @@ namespace host
 
     // TODO: Unregistering (this one commit is getting too large anyways)
 
-    // TODO:
-    /*
     // Register an analog action which corresponds to an input
-    void register_analog_action(const std::string_view& action, ... axis);
-    */
+    void register_analog_action(const analog_action ana_action, analog analog_axis, std::function<void(f32 axis)> callback = nullptr);
 
     // Set a callback for a button action
     void set_button_action_callback(const button_action btn_action, std::function<void(bool pressed)> callback);
@@ -241,7 +238,7 @@ namespace host
     struct action_analog
     {
       f32 m_value{ 0.0f };
-      // TODO: axis representation, need to do some digging in the game to match up values
+      analog m_input_key{};
       // TODO: Consider callback behavior for analog inputs; should it be called every update?
       std::function<void(f32 axis)> m_callback{ nullptr };
     };