Normalize rotation values when rotating objects

Avoids weird / confusing values. Closes mapeditor#2775
Mattincho · Jun 12, 2020 · 0daeaa7 · 0daeaa7
1 parent 093cd3d
commit 0daeaa7
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/tiled/objectselectiontool.cpp b/src/tiled/objectselectiontool.cpp
@@ -1219,6 +1219,15 @@ void ObjectSelectionTool::startRotating(const QPointF &pos)
     updateHandleVisibility();
 }
 
+// Brings rotation values within the range of 0 - 360
+static qreal normalizeRotation(qreal rotation)
+{
+    qreal normalized = fmod(rotation, 360.);
+    if (normalized < 0.)
+        normalized += 360.;
+    return normalized;
+}
+
 void ObjectSelectionTool::updateRotatingItems(const QPointF &pos,
                                               Qt::KeyboardModifiers modifiers)
 {
@@ -1247,7 +1256,7 @@ void ObjectSelectionTool::updateRotatingItems(const QPointF &pos,
         const QPointF newPixelPos = mOriginPos + newRelPos - offset;
         const QPointF newPos = renderer->screenToPixelCoords(newPixelPos);
 
-        const qreal newRotation = object.oldRotation + angleDiff * 180 / M_PI;
+        const qreal newRotation = normalizeRotation(object.oldRotation + angleDiff * 180 / M_PI);
 
         mapObject->setPosition(newPos);
         if (mapObject->canRotate())