million/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

controllers/npad: Simplify motion entry assignment

Browse source 
Simplifies the motion assignment in the Dual Joycon entry and assigns index 1 of the motion entry (Motion 2) for the right joycon.
This commit is contained in:
Morph 2020-09-02 12:18:41 -04:00 committed by german
parent ff679f3d17
commit df3cbd4758
1 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/core/hle/service/hid/controllers/npad.cpp
View file

@ -490,30 +490,19 @@ 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 (sixaxis_sensors_enabled && motions[i][0]) {
if (motions[i][0] && motions[i][1]) { // Set motion for the left joycon
// set both
dual_left_sixaxis_entry.accel = motion_devices[0].accel; dual_left_sixaxis_entry.accel = motion_devices[0].accel;
dual_left_sixaxis_entry.gyro = motion_devices[0].gyro; dual_left_sixaxis_entry.gyro = motion_devices[0].gyro;
dual_left_sixaxis_entry.rotation = motion_devices[0].rotation; dual_left_sixaxis_entry.rotation = motion_devices[0].rotation;
dual_left_sixaxis_entry.orientation = motion_devices[0].orientation; 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;
} }
if (sixaxis_sensors_enabled && motions[i][1]) {
// Set motion for the right joycon
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:
@ -543,11 +532,11 @@ 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);
if (sixaxis_sensors_enabled && motions[i][0]) { if (sixaxis_sensors_enabled && motions[i][1]) {
right_sixaxis_entry.accel = motion_devices[0].accel; right_sixaxis_entry.accel = motion_devices[1].accel;
right_sixaxis_entry.gyro = motion_devices[0].gyro; right_sixaxis_entry.gyro = motion_devices[1].gyro;
right_sixaxis_entry.rotation = motion_devices[0].rotation; right_sixaxis_entry.rotation = motion_devices[1].rotation;
right_sixaxis_entry.orientation = motion_devices[0].orientation; right_sixaxis_entry.orientation = motion_devices[1].orientation;
} }
break; break;
case NPadControllerType::Pokeball: case NPadControllerType::Pokeball: