diff options
| -rw-r--r-- | src/input_common/helpers/stick_from_buttons.cpp | 10 | ||||
| -rw-r--r-- | src/input_common/helpers/touch_from_buttons.cpp | 10 | 
2 files changed, 18 insertions, 2 deletions
diff --git a/src/input_common/helpers/stick_from_buttons.cpp b/src/input_common/helpers/stick_from_buttons.cpp index 536d413a5..cdd360f13 100644 --- a/src/input_common/helpers/stick_from_buttons.cpp +++ b/src/input_common/helpers/stick_from_buttons.cpp @@ -294,6 +294,15 @@ public:      }  private: +    static constexpr Common::Input::AnalogProperties properties{ +        .deadzone = 0.0f, +        .range = 1.0f, +        .threshold = 0.5f, +        .offset = 0.0f, +        .inverted = false, +        .toggle = false, +    }; +      Button up;      Button down;      Button left; @@ -311,7 +320,6 @@ private:      float last_x_axis_value{};      float last_y_axis_value{};      Common::Input::ButtonStatus modifier_status{}; -    const Common::Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false};      std::chrono::time_point<std::chrono::steady_clock> last_update;  }; diff --git a/src/input_common/helpers/touch_from_buttons.cpp b/src/input_common/helpers/touch_from_buttons.cpp index 003a38da5..ff633a807 100644 --- a/src/input_common/helpers/touch_from_buttons.cpp +++ b/src/input_common/helpers/touch_from_buttons.cpp @@ -59,11 +59,19 @@ public:      }  private: +    static constexpr Common::Input::AnalogProperties properties{ +        .deadzone = 0.0f, +        .range = 1.0f, +        .threshold = 0.5f, +        .offset = 0.0f, +        .inverted = false, +        .toggle = false, +    }; +      Button button;      bool last_button_value;      const float x;      const float y; -    const Common::Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false};  };  std::unique_ptr<Common::Input::InputDevice> TouchFromButton::Create(  | 
