Include HID and configuration changes related to motion
This commit is contained in:
parent
80a56e8893
commit
ff679f3d17
|
@ -136,6 +136,33 @@ using AnalogDevice = InputDevice<std::tuple<float, float>>;
|
||||||
*/
|
*/
|
||||||
using MotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<float>>>;
|
using MotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<float>>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A real motion device is an input device that returns a tuple of accelerometer state vector,
|
||||||
|
* gyroscope state vector, rotation state vector and orientation state matrix.
|
||||||
|
*
|
||||||
|
* For both vectors:
|
||||||
|
* x+ is the same direction as RIGHT on D-pad.
|
||||||
|
* y+ is normal to the touch screen, pointing outward.
|
||||||
|
* z+ is the same direction as UP on D-pad.
|
||||||
|
*
|
||||||
|
* For accelerometer state vector
|
||||||
|
* Units: g (gravitational acceleration)
|
||||||
|
*
|
||||||
|
* For gyroscope state vector:
|
||||||
|
* Orientation is determined by right-hand rule.
|
||||||
|
* Units: deg/sec
|
||||||
|
*
|
||||||
|
* For rotation state vector
|
||||||
|
* Units: rotations
|
||||||
|
*
|
||||||
|
* For orientation state matrix
|
||||||
|
* x vector
|
||||||
|
* y vector
|
||||||
|
* z vector
|
||||||
|
*/
|
||||||
|
using RealMotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<float>,
|
||||||
|
Common::Vec3<float>, std::array<Common::Vec3f, 3>>>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A touch device is an input device that returns a tuple of two floats and a bool. The floats are
|
* A touch device is an input device that returns a tuple of two floats and a bool. The floats are
|
||||||
* x and y coordinates in the range 0.0 - 1.0, and the bool indicates whether it is pressed.
|
* x and y coordinates in the range 0.0 - 1.0, and the bool indicates whether it is pressed.
|
||||||
|
|
|
@ -249,6 +249,9 @@ void Controller_NPad::OnLoadInputDevices() {
|
||||||
std::transform(players[i].analogs.begin() + Settings::NativeAnalog::STICK_HID_BEGIN,
|
std::transform(players[i].analogs.begin() + Settings::NativeAnalog::STICK_HID_BEGIN,
|
||||||
players[i].analogs.begin() + Settings::NativeAnalog::STICK_HID_END,
|
players[i].analogs.begin() + Settings::NativeAnalog::STICK_HID_END,
|
||||||
sticks[i].begin(), Input::CreateDevice<Input::AnalogDevice>);
|
sticks[i].begin(), Input::CreateDevice<Input::AnalogDevice>);
|
||||||
|
std::transform(players[i].motions.begin() + Settings::NativeMotion::MOTION_HID_BEGIN,
|
||||||
|
players[i].motions.begin() + Settings::NativeMotion::MOTION_HID_END,
|
||||||
|
motions[i].begin(), Input::CreateDevice<Input::RealMotionDevice>);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -265,6 +268,7 @@ void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
|
||||||
auto& rstick_entry = npad_pad_states[controller_idx].r_stick;
|
auto& rstick_entry = npad_pad_states[controller_idx].r_stick;
|
||||||
const auto& button_state = buttons[controller_idx];
|
const auto& button_state = buttons[controller_idx];
|
||||||
const auto& analog_state = sticks[controller_idx];
|
const auto& analog_state = sticks[controller_idx];
|
||||||
|
const auto& motion_state = motions[controller_idx];
|
||||||
const auto [stick_l_x_f, stick_l_y_f] =
|
const auto [stick_l_x_f, stick_l_y_f] =
|
||||||
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetStatus();
|
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetStatus();
|
||||||
const auto [stick_r_x_f, stick_r_y_f] =
|
const auto [stick_r_x_f, stick_r_y_f] =
|
||||||
|
@ -359,6 +363,45 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const u32 npad_index = static_cast<u32>(i);
|
const u32 npad_index = static_cast<u32>(i);
|
||||||
|
|
||||||
|
const std::array<SixAxisGeneric*, 6> controller_sixaxes{
|
||||||
|
&npad.sixaxis_full, &npad.sixaxis_handheld, &npad.sixaxis_dual_left,
|
||||||
|
&npad.sixaxis_dual_right, &npad.sixaxis_left, &npad.sixaxis_right,
|
||||||
|
};
|
||||||
|
|
||||||
|
for (auto* sixaxis_sensor : controller_sixaxes) {
|
||||||
|
sixaxis_sensor->common.entry_count = 16;
|
||||||
|
sixaxis_sensor->common.total_entry_count = 17;
|
||||||
|
|
||||||
|
const auto& last_entry =
|
||||||
|
sixaxis_sensor->sixaxis[sixaxis_sensor->common.last_entry_index];
|
||||||
|
|
||||||
|
sixaxis_sensor->common.timestamp = core_timing.GetCPUTicks();
|
||||||
|
sixaxis_sensor->common.last_entry_index =
|
||||||
|
(sixaxis_sensor->common.last_entry_index + 1) % 17;
|
||||||
|
|
||||||
|
auto& cur_entry = sixaxis_sensor->sixaxis[sixaxis_sensor->common.last_entry_index];
|
||||||
|
|
||||||
|
cur_entry.timestamp = last_entry.timestamp + 1;
|
||||||
|
cur_entry.timestamp2 = cur_entry.timestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to read sixaxis sensor states
|
||||||
|
std::array<MotionDevice, 2> motion_devices;
|
||||||
|
|
||||||
|
if (sixaxis_sensors_enabled) {
|
||||||
|
sixaxis_at_rest = true;
|
||||||
|
for (std::size_t e = 0; e < motion_devices.size(); ++e) {
|
||||||
|
const auto& device = motions[i][e];
|
||||||
|
if (device) {
|
||||||
|
std::tie(motion_devices[e].accel, motion_devices[e].gyro,
|
||||||
|
motion_devices[e].rotation, motion_devices[e].orientation) =
|
||||||
|
device->GetStatus();
|
||||||
|
sixaxis_at_rest = sixaxis_at_rest && motion_devices[e].gyro.Length2() < 1.0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
RequestPadStateUpdate(npad_index);
|
RequestPadStateUpdate(npad_index);
|
||||||
auto& pad_state = npad_pad_states[npad_index];
|
auto& pad_state = npad_pad_states[npad_index];
|
||||||
|
|
||||||
|
@ -376,6 +419,18 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
||||||
|
|
||||||
libnx_entry.connection_status.raw = 0;
|
libnx_entry.connection_status.raw = 0;
|
||||||
libnx_entry.connection_status.IsConnected.Assign(1);
|
libnx_entry.connection_status.IsConnected.Assign(1);
|
||||||
|
auto& full_sixaxis_entry =
|
||||||
|
npad.sixaxis_full.sixaxis[npad.sixaxis_full.common.last_entry_index];
|
||||||
|
auto& handheld_sixaxis_entry =
|
||||||
|
npad.sixaxis_handheld.sixaxis[npad.sixaxis_handheld.common.last_entry_index];
|
||||||
|
auto& dual_left_sixaxis_entry =
|
||||||
|
npad.sixaxis_dual_left.sixaxis[npad.sixaxis_dual_left.common.last_entry_index];
|
||||||
|
auto& dual_right_sixaxis_entry =
|
||||||
|
npad.sixaxis_dual_right.sixaxis[npad.sixaxis_dual_right.common.last_entry_index];
|
||||||
|
auto& left_sixaxis_entry =
|
||||||
|
npad.sixaxis_left.sixaxis[npad.sixaxis_left.common.last_entry_index];
|
||||||
|
auto& right_sixaxis_entry =
|
||||||
|
npad.sixaxis_right.sixaxis[npad.sixaxis_right.common.last_entry_index];
|
||||||
|
|
||||||
switch (controller_type) {
|
switch (controller_type) {
|
||||||
case NPadControllerType::None:
|
case NPadControllerType::None:
|
||||||
|
@ -390,6 +445,13 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
||||||
main_controller.pad.r_stick = pad_state.r_stick;
|
main_controller.pad.r_stick = pad_state.r_stick;
|
||||||
|
|
||||||
libnx_entry.connection_status.IsWired.Assign(1);
|
libnx_entry.connection_status.IsWired.Assign(1);
|
||||||
|
|
||||||
|
if (sixaxis_sensors_enabled && motions[i][0]) {
|
||||||
|
full_sixaxis_entry.accel = motion_devices[0].accel;
|
||||||
|
full_sixaxis_entry.gyro = motion_devices[0].gyro;
|
||||||
|
full_sixaxis_entry.rotation = motion_devices[0].rotation;
|
||||||
|
full_sixaxis_entry.orientation = motion_devices[0].orientation;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case NPadControllerType::Handheld:
|
case NPadControllerType::Handheld:
|
||||||
handheld_entry.connection_status.raw = 0;
|
handheld_entry.connection_status.raw = 0;
|
||||||
|
@ -408,6 +470,13 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
||||||
libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
|
libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
|
||||||
libnx_entry.connection_status.IsLeftJoyWired.Assign(1);
|
libnx_entry.connection_status.IsLeftJoyWired.Assign(1);
|
||||||
libnx_entry.connection_status.IsRightJoyWired.Assign(1);
|
libnx_entry.connection_status.IsRightJoyWired.Assign(1);
|
||||||
|
|
||||||
|
if (sixaxis_sensors_enabled && motions[i][0]) {
|
||||||
|
handheld_sixaxis_entry.accel = motion_devices[0].accel;
|
||||||
|
handheld_sixaxis_entry.gyro = motion_devices[0].gyro;
|
||||||
|
handheld_sixaxis_entry.rotation = motion_devices[0].rotation;
|
||||||
|
handheld_sixaxis_entry.orientation = motion_devices[0].orientation;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case NPadControllerType::JoyDual:
|
case NPadControllerType::JoyDual:
|
||||||
dual_entry.connection_status.raw = 0;
|
dual_entry.connection_status.raw = 0;
|
||||||
|
@ -420,6 +489,32 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
||||||
|
|
||||||
libnx_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
libnx_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
||||||
libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
|
libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
|
||||||
|
|
||||||
|
if (sixaxis_sensors_enabled) {
|
||||||
|
if (motions[i][0] && motions[i][1]) {
|
||||||
|
// set both
|
||||||
|
dual_left_sixaxis_entry.accel = motion_devices[0].accel;
|
||||||
|
dual_left_sixaxis_entry.gyro = motion_devices[0].gyro;
|
||||||
|
dual_left_sixaxis_entry.rotation = motion_devices[0].rotation;
|
||||||
|
dual_left_sixaxis_entry.orientation = motion_devices[0].orientation;
|
||||||
|
dual_right_sixaxis_entry.accel = motion_devices[1].accel;
|
||||||
|
dual_right_sixaxis_entry.gyro = motion_devices[1].gyro;
|
||||||
|
dual_right_sixaxis_entry.rotation = motion_devices[1].rotation;
|
||||||
|
dual_right_sixaxis_entry.orientation = motion_devices[1].orientation;
|
||||||
|
} else if (motions[i][0]) {
|
||||||
|
// set right
|
||||||
|
dual_right_sixaxis_entry.accel = motion_devices[0].accel;
|
||||||
|
dual_right_sixaxis_entry.gyro = motion_devices[0].gyro;
|
||||||
|
dual_right_sixaxis_entry.rotation = motion_devices[0].rotation;
|
||||||
|
dual_right_sixaxis_entry.orientation = motion_devices[0].orientation;
|
||||||
|
} else if (motions[i][1]) {
|
||||||
|
// set right
|
||||||
|
dual_right_sixaxis_entry.accel = motion_devices[1].accel;
|
||||||
|
dual_right_sixaxis_entry.gyro = motion_devices[1].gyro;
|
||||||
|
dual_right_sixaxis_entry.rotation = motion_devices[1].rotation;
|
||||||
|
dual_right_sixaxis_entry.orientation = motion_devices[1].orientation;
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case NPadControllerType::JoyLeft:
|
case NPadControllerType::JoyLeft:
|
||||||
left_entry.connection_status.raw = 0;
|
left_entry.connection_status.raw = 0;
|
||||||
|
@ -430,6 +525,13 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
||||||
left_entry.pad.r_stick = pad_state.r_stick;
|
left_entry.pad.r_stick = pad_state.r_stick;
|
||||||
|
|
||||||
libnx_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
libnx_entry.connection_status.IsLeftJoyConnected.Assign(1);
|
||||||
|
|
||||||
|
if (sixaxis_sensors_enabled && motions[i][0]) {
|
||||||
|
left_sixaxis_entry.accel = motion_devices[0].accel;
|
||||||
|
left_sixaxis_entry.gyro = motion_devices[0].gyro;
|
||||||
|
left_sixaxis_entry.rotation = motion_devices[0].rotation;
|
||||||
|
left_sixaxis_entry.orientation = motion_devices[0].orientation;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case NPadControllerType::JoyRight:
|
case NPadControllerType::JoyRight:
|
||||||
right_entry.connection_status.raw = 0;
|
right_entry.connection_status.raw = 0;
|
||||||
|
@ -440,6 +542,13 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
|
||||||
right_entry.pad.r_stick = pad_state.r_stick;
|
right_entry.pad.r_stick = pad_state.r_stick;
|
||||||
|
|
||||||
libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
|
libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
|
||||||
|
|
||||||
|
if (sixaxis_sensors_enabled && motions[i][0]) {
|
||||||
|
right_sixaxis_entry.accel = motion_devices[0].accel;
|
||||||
|
right_sixaxis_entry.gyro = motion_devices[0].gyro;
|
||||||
|
right_sixaxis_entry.rotation = motion_devices[0].rotation;
|
||||||
|
right_sixaxis_entry.orientation = motion_devices[0].orientation;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case NPadControllerType::Pokeball:
|
case NPadControllerType::Pokeball:
|
||||||
pokeball_entry.connection_status.raw = 0;
|
pokeball_entry.connection_status.raw = 0;
|
||||||
|
@ -574,6 +683,14 @@ Controller_NPad::GyroscopeZeroDriftMode Controller_NPad::GetGyroscopeZeroDriftMo
|
||||||
return gyroscope_zero_drift_mode;
|
return gyroscope_zero_drift_mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Controller_NPad::IsSixAxisSensorAtRest() const {
|
||||||
|
return sixaxis_at_rest;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Controller_NPad::SetSixAxisEnabled(bool six_axis_status) {
|
||||||
|
sixaxis_sensors_enabled = six_axis_status;
|
||||||
|
}
|
||||||
|
|
||||||
void Controller_NPad::MergeSingleJoyAsDualJoy(u32 npad_id_1, u32 npad_id_2) {
|
void Controller_NPad::MergeSingleJoyAsDualJoy(u32 npad_id_1, u32 npad_id_2) {
|
||||||
const auto npad_index_1 = NPadIdToIndex(npad_id_1);
|
const auto npad_index_1 = NPadIdToIndex(npad_id_1);
|
||||||
const auto npad_index_2 = NPadIdToIndex(npad_id_2);
|
const auto npad_index_2 = NPadIdToIndex(npad_id_2);
|
||||||
|
|
|
@ -126,6 +126,8 @@ public:
|
||||||
void DisconnectNPad(u32 npad_id);
|
void DisconnectNPad(u32 npad_id);
|
||||||
void SetGyroscopeZeroDriftMode(GyroscopeZeroDriftMode drift_mode);
|
void SetGyroscopeZeroDriftMode(GyroscopeZeroDriftMode drift_mode);
|
||||||
GyroscopeZeroDriftMode GetGyroscopeZeroDriftMode() const;
|
GyroscopeZeroDriftMode GetGyroscopeZeroDriftMode() const;
|
||||||
|
bool IsSixAxisSensorAtRest() const;
|
||||||
|
void SetSixAxisEnabled(bool six_axis_status);
|
||||||
LedPattern GetLedPattern(u32 npad_id);
|
LedPattern GetLedPattern(u32 npad_id);
|
||||||
void SetVibrationEnabled(bool can_vibrate);
|
void SetVibrationEnabled(bool can_vibrate);
|
||||||
bool IsVibrationEnabled() const;
|
bool IsVibrationEnabled() const;
|
||||||
|
@ -248,6 +250,24 @@ private:
|
||||||
};
|
};
|
||||||
static_assert(sizeof(NPadGeneric) == 0x350, "NPadGeneric is an invalid size");
|
static_assert(sizeof(NPadGeneric) == 0x350, "NPadGeneric is an invalid size");
|
||||||
|
|
||||||
|
struct SixAxisStates {
|
||||||
|
s64_le timestamp{};
|
||||||
|
INSERT_PADDING_WORDS(2);
|
||||||
|
s64_le timestamp2{};
|
||||||
|
Common::Vec3f accel{};
|
||||||
|
Common::Vec3f gyro{};
|
||||||
|
Common::Vec3f rotation{};
|
||||||
|
std::array<Common::Vec3f, 3> orientation{};
|
||||||
|
s64_le always_one{1};
|
||||||
|
};
|
||||||
|
static_assert(sizeof(SixAxisStates) == 0x68, "SixAxisStates is an invalid size");
|
||||||
|
|
||||||
|
struct SixAxisGeneric {
|
||||||
|
CommonHeader common{};
|
||||||
|
std::array<SixAxisStates, 17> sixaxis{};
|
||||||
|
};
|
||||||
|
static_assert(sizeof(SixAxisGeneric) == 0x708, "SixAxisGeneric is an invalid size");
|
||||||
|
|
||||||
enum class ColorReadError : u32_le {
|
enum class ColorReadError : u32_le {
|
||||||
ReadOk = 0,
|
ReadOk = 0,
|
||||||
ColorDoesntExist = 1,
|
ColorDoesntExist = 1,
|
||||||
|
@ -277,6 +297,13 @@ private:
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct MotionDevice {
|
||||||
|
Common::Vec3f accel;
|
||||||
|
Common::Vec3f gyro{};
|
||||||
|
Common::Vec3f rotation;
|
||||||
|
std::array<Common::Vec3f, 3> orientation{};
|
||||||
|
};
|
||||||
|
|
||||||
struct NPadEntry {
|
struct NPadEntry {
|
||||||
NPadType joy_styles;
|
NPadType joy_styles;
|
||||||
NPadAssignments pad_assignment;
|
NPadAssignments pad_assignment;
|
||||||
|
@ -296,9 +323,12 @@ private:
|
||||||
NPadGeneric pokeball_states;
|
NPadGeneric pokeball_states;
|
||||||
NPadGeneric libnx; // TODO(ogniK): Find out what this actually is, libnx seems to only be
|
NPadGeneric libnx; // TODO(ogniK): Find out what this actually is, libnx seems to only be
|
||||||
// relying on this for the time being
|
// relying on this for the time being
|
||||||
INSERT_PADDING_BYTES(
|
SixAxisGeneric sixaxis_full;
|
||||||
0x708 *
|
SixAxisGeneric sixaxis_handheld;
|
||||||
6); // TODO(ogniK): SixAxis states, require more information before implementation
|
SixAxisGeneric sixaxis_dual_left;
|
||||||
|
SixAxisGeneric sixaxis_dual_right;
|
||||||
|
SixAxisGeneric sixaxis_left;
|
||||||
|
SixAxisGeneric sixaxis_right;
|
||||||
NPadDevice device_type;
|
NPadDevice device_type;
|
||||||
NPadProperties properties;
|
NPadProperties properties;
|
||||||
INSERT_PADDING_WORDS(1);
|
INSERT_PADDING_WORDS(1);
|
||||||
|
@ -322,14 +352,18 @@ private:
|
||||||
|
|
||||||
NPadType style{};
|
NPadType style{};
|
||||||
std::array<NPadEntry, 10> shared_memory_entries{};
|
std::array<NPadEntry, 10> shared_memory_entries{};
|
||||||
std::array<
|
using ButtonArray = std::array<
|
||||||
std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeButton::NUM_BUTTONS_HID>,
|
std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeButton::NUM_BUTTONS_HID>,
|
||||||
10>
|
10>;
|
||||||
buttons;
|
using StickArray = std::array<
|
||||||
std::array<
|
|
||||||
std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID>,
|
std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID>,
|
||||||
10>
|
10>;
|
||||||
sticks;
|
using MotionArray = std::array<std::array<std::unique_ptr<Input::RealMotionDevice>,
|
||||||
|
Settings::NativeMotion::NUM_MOTION_HID>,
|
||||||
|
10>;
|
||||||
|
ButtonArray buttons;
|
||||||
|
StickArray sticks;
|
||||||
|
MotionArray motions;
|
||||||
std::vector<u32> supported_npad_id_types{};
|
std::vector<u32> supported_npad_id_types{};
|
||||||
NpadHoldType hold_type{NpadHoldType::Vertical};
|
NpadHoldType hold_type{NpadHoldType::Vertical};
|
||||||
// Each controller should have their own styleset changed event
|
// Each controller should have their own styleset changed event
|
||||||
|
@ -338,6 +372,8 @@ private:
|
||||||
std::array<ControllerHolder, 10> connected_controllers{};
|
std::array<ControllerHolder, 10> connected_controllers{};
|
||||||
GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard};
|
GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard};
|
||||||
bool can_controllers_vibrate{true};
|
bool can_controllers_vibrate{true};
|
||||||
|
bool sixaxis_sensors_enabled{true};
|
||||||
|
bool sixaxis_at_rest{true};
|
||||||
std::array<ControllerPad, 10> npad_pad_states{};
|
std::array<ControllerPad, 10> npad_pad_states{};
|
||||||
bool is_in_lr_assignment_mode{false};
|
bool is_in_lr_assignment_mode{false};
|
||||||
Core::System& system;
|
Core::System& system;
|
||||||
|
|
|
@ -164,8 +164,8 @@ Hid::Hid(Core::System& system) : ServiceFramework("hid"), system(system) {
|
||||||
{56, nullptr, "ActivateJoyXpad"},
|
{56, nullptr, "ActivateJoyXpad"},
|
||||||
{58, nullptr, "GetJoyXpadLifoHandle"},
|
{58, nullptr, "GetJoyXpadLifoHandle"},
|
||||||
{59, nullptr, "GetJoyXpadIds"},
|
{59, nullptr, "GetJoyXpadIds"},
|
||||||
{60, nullptr, "ActivateSixAxisSensor"},
|
{60, &Hid::ActivateSixAxisSensor, "ActivateSixAxisSensor"},
|
||||||
{61, nullptr, "DeactivateSixAxisSensor"},
|
{61, &Hid::DeactivateSixAxisSensor, "DeactivateSixAxisSensor"},
|
||||||
{62, nullptr, "GetSixAxisSensorLifoHandle"},
|
{62, nullptr, "GetSixAxisSensorLifoHandle"},
|
||||||
{63, nullptr, "ActivateJoySixAxisSensor"},
|
{63, nullptr, "ActivateJoySixAxisSensor"},
|
||||||
{64, nullptr, "DeactivateJoySixAxisSensor"},
|
{64, nullptr, "DeactivateJoySixAxisSensor"},
|
||||||
|
@ -329,6 +329,31 @@ void Hid::GetXpadIDs(Kernel::HLERequestContext& ctx) {
|
||||||
rb.Push(0);
|
rb.Push(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Hid::ActivateSixAxisSensor(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto handle{rp.Pop<u32>()};
|
||||||
|
const auto applet_resource_user_id{rp.Pop<u64>()};
|
||||||
|
applet_resource->GetController<Controller_NPad>(HidController::NPad).SetSixAxisEnabled(true);
|
||||||
|
LOG_DEBUG(Service_HID, "called, handle={}, applet_resource_user_id={}", handle,
|
||||||
|
applet_resource_user_id);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Hid::DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto handle{rp.Pop<u32>()};
|
||||||
|
const auto applet_resource_user_id{rp.Pop<u64>()};
|
||||||
|
applet_resource->GetController<Controller_NPad>(HidController::NPad).SetSixAxisEnabled(false);
|
||||||
|
|
||||||
|
LOG_DEBUG(Service_HID, "called, handle={}, applet_resource_user_id={}", handle,
|
||||||
|
applet_resource_user_id);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
void Hid::ActivateDebugPad(Kernel::HLERequestContext& ctx) {
|
void Hid::ActivateDebugPad(Kernel::HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
const auto applet_resource_user_id{rp.Pop<u64>()};
|
const auto applet_resource_user_id{rp.Pop<u64>()};
|
||||||
|
@ -484,13 +509,13 @@ void Hid::IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx) {
|
||||||
const auto handle{rp.Pop<u32>()};
|
const auto handle{rp.Pop<u32>()};
|
||||||
const auto applet_resource_user_id{rp.Pop<u64>()};
|
const auto applet_resource_user_id{rp.Pop<u64>()};
|
||||||
|
|
||||||
LOG_WARNING(Service_HID, "(STUBBED) called, handle={}, applet_resource_user_id={}", handle,
|
LOG_DEBUG(Service_HID, "called, handle={}, applet_resource_user_id={}", handle,
|
||||||
applet_resource_user_id);
|
applet_resource_user_id);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
// TODO (Hexagon12): Properly implement reading gyroscope values from controllers.
|
rb.Push(applet_resource->GetController<Controller_NPad>(HidController::NPad)
|
||||||
rb.Push(true);
|
.IsSixAxisSensorAtRest());
|
||||||
}
|
}
|
||||||
|
|
||||||
void Hid::SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) {
|
void Hid::SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) {
|
||||||
|
|
|
@ -86,6 +86,8 @@ private:
|
||||||
void CreateAppletResource(Kernel::HLERequestContext& ctx);
|
void CreateAppletResource(Kernel::HLERequestContext& ctx);
|
||||||
void ActivateXpad(Kernel::HLERequestContext& ctx);
|
void ActivateXpad(Kernel::HLERequestContext& ctx);
|
||||||
void GetXpadIDs(Kernel::HLERequestContext& ctx);
|
void GetXpadIDs(Kernel::HLERequestContext& ctx);
|
||||||
|
void ActivateSixAxisSensor(Kernel::HLERequestContext& ctx);
|
||||||
|
void DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx);
|
||||||
void ActivateDebugPad(Kernel::HLERequestContext& ctx);
|
void ActivateDebugPad(Kernel::HLERequestContext& ctx);
|
||||||
void ActivateTouchScreen(Kernel::HLERequestContext& ctx);
|
void ActivateTouchScreen(Kernel::HLERequestContext& ctx);
|
||||||
void ActivateMouse(Kernel::HLERequestContext& ctx);
|
void ActivateMouse(Kernel::HLERequestContext& ctx);
|
||||||
|
|
|
@ -21,10 +21,14 @@ namespace Settings::NativeButton {
|
||||||
enum Values : int;
|
enum Values : int;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace Settings::NativeMotion {
|
||||||
|
enum Values : int;
|
||||||
|
}
|
||||||
|
|
||||||
namespace InputCommon {
|
namespace InputCommon {
|
||||||
namespace Polling {
|
namespace Polling {
|
||||||
|
|
||||||
enum class DeviceType { Button, AnalogPreferred };
|
enum class DeviceType { Button, AnalogPreferred, Motion };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A class that can be used to get inputs from an input device like controllers without having to
|
* A class that can be used to get inputs from an input device like controllers without having to
|
||||||
|
@ -59,6 +63,7 @@ class MotionEmu;
|
||||||
*/
|
*/
|
||||||
using AnalogMapping = std::unordered_map<Settings::NativeAnalog::Values, Common::ParamPackage>;
|
using AnalogMapping = std::unordered_map<Settings::NativeAnalog::Values, Common::ParamPackage>;
|
||||||
using ButtonMapping = std::unordered_map<Settings::NativeButton::Values, Common::ParamPackage>;
|
using ButtonMapping = std::unordered_map<Settings::NativeButton::Values, Common::ParamPackage>;
|
||||||
|
using MotionMapping = std::unordered_map<Settings::NativeMotion::Values, Common::ParamPackage>;
|
||||||
|
|
||||||
class InputSubsystem {
|
class InputSubsystem {
|
||||||
public:
|
public:
|
||||||
|
@ -103,6 +108,9 @@ public:
|
||||||
/// Retrieves the button mappings for the given device.
|
/// Retrieves the button mappings for the given device.
|
||||||
[[nodiscard]] ButtonMapping GetButtonMappingForDevice(const Common::ParamPackage& device) const;
|
[[nodiscard]] ButtonMapping GetButtonMappingForDevice(const Common::ParamPackage& device) const;
|
||||||
|
|
||||||
|
/// Retrieves the motion mappings for the given device.
|
||||||
|
[[nodiscard]] MotionMapping GetMotionMappingForDevice(const Common::ParamPackage& device) const;
|
||||||
|
|
||||||
/// Retrieves the underlying GameCube analog handler.
|
/// Retrieves the underlying GameCube analog handler.
|
||||||
[[nodiscard]] GCAnalogFactory* GetGCAnalogs();
|
[[nodiscard]] GCAnalogFactory* GetGCAnalogs();
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,13 @@ const std::array<const char*, NumButtons> mapping = {{
|
||||||
}};
|
}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace NativeMotion {
|
||||||
|
const std::array<const char*, NumMotions> mapping = {{
|
||||||
|
"motionleft",
|
||||||
|
"motionright",
|
||||||
|
}};
|
||||||
|
}
|
||||||
|
|
||||||
namespace NativeAnalog {
|
namespace NativeAnalog {
|
||||||
const std::array<const char*, NumAnalogs> mapping = {{
|
const std::array<const char*, NumAnalogs> mapping = {{
|
||||||
"lstick",
|
"lstick",
|
||||||
|
|
|
@ -66,6 +66,21 @@ constexpr int NUM_STICKS_HID = NumAnalogs;
|
||||||
extern const std::array<const char*, NumAnalogs> mapping;
|
extern const std::array<const char*, NumAnalogs> mapping;
|
||||||
} // namespace NativeAnalog
|
} // namespace NativeAnalog
|
||||||
|
|
||||||
|
namespace NativeMotion {
|
||||||
|
enum Values : int {
|
||||||
|
MOTIONLEFT,
|
||||||
|
MOTIONRIGHT,
|
||||||
|
|
||||||
|
NumMotions,
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr int MOTION_HID_BEGIN = MOTIONLEFT;
|
||||||
|
constexpr int MOTION_HID_END = NumMotions;
|
||||||
|
constexpr int NUM_MOTION_HID = NumMotions;
|
||||||
|
|
||||||
|
extern const std::array<const char*, NumMotions> mapping;
|
||||||
|
} // namespace NativeMotion
|
||||||
|
|
||||||
namespace NativeMouseButton {
|
namespace NativeMouseButton {
|
||||||
enum Values {
|
enum Values {
|
||||||
Left,
|
Left,
|
||||||
|
@ -292,6 +307,7 @@ constexpr int NUM_KEYBOARD_MODS_HID = NumKeyboardMods;
|
||||||
|
|
||||||
using ButtonsRaw = std::array<std::string, NativeButton::NumButtons>;
|
using ButtonsRaw = std::array<std::string, NativeButton::NumButtons>;
|
||||||
using AnalogsRaw = std::array<std::string, NativeAnalog::NumAnalogs>;
|
using AnalogsRaw = std::array<std::string, NativeAnalog::NumAnalogs>;
|
||||||
|
using MotionRaw = std::array<std::string, NativeMotion::NumMotions>;
|
||||||
using MouseButtonsRaw = std::array<std::string, NativeMouseButton::NumMouseButtons>;
|
using MouseButtonsRaw = std::array<std::string, NativeMouseButton::NumMouseButtons>;
|
||||||
using KeyboardKeysRaw = std::array<std::string, NativeKeyboard::NumKeyboardKeys>;
|
using KeyboardKeysRaw = std::array<std::string, NativeKeyboard::NumKeyboardKeys>;
|
||||||
using KeyboardModsRaw = std::array<std::string, NativeKeyboard::NumKeyboardMods>;
|
using KeyboardModsRaw = std::array<std::string, NativeKeyboard::NumKeyboardMods>;
|
||||||
|
@ -314,6 +330,7 @@ struct PlayerInput {
|
||||||
ControllerType controller_type;
|
ControllerType controller_type;
|
||||||
ButtonsRaw buttons;
|
ButtonsRaw buttons;
|
||||||
AnalogsRaw analogs;
|
AnalogsRaw analogs;
|
||||||
|
MotionRaw motions;
|
||||||
std::string lstick_mod;
|
std::string lstick_mod;
|
||||||
std::string rstick_mod;
|
std::string rstick_mod;
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,11 @@ const std::array<int, Settings::NativeButton::NumButtons> Config::default_button
|
||||||
Qt::Key_H, Qt::Key_G, Qt::Key_D, Qt::Key_C, Qt::Key_B, Qt::Key_V,
|
Qt::Key_H, Qt::Key_G, Qt::Key_D, Qt::Key_C, Qt::Key_B, Qt::Key_V,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const std::array<int, Settings::NativeMotion::NumMotions> Config::default_motions = {
|
||||||
|
Qt::Key_7,
|
||||||
|
Qt::Key_8,
|
||||||
|
};
|
||||||
|
|
||||||
const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
|
const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
|
||||||
{
|
{
|
||||||
Qt::Key_Up,
|
Qt::Key_Up,
|
||||||
|
@ -284,6 +289,22 @@ void Config::ReadPlayerValues() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
|
||||||
|
const std::string default_param =
|
||||||
|
InputCommon::GenerateKeyboardParam(default_motions[i]);
|
||||||
|
auto& player_motions = player.motions[i];
|
||||||
|
|
||||||
|
player_motions = qt_config
|
||||||
|
->value(QStringLiteral("player_%1_").arg(p) +
|
||||||
|
QString::fromUtf8(Settings::NativeMotion::mapping[i]),
|
||||||
|
QString::fromStdString(default_param))
|
||||||
|
.toString()
|
||||||
|
.toStdString();
|
||||||
|
if (player_motions.empty()) {
|
||||||
|
player_motions = default_param;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
|
for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
|
||||||
const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
|
const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
|
||||||
default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
|
default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
|
||||||
|
@ -922,6 +943,14 @@ void Config::SavePlayerValues() {
|
||||||
QString::fromStdString(player.buttons[i]),
|
QString::fromStdString(player.buttons[i]),
|
||||||
QString::fromStdString(default_param));
|
QString::fromStdString(default_param));
|
||||||
}
|
}
|
||||||
|
for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
|
||||||
|
const std::string default_param =
|
||||||
|
InputCommon::GenerateKeyboardParam(default_motions[i]);
|
||||||
|
WriteSetting(QStringLiteral("player_%1_").arg(p) +
|
||||||
|
QString::fromStdString(Settings::NativeMotion::mapping[i]),
|
||||||
|
QString::fromStdString(player.motions[i]),
|
||||||
|
QString::fromStdString(default_param));
|
||||||
|
}
|
||||||
for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
|
for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
|
||||||
const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
|
const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
|
||||||
default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
|
default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
|
||||||
|
|
|
@ -23,6 +23,7 @@ public:
|
||||||
void Save();
|
void Save();
|
||||||
|
|
||||||
static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
|
static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
|
||||||
|
static const std::array<int, Settings::NativeMotion::NumMotions> default_motions;
|
||||||
static const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> default_analogs;
|
static const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> default_analogs;
|
||||||
static const std::array<int, 2> default_stick_mod;
|
static const std::array<int, 2> default_stick_mod;
|
||||||
static const std::array<int, Settings::NativeMouseButton::NumMouseButtons>
|
static const std::array<int, Settings::NativeMouseButton::NumMouseButtons>
|
||||||
|
|
|
@ -262,6 +262,11 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
|
||||||
},
|
},
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
motion_map = {
|
||||||
|
ui->buttonMotionLeft,
|
||||||
|
ui->buttonMotionRight,
|
||||||
|
};
|
||||||
|
|
||||||
analog_map_deadzone_label = {ui->labelLStickDeadzone, ui->labelRStickDeadzone};
|
analog_map_deadzone_label = {ui->labelLStickDeadzone, ui->labelRStickDeadzone};
|
||||||
analog_map_deadzone_slider = {ui->sliderLStickDeadzone, ui->sliderRStickDeadzone};
|
analog_map_deadzone_slider = {ui->sliderLStickDeadzone, ui->sliderRStickDeadzone};
|
||||||
analog_map_modifier_groupbox = {ui->buttonLStickModGroup, ui->buttonRStickModGroup};
|
analog_map_modifier_groupbox = {ui->buttonLStickModGroup, ui->buttonRStickModGroup};
|
||||||
|
@ -304,6 +309,37 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
|
||||||
Config::default_buttons[button_id]);
|
Config::default_buttons[button_id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) {
|
||||||
|
auto* const button = motion_map[motion_id];
|
||||||
|
if (button == nullptr) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
button->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
|
connect(button, &QPushButton::clicked, [=, this] {
|
||||||
|
HandleClick(
|
||||||
|
motion_map[motion_id],
|
||||||
|
[=, this](Common::ParamPackage params) {
|
||||||
|
motions_param[motion_id] = std::move(params);
|
||||||
|
},
|
||||||
|
InputCommon::Polling::DeviceType::Motion);
|
||||||
|
});
|
||||||
|
connect(button, &QPushButton::customContextMenuRequested,
|
||||||
|
[=, this](const QPoint& menu_location) {
|
||||||
|
QMenu context_menu;
|
||||||
|
context_menu.addAction(tr("Clear"), [&] {
|
||||||
|
motions_param[motion_id].Clear();
|
||||||
|
motion_map[motion_id]->setText(tr("[not set]"));
|
||||||
|
});
|
||||||
|
context_menu.addAction(tr("Restore Default"), [&] {
|
||||||
|
motions_param[motion_id] = Common::ParamPackage{
|
||||||
|
InputCommon::GenerateKeyboardParam(Config::default_motions[motion_id])};
|
||||||
|
motion_map[motion_id]->setText(ButtonToText(motions_param[motion_id]));
|
||||||
|
});
|
||||||
|
context_menu.exec(motion_map[motion_id]->mapToGlobal(menu_location));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Handle clicks for the modifier buttons as well.
|
// Handle clicks for the modifier buttons as well.
|
||||||
ConfigureButtonClick(ui->buttonLStickMod, &lstick_mod, Config::default_stick_mod[0]);
|
ConfigureButtonClick(ui->buttonLStickMod, &lstick_mod, Config::default_stick_mod[0]);
|
||||||
ConfigureButtonClick(ui->buttonRStickMod, &rstick_mod, Config::default_stick_mod[1]);
|
ConfigureButtonClick(ui->buttonRStickMod, &rstick_mod, Config::default_stick_mod[1]);
|
||||||
|
@ -448,6 +484,10 @@ void ConfigureInputPlayer::ApplyConfiguration() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
auto& motions = player.motions;
|
||||||
|
std::transform(motions_param.begin(), motions_param.end(), motions.begin(),
|
||||||
|
[](const Common::ParamPackage& param) { return param.Serialize(); });
|
||||||
|
|
||||||
player.controller_type =
|
player.controller_type =
|
||||||
static_cast<Settings::ControllerType>(ui->comboControllerType->currentIndex());
|
static_cast<Settings::ControllerType>(ui->comboControllerType->currentIndex());
|
||||||
player.connected = ui->groupConnectedController->isChecked();
|
player.connected = ui->groupConnectedController->isChecked();
|
||||||
|
@ -501,6 +541,8 @@ void ConfigureInputPlayer::LoadConfiguration() {
|
||||||
[](const std::string& str) { return Common::ParamPackage(str); });
|
[](const std::string& str) { return Common::ParamPackage(str); });
|
||||||
std::transform(player.analogs.begin(), player.analogs.end(), analogs_param.begin(),
|
std::transform(player.analogs.begin(), player.analogs.end(), analogs_param.begin(),
|
||||||
[](const std::string& str) { return Common::ParamPackage(str); });
|
[](const std::string& str) { return Common::ParamPackage(str); });
|
||||||
|
std::transform(player.motions.begin(), player.motions.end(), motions_param.begin(),
|
||||||
|
[](const std::string& str) { return Common::ParamPackage(str); });
|
||||||
}
|
}
|
||||||
|
|
||||||
UpdateUI();
|
UpdateUI();
|
||||||
|
@ -544,6 +586,12 @@ void ConfigureInputPlayer::RestoreDefaults() {
|
||||||
SetAnalogParam(params, analogs_param[analog_id], analog_sub_buttons[sub_button_id]);
|
SetAnalogParam(params, analogs_param[analog_id], analog_sub_buttons[sub_button_id]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) {
|
||||||
|
motions_param[motion_id] = Common::ParamPackage{
|
||||||
|
InputCommon::GenerateKeyboardParam(Config::default_motions[motion_id])};
|
||||||
|
}
|
||||||
|
|
||||||
UpdateUI();
|
UpdateUI();
|
||||||
UpdateInputDevices();
|
UpdateInputDevices();
|
||||||
ui->comboControllerType->setCurrentIndex(0);
|
ui->comboControllerType->setCurrentIndex(0);
|
||||||
|
@ -573,6 +621,15 @@ void ConfigureInputPlayer::ClearAll() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) {
|
||||||
|
const auto* const button = motion_map[motion_id];
|
||||||
|
if (button == nullptr || !button->isEnabled()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
motions_param[motion_id].Clear();
|
||||||
|
}
|
||||||
|
|
||||||
UpdateUI();
|
UpdateUI();
|
||||||
UpdateInputDevices();
|
UpdateInputDevices();
|
||||||
}
|
}
|
||||||
|
@ -582,6 +639,10 @@ void ConfigureInputPlayer::UpdateUI() {
|
||||||
button_map[button]->setText(ButtonToText(buttons_param[button]));
|
button_map[button]->setText(ButtonToText(buttons_param[button]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (int motion_id = 0; motion_id < Settings::NativeMotion::NumMotions; ++motion_id) {
|
||||||
|
motion_map[motion_id]->setText(ButtonToText(motions_param[motion_id]));
|
||||||
|
}
|
||||||
|
|
||||||
ui->buttonLStickMod->setText(ButtonToText(lstick_mod));
|
ui->buttonLStickMod->setText(ButtonToText(lstick_mod));
|
||||||
ui->buttonRStickMod->setText(ButtonToText(rstick_mod));
|
ui->buttonRStickMod->setText(ButtonToText(rstick_mod));
|
||||||
|
|
||||||
|
|
|
@ -128,11 +128,14 @@ private:
|
||||||
|
|
||||||
std::array<Common::ParamPackage, Settings::NativeButton::NumButtons> buttons_param;
|
std::array<Common::ParamPackage, Settings::NativeButton::NumButtons> buttons_param;
|
||||||
std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> analogs_param;
|
std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> analogs_param;
|
||||||
|
std::array<Common::ParamPackage, Settings::NativeMotion::NumMotions> motions_param;
|
||||||
|
|
||||||
static constexpr int ANALOG_SUB_BUTTONS_NUM = 4;
|
static constexpr int ANALOG_SUB_BUTTONS_NUM = 4;
|
||||||
|
|
||||||
/// Each button input is represented by a QPushButton.
|
/// Each button input is represented by a QPushButton.
|
||||||
std::array<QPushButton*, Settings::NativeButton::NumButtons> button_map;
|
std::array<QPushButton*, Settings::NativeButton::NumButtons> button_map;
|
||||||
|
/// Each motion input is represented by a QPushButton.
|
||||||
|
std::array<QPushButton*, Settings::NativeMotion::NumMotions> motion_map;
|
||||||
/// Extra buttons for the modifiers.
|
/// Extra buttons for the modifiers.
|
||||||
Common::ParamPackage lstick_mod;
|
Common::ParamPackage lstick_mod;
|
||||||
Common::ParamPackage rstick_mod;
|
Common::ParamPackage rstick_mod;
|
||||||
|
|
|
@ -2264,6 +2264,105 @@
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
||||||
|
<item alignment="Qt::AlignHCenter">
|
||||||
|
<widget class="QGroupBox" name="buttonMotionLeftGroup">
|
||||||
|
<property name="title">
|
||||||
|
<string>Motion left</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="buttonMotionLeftVerticalLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonMotionLeft">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>57</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>55</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">min-width: 55px;</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Motion left</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item alignment="Qt::AlignHCenter">
|
||||||
|
<widget class="QGroupBox" name="buttonMotionRightGroup">
|
||||||
|
<property name="title">
|
||||||
|
<string>Motion right</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="buttonMotionRightVerticalLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonMotionRight">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>57</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>55</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">min-width: 55px;</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Motion right</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
|
Reference in New Issue