ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WiimoteEmu/DolphinQt: Fix tilt indicator for wrapped around angles.

This commit is contained in:
Jordan Woyak 2020-10-18 15:16:08 -05:00
parent fffd005178
commit 4bb0a885d0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,8 +415,18 @@ void TiltIndicator::Draw()
{
WiimoteEmu::EmulateTilt(&m_motion_state, &m_group, 1.f / INDICATOR_UPDATE_FREQ);
const auto adj_coord =
Common::DVec2{-m_motion_state.angle.y, m_motion_state.angle.x} / MathUtil::PI;
auto adj_coord = Common::DVec2{-m_motion_state.angle.y, m_motion_state.angle.x} / MathUtil::PI;
// Angle values after dividing by pi.
constexpr auto norm_180_deg = 1;
constexpr auto norm_360_deg = 2;
// Angle may extend beyond 180 degrees when wrapping around.
// Apply modulo to draw within the indicator.
// Scale down the value a bit so +1 does not become -1.
adj_coord *= 0.9999f;
adj_coord.x = std::fmod(adj_coord.x + norm_360_deg + norm_180_deg, norm_360_deg) - norm_180_deg;
adj_coord.y = std::fmod(adj_coord.y + norm_360_deg + norm_180_deg, norm_360_deg) - norm_180_deg;
DrawReshapableInput(m_group, TILT_GATE_COLOR,
(adj_coord.x || adj_coord.y) ? std::make_optional(adj_coord) : std::nullopt);