From 43746003678df348acdbee9aa866511ad9dd9bfc Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 19 Mar 2019 19:15:17 -0500 Subject: WiimoteEmu: Implement MotionPlus parameter y0 and other cleanups. --- Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp') diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp index ca6bab91ba..e69b93c9d1 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp @@ -217,7 +217,7 @@ void MappingIndicator::DrawCursor(ControllerEmu::Cursor& cursor) QRectF(-scale, raw_coord.z * scale - INPUT_DOT_RADIUS / 2, scale * 2, INPUT_DOT_RADIUS)); // Adjusted Z (if not hidden): - if (adj_coord.z && adj_coord.x < 10000) + if (adj_coord.IsVisible()) { p.setBrush(GetAdjustedInputColor()); p.drawRect( @@ -250,7 +250,7 @@ void MappingIndicator::DrawCursor(ControllerEmu::Cursor& cursor) p.drawEllipse(QPointF{raw_coord.x, raw_coord.y} * scale, INPUT_DOT_RADIUS, INPUT_DOT_RADIUS); // Adjusted cursor position (if not hidden): - if (adj_coord.x < 10000) + if (adj_coord.IsVisible()) { p.setPen(Qt::NoPen); p.setBrush(GetAdjustedInputColor()); -- cgit v1.2.3 From ba1b3351184864ed3d5692a461b00edd2f3a21f6 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 7 Apr 2019 07:57:04 -0500 Subject: WiimoteEmu: Improve emulated swing. --- .../Core/DolphinQt/Config/Mapping/MappingIndicator.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp') diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp index e69b93c9d1..2cd768feea 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp @@ -492,11 +492,19 @@ void MappingIndicator::DrawForce(ControllerEmu::Force& force) QRectF(-scale, raw_coord.z * scale - INPUT_DOT_RADIUS / 2, scale * 2, INPUT_DOT_RADIUS)); // Adjusted Z: - if (adj_coord.y) + const auto curve_point = + std::max(std::abs(m_motion_state.angle.x), std::abs(m_motion_state.angle.z)) / MathUtil::TAU; + if (adj_coord.y || curve_point) { - p.setBrush(GetAdjustedInputColor()); - p.drawRect( - QRectF(-scale, adj_coord.y * -scale - INPUT_DOT_RADIUS / 2, scale * 2, INPUT_DOT_RADIUS)); + // Show off the angle somewhat with a curved line. + QPainterPath path; + path.moveTo(-scale, (adj_coord.y + curve_point) * -scale); + path.quadTo({0, (adj_coord.y - curve_point) * -scale}, + {scale, (adj_coord.y + curve_point) * -scale}); + + p.setBrush(Qt::NoBrush); + p.setPen(QPen(GetAdjustedInputColor(), INPUT_DOT_RADIUS)); + p.drawPath(path); } // Draw "gate" shape. -- cgit v1.2.3