From 0684cc3960bb817b0a095ff437a09166e7768250 Mon Sep 17 00:00:00 2001 From: tole42 Date: Fri, 5 Oct 2018 09:50:11 +0200 Subject: [PATCH 1/3] Update Transformer.js fix rotationSnaps --- src/shapes/Transformer.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/shapes/Transformer.js b/src/shapes/Transformer.js index 227a359d..1f778536 100644 --- a/src/shapes/Transformer.js +++ b/src/shapes/Transformer.js @@ -520,18 +520,22 @@ var newAlpha = Konva.Util._degToRad(newRotation); var snaps = this.rotationSnaps(); - var offset = 0.1; + var max = Math.PI * 2; + var currentSnap=-1; for (var i = 0; i < snaps.length; i++) { var angle = Konva.getAngle(snaps[i]); - var dif = Math.abs(angle - Konva.Util._degToRad(newRotation)) % (Math.PI * 2); - - if (dif < offset) { - newRotation = Konva.Util._radToDeg(angle); - newAlpha = Konva.Util._degToRad(newRotation); + if (dif <= max) { + max = dif; + currentSnap = i; } } + if (snaps.length > 0 && currentSnap >=0) { + var angle = Konva.getAngle(snaps[currentSnap]); + newRotation = Konva.Util._radToDeg(angle); + newAlpha = Konva.Util._degToRad(newRotation); + } var dx = padding; var dy = padding; From bb72eccbe743ae65f6794256ab2118551f8ff033 Mon Sep 17 00:00:00 2001 From: tole42 Date: Fri, 5 Oct 2018 10:02:46 +0200 Subject: [PATCH 2/3] Update Transformer.js --- src/shapes/Transformer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shapes/Transformer.js b/src/shapes/Transformer.js index 1f778536..a72ad042 100644 --- a/src/shapes/Transformer.js +++ b/src/shapes/Transformer.js @@ -521,7 +521,7 @@ var snaps = this.rotationSnaps(); var max = Math.PI * 2; - var currentSnap=-1; + var currentSnap = -1; for (var i = 0; i < snaps.length; i++) { var angle = Konva.getAngle(snaps[i]); var dif = @@ -532,7 +532,7 @@ } } if (snaps.length > 0 && currentSnap >=0) { - var angle = Konva.getAngle(snaps[currentSnap]); + angle = Konva.getAngle(snaps[currentSnap]); newRotation = Konva.Util._radToDeg(angle); newAlpha = Konva.Util._degToRad(newRotation); } From 9a20580fe42d714af9ea335217b6a58eabefffe6 Mon Sep 17 00:00:00 2001 From: tole42 Date: Fri, 5 Oct 2018 10:05:46 +0200 Subject: [PATCH 3/3] Update Transformer.js --- src/shapes/Transformer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shapes/Transformer.js b/src/shapes/Transformer.js index a72ad042..fe814e2b 100644 --- a/src/shapes/Transformer.js +++ b/src/shapes/Transformer.js @@ -531,7 +531,7 @@ currentSnap = i; } } - if (snaps.length > 0 && currentSnap >=0) { + if (snaps.length > 0 && currentSnap >= 0) { angle = Konva.getAngle(snaps[currentSnap]); newRotation = Konva.Util._radToDeg(angle); newAlpha = Konva.Util._degToRad(newRotation);