diff options
Diffstat (limited to 'src/core/hle/service/hid/controllers')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 5 | ||||
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 9701318b5..2e06372a4 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -251,7 +251,7 @@ void Controller_NPad::OnLoadInputDevices() { 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>); + motions[i].begin(), Input::CreateDevice<Input::MotionDevice>); } } @@ -397,7 +397,8 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* 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; + sixaxis_at_rest = + sixaxis_at_rest && motion_devices[e].gyro.Length2() < 0.00005f; } } } diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 99d7e459a..7b07d2e8b 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -299,9 +299,9 @@ private: struct MotionDevice { Common::Vec3f accel; - Common::Vec3f gyro{}; + Common::Vec3f gyro; Common::Vec3f rotation; - std::array<Common::Vec3f, 3> orientation{}; + std::array<Common::Vec3f, 3> orientation; }; struct NPadEntry { @@ -358,9 +358,9 @@ private: using StickArray = std::array< std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID>, 10>; - using MotionArray = std::array<std::array<std::unique_ptr<Input::RealMotionDevice>, - Settings::NativeMotion::NUM_MOTION_HID>, - 10>; + using MotionArray = std::array< + std::array<std::unique_ptr<Input::MotionDevice>, Settings::NativeMotion::NUM_MOTION_HID>, + 10>; ButtonArray buttons; StickArray sticks; MotionArray motions; |