mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 09:03:23 +02:00
service: hid: Disable correctly motion input
This commit is contained in:
parent
18a0c2e9db
commit
7eb0992d2c
@ -529,6 +529,14 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing
|
|||||||
auto& sixaxis_left_lifo_state = controller.sixaxis_left_lifo_state;
|
auto& sixaxis_left_lifo_state = controller.sixaxis_left_lifo_state;
|
||||||
auto& sixaxis_right_lifo_state = controller.sixaxis_right_lifo_state;
|
auto& sixaxis_right_lifo_state = controller.sixaxis_right_lifo_state;
|
||||||
|
|
||||||
|
// Clear previous state
|
||||||
|
sixaxis_fullkey_state = {};
|
||||||
|
sixaxis_handheld_state = {};
|
||||||
|
sixaxis_dual_left_state = {};
|
||||||
|
sixaxis_dual_right_state = {};
|
||||||
|
sixaxis_left_lifo_state = {};
|
||||||
|
sixaxis_right_lifo_state = {};
|
||||||
|
|
||||||
if (controller.sixaxis_sensor_enabled && Settings::values.motion_enabled.GetValue()) {
|
if (controller.sixaxis_sensor_enabled && Settings::values.motion_enabled.GetValue()) {
|
||||||
controller.sixaxis_at_rest = true;
|
controller.sixaxis_at_rest = true;
|
||||||
for (std::size_t e = 0; e < motion_state.size(); ++e) {
|
for (std::size_t e = 0; e < motion_state.size(); ++e) {
|
||||||
@ -537,69 +545,52 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const auto set_motion_state = [&](SixAxisSensorState& state,
|
||||||
|
const Core::HID::ControllerMotion& hid_state) {
|
||||||
|
static constexpr SixAxisSensorState default_motion_state = {
|
||||||
|
.accel = {0, 0, -1.0f},
|
||||||
|
.orientation =
|
||||||
|
{
|
||||||
|
Common::Vec3f{1.0f, 0, 0},
|
||||||
|
Common::Vec3f{0, 1.0f, 0},
|
||||||
|
Common::Vec3f{0, 0, 1.0f},
|
||||||
|
},
|
||||||
|
.attribute = {1},
|
||||||
|
};
|
||||||
|
if (!controller.sixaxis_sensor_enabled) {
|
||||||
|
state = default_motion_state;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!Settings::values.motion_enabled.GetValue()) {
|
||||||
|
state = default_motion_state;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
state.attribute.is_connected.Assign(1);
|
||||||
|
state.accel = hid_state.accel;
|
||||||
|
state.gyro = hid_state.gyro;
|
||||||
|
state.rotation = hid_state.rotation;
|
||||||
|
state.orientation = hid_state.orientation;
|
||||||
|
};
|
||||||
|
|
||||||
switch (controller_type) {
|
switch (controller_type) {
|
||||||
case Core::HID::NpadStyleIndex::None:
|
case Core::HID::NpadStyleIndex::None:
|
||||||
UNREACHABLE();
|
UNREACHABLE();
|
||||||
break;
|
break;
|
||||||
case Core::HID::NpadStyleIndex::ProController:
|
case Core::HID::NpadStyleIndex::ProController:
|
||||||
sixaxis_fullkey_state.attribute.raw = 0;
|
set_motion_state(sixaxis_fullkey_state, motion_state[0]);
|
||||||
if (controller.sixaxis_sensor_enabled) {
|
|
||||||
sixaxis_fullkey_state.attribute.is_connected.Assign(1);
|
|
||||||
sixaxis_fullkey_state.accel = motion_state[0].accel;
|
|
||||||
sixaxis_fullkey_state.gyro = motion_state[0].gyro;
|
|
||||||
sixaxis_fullkey_state.rotation = motion_state[0].rotation;
|
|
||||||
sixaxis_fullkey_state.orientation = motion_state[0].orientation;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case Core::HID::NpadStyleIndex::Handheld:
|
case Core::HID::NpadStyleIndex::Handheld:
|
||||||
sixaxis_handheld_state.attribute.raw = 0;
|
set_motion_state(sixaxis_handheld_state, motion_state[0]);
|
||||||
if (controller.sixaxis_sensor_enabled) {
|
|
||||||
sixaxis_handheld_state.attribute.is_connected.Assign(1);
|
|
||||||
sixaxis_handheld_state.accel = motion_state[0].accel;
|
|
||||||
sixaxis_handheld_state.gyro = motion_state[0].gyro;
|
|
||||||
sixaxis_handheld_state.rotation = motion_state[0].rotation;
|
|
||||||
sixaxis_handheld_state.orientation = motion_state[0].orientation;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case Core::HID::NpadStyleIndex::JoyconDual:
|
case Core::HID::NpadStyleIndex::JoyconDual:
|
||||||
sixaxis_dual_left_state.attribute.raw = 0;
|
set_motion_state(sixaxis_dual_left_state, motion_state[0]);
|
||||||
sixaxis_dual_right_state.attribute.raw = 0;
|
set_motion_state(sixaxis_dual_right_state, motion_state[1]);
|
||||||
if (controller.sixaxis_sensor_enabled) {
|
|
||||||
// Set motion for the left joycon
|
|
||||||
sixaxis_dual_left_state.attribute.is_connected.Assign(1);
|
|
||||||
sixaxis_dual_left_state.accel = motion_state[0].accel;
|
|
||||||
sixaxis_dual_left_state.gyro = motion_state[0].gyro;
|
|
||||||
sixaxis_dual_left_state.rotation = motion_state[0].rotation;
|
|
||||||
sixaxis_dual_left_state.orientation = motion_state[0].orientation;
|
|
||||||
}
|
|
||||||
if (controller.sixaxis_sensor_enabled) {
|
|
||||||
// Set motion for the right joycon
|
|
||||||
sixaxis_dual_right_state.attribute.is_connected.Assign(1);
|
|
||||||
sixaxis_dual_right_state.accel = motion_state[1].accel;
|
|
||||||
sixaxis_dual_right_state.gyro = motion_state[1].gyro;
|
|
||||||
sixaxis_dual_right_state.rotation = motion_state[1].rotation;
|
|
||||||
sixaxis_dual_right_state.orientation = motion_state[1].orientation;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case Core::HID::NpadStyleIndex::JoyconLeft:
|
case Core::HID::NpadStyleIndex::JoyconLeft:
|
||||||
sixaxis_left_lifo_state.attribute.raw = 0;
|
set_motion_state(sixaxis_left_lifo_state, motion_state[0]);
|
||||||
if (controller.sixaxis_sensor_enabled) {
|
|
||||||
sixaxis_left_lifo_state.attribute.is_connected.Assign(1);
|
|
||||||
sixaxis_left_lifo_state.accel = motion_state[0].accel;
|
|
||||||
sixaxis_left_lifo_state.gyro = motion_state[0].gyro;
|
|
||||||
sixaxis_left_lifo_state.rotation = motion_state[0].rotation;
|
|
||||||
sixaxis_left_lifo_state.orientation = motion_state[0].orientation;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case Core::HID::NpadStyleIndex::JoyconRight:
|
case Core::HID::NpadStyleIndex::JoyconRight:
|
||||||
sixaxis_right_lifo_state.attribute.raw = 0;
|
set_motion_state(sixaxis_right_lifo_state, motion_state[1]);
|
||||||
if (controller.sixaxis_sensor_enabled) {
|
|
||||||
sixaxis_right_lifo_state.attribute.is_connected.Assign(1);
|
|
||||||
sixaxis_right_lifo_state.accel = motion_state[1].accel;
|
|
||||||
sixaxis_right_lifo_state.gyro = motion_state[1].gyro;
|
|
||||||
sixaxis_right_lifo_state.rotation = motion_state[1].rotation;
|
|
||||||
sixaxis_right_lifo_state.orientation = motion_state[1].orientation;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user