summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2020-02-25 17:19:39 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2020-02-25 17:58:32 -0600
commit2c843ae06b61066c597804d35b7f3ba2280e8d0f (patch)
tree32ddfb0425a951ee7a27fe05ef13e9d5a4623854 /Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
parented24f32c5bf31bbb249f2748e38d6066bb7f72d1 (diff)
DolphinQt: Clean up calibration drawing a bit.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp26
1 files changed, 17 insertions, 9 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
index f29555c2ef..71782e0f74 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -149,7 +149,7 @@ constexpr int SPHERE_POINT_COUNT = 200;
// Constructs a polygon by querying a radius at varying angles:
template <typename F>
-QPolygonF GetPolygonFromRadiusGetter(F&& radius_getter, Common::DVec2 center = {0.0, 0.0})
+QPolygonF GetPolygonFromRadiusGetter(F&& radius_getter)
{
// A multiple of 8 (octagon) and enough points to be visibly pleasing:
constexpr int shape_point_count = 32;
@@ -161,7 +161,7 @@ QPolygonF GetPolygonFromRadiusGetter(F&& radius_getter, Common::DVec2 center = {
const double angle = MathUtil::TAU * p / shape.size();
const double radius = radius_getter(angle);
- point = {std::cos(angle) * radius + center.x, std::sin(angle) * radius + center.y};
+ point = {std::cos(angle) * radius, std::sin(angle) * radius};
++p;
}
@@ -302,25 +302,30 @@ void ReshapableInputIndicator::DrawReshapableInput(
const auto center = stick.GetCenter();
+ p.save();
+ p.translate(center.x, center.y);
+
// Deadzone.
p.setPen(GetDeadZonePen());
p.setBrush(GetDeadZoneBrush(p));
p.drawPolygon(GetPolygonFromRadiusGetter(
- [&stick](double ang) { return stick.GetDeadzoneRadiusAtAngle(ang); }, center));
+ [&stick](double ang) { return stick.GetDeadzoneRadiusAtAngle(ang); }));
// Input shape.
p.setPen(GetInputShapePen());
p.setBrush(Qt::NoBrush);
p.drawPolygon(GetPolygonFromRadiusGetter(
- [&stick](double ang) { return stick.GetInputRadiusAtAngle(ang); }, center));
+ [&stick](double ang) { return stick.GetInputRadiusAtAngle(ang); }));
// Center.
if (center.x || center.y)
{
p.setPen(GetInputDotPen(GetCenterColor()));
- p.drawPoint(QPointF{center.x, center.y});
+ p.drawPoint(QPointF{});
}
+ p.restore();
+
// Raw stick position.
p.setPen(GetInputDotPen(GetRawInputColor()));
p.drawPoint(QPointF{raw_coord.x, raw_coord.y});
@@ -745,23 +750,26 @@ void GyroMappingIndicator::Draw()
void ReshapableInputIndicator::DrawCalibration(QPainter& p, Common::DVec2 point)
{
- // Bounding box size:
const auto center = m_calibration_widget->GetCenter();
+ p.save();
+ p.translate(center.x, center.y);
+
// Input shape.
p.setPen(GetInputShapePen());
p.setBrush(Qt::NoBrush);
p.drawPolygon(GetPolygonFromRadiusGetter(
- [this](double angle) { return m_calibration_widget->GetCalibrationRadiusAtAngle(angle); },
- center));
+ [this](double angle) { return m_calibration_widget->GetCalibrationRadiusAtAngle(angle); }));
// Center.
if (center.x || center.y)
{
p.setPen(GetInputDotPen(GetCenterColor()));
- p.drawPoint(QPointF{center.x, center.y});
+ p.drawPoint(QPointF{});
}
+ p.restore();
+
// Stick position.
p.setPen(GetInputDotPen(GetAdjustedInputColor()));
p.drawPoint(QPointF{point.x, point.y});