mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 19:09:09 +01:00
Input: remove unused stuff & clean up
1. removed zl, zr and c-stick from HID::PadState. They are handled by IR, not HID 2. removed button handling in EmuWindow 3. removed key_map 4. cleanup #include
This commit is contained in:
parent
e7a602fe16
commit
e02c4b7195
9 changed files with 3 additions and 412 deletions
|
@ -13,6 +13,7 @@
|
||||||
#include "common/scm_rev.h"
|
#include "common/scm_rev.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
|
#include "core/settings.h"
|
||||||
#include "input_common/keyboard.h"
|
#include "input_common/keyboard.h"
|
||||||
#include "input_common/main.h"
|
#include "input_common/main.h"
|
||||||
#include "video_core/debug_utils/debug_utils.h"
|
#include "video_core/debug_utils/debug_utils.h"
|
||||||
|
|
|
@ -34,7 +34,6 @@ set(SRCS
|
||||||
frontend/camera/factory.cpp
|
frontend/camera/factory.cpp
|
||||||
frontend/camera/interface.cpp
|
frontend/camera/interface.cpp
|
||||||
frontend/emu_window.cpp
|
frontend/emu_window.cpp
|
||||||
frontend/key_map.cpp
|
|
||||||
frontend/motion_emu.cpp
|
frontend/motion_emu.cpp
|
||||||
gdbstub/gdbstub.cpp
|
gdbstub/gdbstub.cpp
|
||||||
hle/config_mem.cpp
|
hle/config_mem.cpp
|
||||||
|
@ -219,7 +218,6 @@ set(HEADERS
|
||||||
frontend/camera/interface.h
|
frontend/camera/interface.h
|
||||||
frontend/emu_window.h
|
frontend/emu_window.h
|
||||||
frontend/input.h
|
frontend/input.h
|
||||||
frontend/key_map.h
|
|
||||||
frontend/motion_emu.h
|
frontend/motion_emu.h
|
||||||
gdbstub/gdbstub.h
|
gdbstub/gdbstub.h
|
||||||
hle/config_mem.h
|
hle/config_mem.h
|
||||||
|
|
|
@ -7,33 +7,9 @@
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/frontend/emu_window.h"
|
#include "core/frontend/emu_window.h"
|
||||||
#include "core/frontend/key_map.h"
|
#include "core/settings.h"
|
||||||
#include "video_core/video_core.h"
|
#include "video_core/video_core.h"
|
||||||
|
|
||||||
void EmuWindow::ButtonPressed(Service::HID::PadState pad) {
|
|
||||||
pad_state.hex |= pad.hex;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EmuWindow::ButtonReleased(Service::HID::PadState pad) {
|
|
||||||
pad_state.hex &= ~pad.hex;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EmuWindow::CirclePadUpdated(float x, float y) {
|
|
||||||
constexpr int MAX_CIRCLEPAD_POS = 0x9C; // Max value for a circle pad position
|
|
||||||
|
|
||||||
// Make sure the coordinates are in the unit circle,
|
|
||||||
// otherwise normalize it.
|
|
||||||
float r = x * x + y * y;
|
|
||||||
if (r > 1) {
|
|
||||||
r = std::sqrt(r);
|
|
||||||
x /= r;
|
|
||||||
y /= r;
|
|
||||||
}
|
|
||||||
|
|
||||||
circle_pad_x = static_cast<s16>(x * MAX_CIRCLEPAD_POS);
|
|
||||||
circle_pad_y = static_cast<s16>(y * MAX_CIRCLEPAD_POS);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the given x/y coordinates are within the touchpad specified by the framebuffer layout
|
* Check if the given x/y coordinates are within the touchpad specified by the framebuffer layout
|
||||||
* @param layout FramebufferLayout object describing the framebuffer size and screen positions
|
* @param layout FramebufferLayout object describing the framebuffer size and screen positions
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/framebuffer_layout.h"
|
#include "common/framebuffer_layout.h"
|
||||||
#include "common/math_util.h"
|
#include "common/math_util.h"
|
||||||
#include "core/hle/service/hid/hid.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstraction class used to provide an interface between emulation code and the frontend
|
* Abstraction class used to provide an interface between emulation code and the frontend
|
||||||
|
@ -52,28 +51,6 @@ public:
|
||||||
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
|
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
|
||||||
virtual void DoneCurrent() = 0;
|
virtual void DoneCurrent() = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* Signals a button press action to the HID module.
|
|
||||||
* @param pad_state indicates which button to press
|
|
||||||
* @note only handles real buttons (A/B/X/Y/...), excluding analog inputs like the circle pad.
|
|
||||||
*/
|
|
||||||
void ButtonPressed(Service::HID::PadState pad_state);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Signals a button release action to the HID module.
|
|
||||||
* @param pad_state indicates which button to press
|
|
||||||
* @note only handles real buttons (A/B/X/Y/...), excluding analog inputs like the circle pad.
|
|
||||||
*/
|
|
||||||
void ButtonReleased(Service::HID::PadState pad_state);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Signals a circle pad change action to the HID module.
|
|
||||||
* @param x new x-coordinate of the circle pad, in the range [-1.0, 1.0]
|
|
||||||
* @param y new y-coordinate of the circle pad, in the range [-1.0, 1.0]
|
|
||||||
* @note the coordinates will be normalized if the radius is larger than 1
|
|
||||||
*/
|
|
||||||
void CirclePadUpdated(float x, float y);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Signal that a touch pressed event has occurred (e.g. mouse click pressed)
|
* Signal that a touch pressed event has occurred (e.g. mouse click pressed)
|
||||||
* @param framebuffer_x Framebuffer x-coordinate that was pressed
|
* @param framebuffer_x Framebuffer x-coordinate that was pressed
|
||||||
|
@ -112,27 +89,6 @@ public:
|
||||||
*/
|
*/
|
||||||
void GyroscopeChanged(float x, float y, float z);
|
void GyroscopeChanged(float x, float y, float z);
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current pad state (which buttons are pressed).
|
|
||||||
* @note This should be called by the core emu thread to get a state set by the window thread.
|
|
||||||
* @note This doesn't include analog input like circle pad direction
|
|
||||||
* @todo Fix this function to be thread-safe.
|
|
||||||
* @return PadState object indicating the current pad state
|
|
||||||
*/
|
|
||||||
Service::HID::PadState GetPadState() const {
|
|
||||||
return pad_state;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current circle pad state.
|
|
||||||
* @note This should be called by the core emu thread to get a state set by the window thread.
|
|
||||||
* @todo Fix this function to be thread-safe.
|
|
||||||
* @return std::tuple of (x, y), where `x` and `y` are the circle pad coordinates
|
|
||||||
*/
|
|
||||||
std::tuple<s16, s16> GetCirclePadState() const {
|
|
||||||
return std::make_tuple(circle_pad_x, circle_pad_y);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the current touch screen state (touch X/Y coordinates and whether or not it is pressed).
|
* Gets the current touch screen state (touch X/Y coordinates and whether or not it is pressed).
|
||||||
* @note This should be called by the core emu thread to get a state set by the window thread.
|
* @note This should be called by the core emu thread to get a state set by the window thread.
|
||||||
|
@ -228,11 +184,8 @@ protected:
|
||||||
// TODO: Find a better place to set this.
|
// TODO: Find a better place to set this.
|
||||||
config.min_client_area_size = std::make_pair(400u, 480u);
|
config.min_client_area_size = std::make_pair(400u, 480u);
|
||||||
active_config = config;
|
active_config = config;
|
||||||
pad_state.hex = 0;
|
|
||||||
touch_x = 0;
|
touch_x = 0;
|
||||||
touch_y = 0;
|
touch_y = 0;
|
||||||
circle_pad_x = 0;
|
|
||||||
circle_pad_y = 0;
|
|
||||||
touch_pressed = false;
|
touch_pressed = false;
|
||||||
accel_x = 0;
|
accel_x = 0;
|
||||||
accel_y = -512;
|
accel_y = -512;
|
||||||
|
@ -302,9 +255,6 @@ private:
|
||||||
u16 touch_x; ///< Touchpad X-position in native 3DS pixel coordinates (0-320)
|
u16 touch_x; ///< Touchpad X-position in native 3DS pixel coordinates (0-320)
|
||||||
u16 touch_y; ///< Touchpad Y-position in native 3DS pixel coordinates (0-240)
|
u16 touch_y; ///< Touchpad Y-position in native 3DS pixel coordinates (0-240)
|
||||||
|
|
||||||
s16 circle_pad_x; ///< Circle pad X-position in native 3DS pixel coordinates (-156 - 156)
|
|
||||||
s16 circle_pad_y; ///< Circle pad Y-position in native 3DS pixel coordinates (-156 - 156)
|
|
||||||
|
|
||||||
std::mutex accel_mutex;
|
std::mutex accel_mutex;
|
||||||
s16 accel_x; ///< Accelerometer X-axis value in native 3DS units
|
s16 accel_x; ///< Accelerometer X-axis value in native 3DS units
|
||||||
s16 accel_y; ///< Accelerometer Y-axis value in native 3DS units
|
s16 accel_y; ///< Accelerometer Y-axis value in native 3DS units
|
||||||
|
@ -319,6 +269,4 @@ private:
|
||||||
* Clip the provided coordinates to be inside the touchscreen area.
|
* Clip the provided coordinates to be inside the touchscreen area.
|
||||||
*/
|
*/
|
||||||
std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y);
|
std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y);
|
||||||
|
|
||||||
Service::HID::PadState pad_state;
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,152 +0,0 @@
|
||||||
// Copyright 2014 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#include <map>
|
|
||||||
#include "core/frontend/emu_window.h"
|
|
||||||
#include "core/frontend/key_map.h"
|
|
||||||
|
|
||||||
namespace KeyMap {
|
|
||||||
|
|
||||||
// TODO (wwylele): currently we treat c-stick as four direction buttons
|
|
||||||
// and map it directly to EmuWindow::ButtonPressed.
|
|
||||||
// It should go the analog input way like circle pad does.
|
|
||||||
const std::array<KeyTarget, Settings::NativeInput::NUM_INPUTS> mapping_targets = {{
|
|
||||||
Service::HID::PAD_A,
|
|
||||||
Service::HID::PAD_B,
|
|
||||||
Service::HID::PAD_X,
|
|
||||||
Service::HID::PAD_Y,
|
|
||||||
Service::HID::PAD_L,
|
|
||||||
Service::HID::PAD_R,
|
|
||||||
Service::HID::PAD_ZL,
|
|
||||||
Service::HID::PAD_ZR,
|
|
||||||
Service::HID::PAD_START,
|
|
||||||
Service::HID::PAD_SELECT,
|
|
||||||
Service::HID::PAD_NONE,
|
|
||||||
Service::HID::PAD_UP,
|
|
||||||
Service::HID::PAD_DOWN,
|
|
||||||
Service::HID::PAD_LEFT,
|
|
||||||
Service::HID::PAD_RIGHT,
|
|
||||||
Service::HID::PAD_C_UP,
|
|
||||||
Service::HID::PAD_C_DOWN,
|
|
||||||
Service::HID::PAD_C_LEFT,
|
|
||||||
Service::HID::PAD_C_RIGHT,
|
|
||||||
|
|
||||||
IndirectTarget::CirclePadUp,
|
|
||||||
IndirectTarget::CirclePadDown,
|
|
||||||
IndirectTarget::CirclePadLeft,
|
|
||||||
IndirectTarget::CirclePadRight,
|
|
||||||
IndirectTarget::CirclePadModifier,
|
|
||||||
}};
|
|
||||||
|
|
||||||
static std::map<HostDeviceKey, KeyTarget> key_map;
|
|
||||||
static int next_device_id = 0;
|
|
||||||
|
|
||||||
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.707106781f;
|
|
||||||
int x = 0, y = 0;
|
|
||||||
|
|
||||||
if (circle_pad_right)
|
|
||||||
++x;
|
|
||||||
if (circle_pad_left)
|
|
||||||
--x;
|
|
||||||
if (circle_pad_up)
|
|
||||||
++y;
|
|
||||||
if (circle_pad_down)
|
|
||||||
--y;
|
|
||||||
|
|
||||||
float modifier = circle_pad_modifier ? Settings::values.pad_circle_modifier_scale : 1.0f;
|
|
||||||
emu_window.CirclePadUpdated(x * modifier * (y == 0 ? 1.0f : SQRT_HALF),
|
|
||||||
y * modifier * (x == 0 ? 1.0f : SQRT_HALF));
|
|
||||||
}
|
|
||||||
|
|
||||||
int NewDeviceId() {
|
|
||||||
return next_device_id++;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetKeyMapping(HostDeviceKey key, KeyTarget target) {
|
|
||||||
key_map[key] = target;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClearKeyMapping(int device_id) {
|
|
||||||
auto iter = key_map.begin();
|
|
||||||
while (iter != key_map.end()) {
|
|
||||||
if (iter->first.device_id == device_id)
|
|
||||||
key_map.erase(iter++);
|
|
||||||
else
|
|
||||||
++iter;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void PressKey(EmuWindow& emu_window, HostDeviceKey key) {
|
|
||||||
auto target = key_map.find(key);
|
|
||||||
if (target == key_map.end())
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (target->second.direct) {
|
|
||||||
emu_window.ButtonPressed({{target->second.target.direct_target_hex}});
|
|
||||||
} else {
|
|
||||||
switch (target->second.target.indirect_target) {
|
|
||||||
case IndirectTarget::CirclePadUp:
|
|
||||||
circle_pad_up = true;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadDown:
|
|
||||||
circle_pad_down = true;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadLeft:
|
|
||||||
circle_pad_left = true;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadRight:
|
|
||||||
circle_pad_right = true;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadModifier:
|
|
||||||
circle_pad_modifier = true;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ReleaseKey(EmuWindow& emu_window, HostDeviceKey key) {
|
|
||||||
auto target = key_map.find(key);
|
|
||||||
if (target == key_map.end())
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (target->second.direct) {
|
|
||||||
emu_window.ButtonReleased({{target->second.target.direct_target_hex}});
|
|
||||||
} else {
|
|
||||||
switch (target->second.target.indirect_target) {
|
|
||||||
case IndirectTarget::CirclePadUp:
|
|
||||||
circle_pad_up = false;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadDown:
|
|
||||||
circle_pad_down = false;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadLeft:
|
|
||||||
circle_pad_left = false;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadRight:
|
|
||||||
circle_pad_right = false;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
case IndirectTarget::CirclePadModifier:
|
|
||||||
circle_pad_modifier = false;
|
|
||||||
UpdateCirclePad(emu_window);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,93 +0,0 @@
|
||||||
// Copyright 2014 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <tuple>
|
|
||||||
#include "core/hle/service/hid/hid.h"
|
|
||||||
|
|
||||||
class EmuWindow;
|
|
||||||
|
|
||||||
namespace KeyMap {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents key mapping targets that are not real 3DS buttons.
|
|
||||||
* They will be handled by KeyMap and translated to 3DS input.
|
|
||||||
*/
|
|
||||||
enum class IndirectTarget {
|
|
||||||
CirclePadUp,
|
|
||||||
CirclePadDown,
|
|
||||||
CirclePadLeft,
|
|
||||||
CirclePadRight,
|
|
||||||
CirclePadModifier,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a key mapping target. It can be a PadState that represents real 3DS buttons,
|
|
||||||
* or an IndirectTarget.
|
|
||||||
*/
|
|
||||||
struct KeyTarget {
|
|
||||||
bool direct;
|
|
||||||
union {
|
|
||||||
u32 direct_target_hex;
|
|
||||||
IndirectTarget indirect_target;
|
|
||||||
} target;
|
|
||||||
|
|
||||||
KeyTarget() : direct(true) {
|
|
||||||
target.direct_target_hex = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyTarget(Service::HID::PadState pad) : direct(true) {
|
|
||||||
target.direct_target_hex = pad.hex;
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyTarget(IndirectTarget i) : direct(false) {
|
|
||||||
target.indirect_target = i;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a key for a specific host device.
|
|
||||||
*/
|
|
||||||
struct HostDeviceKey {
|
|
||||||
int key_code;
|
|
||||||
int device_id; ///< Uniquely identifies a host device
|
|
||||||
|
|
||||||
bool operator<(const HostDeviceKey& other) const {
|
|
||||||
return std::tie(key_code, device_id) < std::tie(other.key_code, other.device_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator==(const HostDeviceKey& other) const {
|
|
||||||
return std::tie(key_code, device_id) == std::tie(other.key_code, other.device_id);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
extern const std::array<KeyTarget, Settings::NativeInput::NUM_INPUTS> mapping_targets;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generates a new device id, which uniquely identifies a host device within KeyMap.
|
|
||||||
*/
|
|
||||||
int NewDeviceId();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Maps a device-specific key to a target (a PadState or an IndirectTarget).
|
|
||||||
*/
|
|
||||||
void SetKeyMapping(HostDeviceKey key, KeyTarget target);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears all key mappings belonging to one device.
|
|
||||||
*/
|
|
||||||
void ClearKeyMapping(int device_id);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Maps a key press action and call the corresponding function in EmuWindow
|
|
||||||
*/
|
|
||||||
void PressKey(EmuWindow& emu_window, HostDeviceKey key);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Maps a key release action and call the corresponding function in EmuWindow
|
|
||||||
*/
|
|
||||||
void ReleaseKey(EmuWindow& emu_window, HostDeviceKey key);
|
|
||||||
}
|
|
|
@ -39,13 +39,6 @@ struct PadState {
|
||||||
BitField<10, 1, u32> x;
|
BitField<10, 1, u32> x;
|
||||||
BitField<11, 1, u32> y;
|
BitField<11, 1, u32> y;
|
||||||
|
|
||||||
BitField<14, 1, u32> zl;
|
|
||||||
BitField<15, 1, u32> zr;
|
|
||||||
|
|
||||||
BitField<24, 1, u32> c_right;
|
|
||||||
BitField<25, 1, u32> c_left;
|
|
||||||
BitField<26, 1, u32> c_up;
|
|
||||||
BitField<27, 1, u32> c_down;
|
|
||||||
BitField<28, 1, u32> circle_right;
|
BitField<28, 1, u32> circle_right;
|
||||||
BitField<29, 1, u32> circle_left;
|
BitField<29, 1, u32> circle_left;
|
||||||
BitField<30, 1, u32> circle_up;
|
BitField<30, 1, u32> circle_up;
|
||||||
|
@ -183,33 +176,6 @@ ASSERT_REG_POSITION(touch.index_reset_ticks, 0x2A);
|
||||||
#undef ASSERT_REG_POSITION
|
#undef ASSERT_REG_POSITION
|
||||||
#endif // !defined(_MSC_VER)
|
#endif // !defined(_MSC_VER)
|
||||||
|
|
||||||
// Pre-defined PadStates for single button presses
|
|
||||||
const PadState PAD_NONE = {{0}};
|
|
||||||
const PadState PAD_A = {{1u << 0}};
|
|
||||||
const PadState PAD_B = {{1u << 1}};
|
|
||||||
const PadState PAD_SELECT = {{1u << 2}};
|
|
||||||
const PadState PAD_START = {{1u << 3}};
|
|
||||||
const PadState PAD_RIGHT = {{1u << 4}};
|
|
||||||
const PadState PAD_LEFT = {{1u << 5}};
|
|
||||||
const PadState PAD_UP = {{1u << 6}};
|
|
||||||
const PadState PAD_DOWN = {{1u << 7}};
|
|
||||||
const PadState PAD_R = {{1u << 8}};
|
|
||||||
const PadState PAD_L = {{1u << 9}};
|
|
||||||
const PadState PAD_X = {{1u << 10}};
|
|
||||||
const PadState PAD_Y = {{1u << 11}};
|
|
||||||
|
|
||||||
const PadState PAD_ZL = {{1u << 14}};
|
|
||||||
const PadState PAD_ZR = {{1u << 15}};
|
|
||||||
|
|
||||||
const PadState PAD_C_RIGHT = {{1u << 24}};
|
|
||||||
const PadState PAD_C_LEFT = {{1u << 25}};
|
|
||||||
const PadState PAD_C_UP = {{1u << 26}};
|
|
||||||
const PadState PAD_C_DOWN = {{1u << 27}};
|
|
||||||
const PadState PAD_CIRCLE_RIGHT = {{1u << 28}};
|
|
||||||
const PadState PAD_CIRCLE_LEFT = {{1u << 29}};
|
|
||||||
const PadState PAD_CIRCLE_UP = {{1u << 30}};
|
|
||||||
const PadState PAD_CIRCLE_DOWN = {{1u << 31}};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HID::GetIPCHandles service function
|
* HID::GetIPCHandles service function
|
||||||
* Inputs:
|
* Inputs:
|
||||||
|
|
|
@ -18,57 +18,6 @@ enum class LayoutOption {
|
||||||
Custom,
|
Custom,
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace NativeInput {
|
|
||||||
|
|
||||||
enum Values {
|
|
||||||
// directly mapped keys
|
|
||||||
A,
|
|
||||||
B,
|
|
||||||
X,
|
|
||||||
Y,
|
|
||||||
L,
|
|
||||||
R,
|
|
||||||
ZL,
|
|
||||||
ZR,
|
|
||||||
START,
|
|
||||||
SELECT,
|
|
||||||
HOME,
|
|
||||||
DUP,
|
|
||||||
DDOWN,
|
|
||||||
DLEFT,
|
|
||||||
DRIGHT,
|
|
||||||
CUP,
|
|
||||||
CDOWN,
|
|
||||||
CLEFT,
|
|
||||||
CRIGHT,
|
|
||||||
|
|
||||||
// indirectly mapped keys
|
|
||||||
CIRCLE_UP,
|
|
||||||
CIRCLE_DOWN,
|
|
||||||
CIRCLE_LEFT,
|
|
||||||
CIRCLE_RIGHT,
|
|
||||||
CIRCLE_MODIFIER,
|
|
||||||
|
|
||||||
NUM_INPUTS
|
|
||||||
};
|
|
||||||
|
|
||||||
static const std::array<const char*, NUM_INPUTS> Mapping = {{
|
|
||||||
// directly mapped keys
|
|
||||||
"pad_a", "pad_b", "pad_x", "pad_y", "pad_l", "pad_r", "pad_zl", "pad_zr", "pad_start",
|
|
||||||
"pad_select", "pad_home", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_cup",
|
|
||||||
"pad_cdown", "pad_cleft", "pad_cright",
|
|
||||||
|
|
||||||
// indirectly mapped keys
|
|
||||||
"pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right",
|
|
||||||
"pad_circle_modifier",
|
|
||||||
}};
|
|
||||||
static const std::array<Values, NUM_INPUTS> All = {{
|
|
||||||
A, B, X, Y, L, R, ZL, ZR,
|
|
||||||
START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, CUP,
|
|
||||||
CDOWN, CLEFT, CRIGHT, CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, CIRCLE_MODIFIER,
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace NativeButton {
|
namespace NativeButton {
|
||||||
enum Values {
|
enum Values {
|
||||||
A,
|
A,
|
||||||
|
@ -129,9 +78,6 @@ struct Values {
|
||||||
bool is_new_3ds;
|
bool is_new_3ds;
|
||||||
|
|
||||||
// Controls
|
// Controls
|
||||||
std::array<int, NativeInput::NUM_INPUTS> input_mappings;
|
|
||||||
float pad_circle_modifier_scale;
|
|
||||||
|
|
||||||
std::array<std::string, NativeButton::NumButtons> buttons;
|
std::array<std::string, NativeButton::NumButtons> buttons;
|
||||||
std::array<std::string, NativeAnalog::NumAnalogs> analogs;
|
std::array<std::string, NativeAnalog::NumAnalogs> analogs;
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "common/vector_math.h"
|
#include "common/vector_math.h"
|
||||||
#include "core/frontend/emu_window.h"
|
#include "core/frontend/emu_window.h"
|
||||||
#include "core/memory.h"
|
#include "core/memory.h"
|
||||||
|
#include "core/settings.h"
|
||||||
#include "video_core/pica_state.h"
|
#include "video_core/pica_state.h"
|
||||||
#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
|
#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
|
||||||
#include "video_core/renderer_opengl/gl_state.h"
|
#include "video_core/renderer_opengl/gl_state.h"
|
||||||
|
|
Loading…
Reference in a new issue