Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

implement circle pad modifier

Browse source
This commit is contained in:
wwylele 2016-05-13 18:32:43 +03:00
parent 03631f9b8f
commit 416faa20d1
6 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/common/key_map.cpp
View file

@ -23,12 +23,17 @@ const std::array<KeyTarget, Settings::NativeInput::NUM_INPUTS> mapping_targets =
IndirectTarget::CIRCLE_PAD_DOWN,
IndirectTarget::CIRCLE_PAD_LEFT,
IndirectTarget::CIRCLE_PAD_RIGHT,
IndirectTarget::CIRCLE_PAD_MODIFIER,
}};
static std::map<HostDeviceKey, KeyTarget> key_map;
static int next_device_id = 0;
static bool circle_pad_up = false, circle_pad_down = false, circle_pad_left = false, circle_pad_right = false;
static bool circle_pad_up = false;
static bool circle_pad_down = false;
static bool circle_pad_left = false;
static bool circle_pad_right = false;
static bool circle_pad_modifier = false;
static void UpdateCirclePad(EmuWindow& emu_window) {
constexpr float SQRT_HALF = 0.707106781;
@ -42,8 +47,9 @@ static void UpdateCirclePad(EmuWindow& emu_window) {
++y;
if (circle_pad_down)
--y;
// TODO: apply modifier here
emu_window.CirclePadUpdated(x * (y == 0 ? 1.0 : SQRT_HALF), y * (x == 0 ? 1.0 : SQRT_HALF));
float modifier = circle_pad_modifier ? Settings::values.pad_circle_modifier_scale : 1.0;
emu_window.CirclePadUpdated(x * modifier * (y == 0 ? 1.0 : SQRT_HALF), y * modifier * (x == 0 ? 1.0 : SQRT_HALF));
}
int NewDeviceId() {
@ -89,6 +95,10 @@ void PressKey(EmuWindow& emu_window, HostDeviceKey key) {
circle_pad_right = true;
UpdateCirclePad(emu_window);
break;
case IndirectTarget::CIRCLE_PAD_MODIFIER:
circle_pad_modifier = true;
UpdateCirclePad(emu_window);
break;
}
}
}
@ -118,6 +128,10 @@ void ReleaseKey(EmuWindow& emu_window,HostDeviceKey key) {
circle_pad_right = false;
UpdateCirclePad(emu_window);
break;
case IndirectTarget::CIRCLE_PAD_MODIFIER:
circle_pad_modifier = false;
UpdateCirclePad(emu_window);
break;
}
}
}

6
src/common/key_map.h
View file

@ -13,7 +13,11 @@ class EmuWindow;
namespace KeyMap {
enum class IndirectTarget {
CIRCLE_PAD_UP, CIRCLE_PAD_DOWN, CIRCLE_PAD_LEFT, CIRCLE_PAD_RIGHT,
CIRCLE_PAD_UP,
CIRCLE_PAD_DOWN,
CIRCLE_PAD_LEFT,
CIRCLE_PAD_RIGHT,
CIRCLE_PAD_MODIFIER,
};
/**