piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8545 from jordan-woyak/imu-cursor-centering

Browse Source 
WiimoteEmu: IMU pointing behavior improvements and code cleanup.
This commit is contained in:
Pierre Bourdon
2020-01-15 12:10:57 +01:00
committed by GitHub
parent ab07841e1b 0aacf3a627
commit 1ac3264d5d
8 changed files with 148 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
View File

@ -723,13 +723,7 @@ void AccelerometerMappingIndicator::paintEvent(QPaintEvent*)
p.setRenderHint(QPainter::Antialiasing, true);
p.setRenderHint(QPainter::SmoothPixmapTransform, true);
const auto angle = std::acos(state.Normalized().Dot({0, 0, 1}));
const auto axis = state.Normalized().Cross({0, 0, 1}).Normalized();
// Odd checks to handle case of 0g (draw no sphere) and perfect up/down orientation.
const auto rotation = (!state.LengthSquared() || axis.LengthSquared() < 2) ?
Common::Matrix33::Rotate(angle, axis) :
Common::Matrix33::Identity();
const auto rotation = WiimoteEmu::GetMatrixFromAcceleration(state);
// Draw sphere.
p.setPen(Qt::NoPen);
@ -797,9 +791,9 @@ void GyroMappingIndicator::paintEvent(QPaintEvent*)
const auto gyro_state = m_gyro_group.GetState();
const auto angular_velocity = gyro_state.value_or(Common::Vec3{});
m_state *= Common::Matrix33::RotateX(angular_velocity.x / -INDICATOR_UPDATE_FREQ) *
Common::Matrix33::RotateY(angular_velocity.y / INDICATOR_UPDATE_FREQ) *
Common::Matrix33::RotateZ(angular_velocity.z / -INDICATOR_UPDATE_FREQ);
m_state *= Common::Matrix33::FromQuaternion(angular_velocity.x / -INDICATOR_UPDATE_FREQ / 2,
angular_velocity.y / INDICATOR_UPDATE_FREQ / 2,
angular_velocity.z / -INDICATOR_UPDATE_FREQ / 2, 1);
// Reset orientation when stable for a bit:
constexpr u32 STABLE_RESET_STEPS = INDICATOR_UPDATE_FREQ;