diff options
author | Lioncash <mathew1800@gmail.com> | 2021-02-08 05:58:15 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2021-02-09 19:15:03 +0100 |
commit | 5c7c212f615bce3d197785b5d72806709ed577bf (patch) | |
tree | 054dd192436cdef2aa65d1012baaccadd2abe82a | |
parent | Settings: Add depth to Joysticks on Pro Controller preview (#5894) (diff) | |
download | yuzu-5c7c212f615bce3d197785b5d72806709ed577bf.tar yuzu-5c7c212f615bce3d197785b5d72806709ed577bf.tar.gz yuzu-5c7c212f615bce3d197785b5d72806709ed577bf.tar.bz2 yuzu-5c7c212f615bce3d197785b5d72806709ed577bf.tar.lz yuzu-5c7c212f615bce3d197785b5d72806709ed577bf.tar.xz yuzu-5c7c212f615bce3d197785b5d72806709ed577bf.tar.zst yuzu-5c7c212f615bce3d197785b5d72806709ed577bf.zip |
-rw-r--r-- | src/yuzu/configuration/configure_input_player_widget.cpp | 5 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_input_player_widget.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index e77ccc057..416e4d168 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -37,7 +37,8 @@ void PlayerControlPreview::SetPlayerInput(std::size_t index, const ButtonParam& Input::CreateDevice<Input::AnalogDevice>); UpdateColors(); } -void PlayerControlPreview::SetPlayerInputRaw(std::size_t index, const Settings::ButtonsRaw buttons_, +void PlayerControlPreview::SetPlayerInputRaw(std::size_t index, + const Settings::ButtonsRaw& buttons_, Settings::AnalogsRaw analogs_) { player_index = index; std::transform(buttons_.begin() + Settings::NativeButton::BUTTON_HID_BEGIN, @@ -2323,7 +2324,7 @@ void PlayerControlPreview::DrawGCJoystick(QPainter& p, const QPointF center, boo } void PlayerControlPreview::DrawRawJoystick(QPainter& p, const QPointF center, const QPointF value, - const Input::AnalogProperties properties) { + const Input::AnalogProperties& properties) { constexpr float size = 45.0f; const float range = size * properties.range; const float deadzone = size * properties.deadzone; diff --git a/src/yuzu/configuration/configure_input_player_widget.h b/src/yuzu/configuration/configure_input_player_widget.h index 676effbfd..91c3343f1 100644 --- a/src/yuzu/configuration/configure_input_player_widget.h +++ b/src/yuzu/configuration/configure_input_player_widget.h @@ -25,7 +25,7 @@ public: void SetPlayerInput(std::size_t index, const ButtonParam& buttons_param, const AnalogParam& analogs_param); - void SetPlayerInputRaw(std::size_t index, const Settings::ButtonsRaw buttons_, + void SetPlayerInputRaw(std::size_t index, const Settings::ButtonsRaw& buttons_, Settings::AnalogsRaw analogs_); void SetConnectedStatus(bool checked); void SetControllerType(Settings::ControllerType type); @@ -138,8 +138,8 @@ private: // Draw joystick functions void DrawJoystick(QPainter& p, QPointF center, float size, bool pressed); void DrawJoystickSideview(QPainter& p, QPointF center, float angle, float size, bool pressed); - void DrawRawJoystick(QPainter& p, QPointF center, const QPointF value, - const Input::AnalogProperties properties); + void DrawRawJoystick(QPainter& p, QPointF center, QPointF value, + const Input::AnalogProperties& properties); void DrawProJoystick(QPainter& p, QPointF center, QPointF offset, float scalar, bool pressed); void DrawGCJoystick(QPainter& p, QPointF center, bool pressed); |