Stern/AzaharUWP
1
0
Fork 0
forked from moonpower/azahar-UWP
Code Pull Requests Activity

citra_qt: Add diagonal directional input bindings for circlepad and c-stick (#404)

Browse Source 
Co-authored-by: OpenSauce04 <opensauce04@gmail.com>
This commit is contained in:
Kleidis
2024-10-29 20:15:51 +01:00
committed by OpenSauce04
parent 00fe25b299
commit 0a3cb3a4dc
5 changed files with 417 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/input_common/analog_from_button.cpp
View File

@@ -1,4 +1,4 @@
// Copyright 2017 Citra Emulator Project
// Copyright Citra Emulator Project / Lime3DS Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -10,11 +10,12 @@ class Analog final : public Input::AnalogDevice {
public:
using Button = std::unique_ptr<Input::ButtonDevice>;
Analog(Button up_, Button down_, Button left_, Button right_, Button modifier_,
float modifier_scale_)
Analog(Button up_, Button down_, Button left_, Button right_, Button up_left_, Button up_right_,
Button down_left_, Button down_right_, Button modifier_, float modifier_scale_)
: up(std::move(up_)), down(std::move(down_)), left(std::move(left_)),
right(std::move(right_)), modifier(std::move(modifier_)),
modifier_scale(modifier_scale_) {}
right(std::move(right_)), up_left(std::move(up_left_)), up_right(std::move(up_right_)),
down_left(std::move(down_left_)), down_right(std::move(down_right_)),
modifier(std::move(modifier_)), modifier_scale(modifier_scale_) {}
std::tuple<float, float> GetStatus() const override {
constexpr float SQRT_HALF = 0.707106781f;
@@ -28,6 +29,22 @@ public:
++y;
if (down->GetStatus())
--y;
if (up_right->GetStatus()) {
++x;
++y;
}
if (up_left->GetStatus()) {
--x;
++y;
}
if (down_right->GetStatus()) {
++x;
--y;
}
if (down_left->GetStatus()) {
--x;
--y;
}
float coef = modifier->GetStatus() ? modifier_scale : 1.0f;
return std::make_tuple(x * coef * (y == 0 ? 1.0f : SQRT_HALF),
@@ -39,6 +56,10 @@ private:
Button down;
Button left;
Button right;
Button up_left;
Button up_right;
Button down_left;
Button down_right;
Button modifier;
float modifier_scale;
};
@@ -49,10 +70,17 @@ std::unique_ptr<Input::AnalogDevice> AnalogFromButton::Create(const Common::Para
auto down = Input::CreateDevice<Input::ButtonDevice>(params.Get("down", null_engine));
auto left = Input::CreateDevice<Input::ButtonDevice>(params.Get("left", null_engine));
auto right = Input::CreateDevice<Input::ButtonDevice>(params.Get("right", null_engine));
auto up_left = Input::CreateDevice<Input::ButtonDevice>(params.Get("up_left", null_engine));
auto up_right = Input::CreateDevice<Input::ButtonDevice>(params.Get("up_right", null_engine));
auto down_left = Input::CreateDevice<Input::ButtonDevice>(params.Get("down_left", null_engine));
auto down_right =
Input::CreateDevice<Input::ButtonDevice>(params.Get("down_right", null_engine));
auto modifier = Input::CreateDevice<Input::ButtonDevice>(params.Get("modifier", null_engine));
auto modifier_scale = params.Get("modifier_scale", 0.5f);
return std::make_unique<Analog>(std::move(up), std::move(down), std::move(left),
std::move(right), std::move(modifier), modifier_scale);
std::move(right), std::move(up_left), std::move(up_right),
std::move(down_left), std::move(down_right),
std::move(modifier), modifier_scale);
}
} // namespace InputCommon