From 68264acf6615246f0c3f359ebc64c0daf9801fbf Mon Sep 17 00:00:00 2001
From: NeeEoo <NeeEoo@users.noreply.github.com>
Date: Thu, 18 Apr 2024 03:12:10 +0200
Subject: [PATCH] Implemented rotation + new dot sprite

---
 assets/data/states/StageEditor.hx            |  38 +++++--
 assets/images/editors/stage/selectionDot.png | Bin 0 -> 793 bytes
 source/funkin/editors/stage/StageEditor.hx   | 114 +++++++++++++++----
 3 files changed, 117 insertions(+), 35 deletions(-)
 create mode 100644 assets/images/editors/stage/selectionDot.png

diff --git a/assets/data/states/StageEditor.hx b/assets/data/states/StageEditor.hx
index f18d377a..e8624bf5 100644
--- a/assets/data/states/StageEditor.hx
+++ b/assets/data/states/StageEditor.hx
@@ -10,6 +10,7 @@
 import funkin.editors.stage.StageEditor;
 import funkin.editors.ui.UIWarningSubstate;
 import funkin.backend.utils.WindowUtils;
+import flixel.math.FlxAngle;
 import openfl.Lib;
 
 var exID = StageEditor.exID;
@@ -130,12 +131,9 @@ function SCALE_BOTTOM_RIGHT(sprite, relative) {
 	ROTATION
 **/
 function preRotBullshit(sprite, relative) {
-	// just remove the other line in source
-	rotateByDegrees(relative, -sprite.angle);
-
 	if (sprite.angle != 0)
 		relative = rotateAround(relative, FlxPoint.weak(0, 0), -sprite.angle);
-	
+
 	if (FlxG.mouse.justPressed) {
 		oldSpritePos.x = sprite.x;
 		oldSpritePos.y = sprite.y;
@@ -149,16 +147,16 @@ function postRotBullshit(sprite, relative) {
 		sprite.y = p.y;
 	}
 }
-import flixel.math.FlxAngle;
 
 function rotateAround(p, origin, angle) {
 	var rel = FlxPoint.get(p.x - origin.x, p.y - origin.y);
 	rotateByDegrees(rel, angle);
 	p.x = origin.x + rel.x;
 	p.y = origin.y + rel.y;
+	rel.put();
 	return p;
 }
- function rotateByDegrees(p, angle) {
+function rotateByDegrees(p, angle) {
 	var rads = angle * FlxAngle.TO_RAD;
 	var s:Float = Math.sin(rads);
 	var c:Float = Math.cos(rads);
@@ -166,9 +164,7 @@ function rotateAround(p, origin, angle) {
 
 	p.x = tempX * c - p.y * s;
 	p.y = tempX * s + p.y * c;
-
-	return this;
- }
+}
  /**
 	END OF ROTATION
  **/
@@ -226,6 +222,28 @@ function SKEW_TOP(sprite, relative) {}
 
 function SKEW_RIGHT(sprite, relative) {}
 
-function ROTATE(sprite, relative) {}
+/*var storedCenter = FlxPoint.get();
+var storedRelative = FlxPoint.get();*/
+
+function ROTATE(sprite, relative) {
+	var buttonBoxes:Array<FlxPoint> = sprite.extra.get(exID("buttonBoxes"));
+	var p:FlxPoint = buttonBoxes[8];
+
+	FlxG.mouse.getWorldPosition(stageCamera, _point);
+
+	var dx:Float = _point.x - p.x;
+	var dy:Float = _point.y - p.y;
+	var angle = FlxAngle.angleFromOrigin(dx, dy, true) + 90;
+	if(FlxG.keys.pressed.SHIFT) angle = Std.int(angle / 45) * 45;
+	sprite.angle = angle;
+
+	//storedCenter.set(p.x, p.y);
+	//storedRelative.set(_point.x, _point.y);
+}
 
 
+/*function postDraw() {
+	if(storedCenter.x != 0 || storedCenter.y != 0) {
+		drawLine(storedCenter, storedRelative, 0.3);
+	}
+}*/
\ No newline at end of file
diff --git a/assets/images/editors/stage/selectionDot.png b/assets/images/editors/stage/selectionDot.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5aa449e24d3233da0ba7b19a038c94e4b81b7db
GIT binary patch
literal 793
zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00009a7bBm000XU
z000XU0RWnu7ytkQ%Sl8*RA_<anNLsDKp2OgZZ-%}qlp*rW_F35i19*5goxbGlV3tU
zg`PC<8Q`ubPI^Sc`T>BRh|zeIkl-JLUD?aeL#HxZJKYxADT%-2O{STd_nEhynYQl)
zlE|qmz$0KDxC`6@u9>=@z!zW}cn`b<j`BLLl`m<SwI!`eI#PZenLh0t{%hrDRgOwp
zmUL18oYaY=72~UD;9mGHcuUgOIlxJ6sn~3A@k2?^CCy8^DQU#mxTFWBE-b=NgWr?1
zcji#t+B3d~1)s+6NSe*jH?~>RXDB~yz3rD1Z>si{Jrk1ro}{Oef{Z>c3ryc$7T@kL
zCTY9ecvH1)Sjhn=`QIhYq_it)Gm^f!_;$nPk^{}sa>_t$eoxYLN}IFVv<7FwU%tKR
z^h*!Zt-fKp_)97;_}G@x_;KZG`7sXFnob92^E*1*n$NQ**c;=TBmzlSfv>>jGC$jL
z=opwVWt%?-e5i;y3v_IL6IjH5@EGQzRR##DE_jUZ5SWVjP2gdLz+qYd?4OZ!56pF<
z8vwA-v@Yt<6oWUQ%BLTzW0j|xK-&Y<rB>p4*8|gLv;s-LflD61Y3dWrfS5lDoK(yl
zu^9bE#jp#n2Jov!{$YZD!voW195#SY9-uCLPVjGgVBWF$4WjpAT?!NYIS)*m5jKE#
z9-uC5B=}D}Fm1+0ou9&8VBC~_eG1>Ve0PEIcoTeG5im=y3_Hnx0R$EB0^sF8eAV|m
zY-eWb_#JL5kq}uaJxsS&QU+-AyDC2+(oN&rjm9MHlpSe`cH~Zp+57{Qml8X0@so}J
z>!fIG7cniqsp4tz%{=_9CsF2d*io^A5f?v{^i0vg$b?Q0MkXXJC|cVei}14sF=`y1
z=k3tf`Hsda=jR#7q@twdaRG2wQPOcThyPmnfmG;t{4s;a)7MSi4+f8?-%!o*c<KB<
X65c@Dh1Dg)00000NkvXXu0mjfE<AXi

literal 0
HcmV?d00001

diff --git a/source/funkin/editors/stage/StageEditor.hx b/source/funkin/editors/stage/StageEditor.hx
index 622a5920..3d539e1a 100644
--- a/source/funkin/editors/stage/StageEditor.hx
+++ b/source/funkin/editors/stage/StageEditor.hx
@@ -51,6 +51,8 @@ class StageEditor extends UIState {
 	public var clickPoint:FlxPoint = new FlxPoint();
 	public var storedPos:FlxPoint = new FlxPoint();
 	public var storedScale:FlxPoint = new FlxPoint();
+	public var storedSkew:FlxPoint = new FlxPoint();
+	public var storedAngle:Float = 0;
 
 	public var showCharacters:Bool = true;
 
@@ -909,9 +911,19 @@ class StageEditor extends UIState {
 
 		mousePoint = FlxG.mouse.getWorldPosition(stageCamera, mousePoint);
 		if(dot == null) {
-			dot = new FlxSprite().makeGraphic(30, 30, FlxColor.WHITE);
+			dot = new FlxSprite().loadGraphic(Paths.image("editors/stage/selectionDot"), true, 32, 32);
+			dot.antialiasing = true;
+			dot.animation.add("default", [0], 0, false);
+			dot.animation.add("hollow", [1], 0, false);
+			dot.animation.play("default");
+			//dot = new FlxSprite().makeGraphic(30, 30, FlxColor.WHITE);
 			dot.camera = stageCamera;
 			dot.forceIsOnScreen = true;
+
+			line = new FlxSprite().makeGraphic(30, 30, FlxColor.WHITE);
+			line.camera = stageCamera;
+			line.color = lineColor;
+			line.forceIsOnScreen = true;
 		}
 		for(sprite in selection) {
 			if(sprite is FunkinSprite) {
@@ -921,8 +933,9 @@ class StageEditor extends UIState {
 		}
 	}
 
-	var lineColor = 0xFFb794b6;
-	var circleColor = 0xFF99a8f2;
+	var lineColor:FlxColor = 0xFFb794b6;
+	var circleColor:FlxColor = 0xFF99a8f2;
+	var hollowColor:FlxColor = 0xffb2beff;
 
 	function drawGuides(sprite:FlxSprite) {
 		var corners = calcSpriteBounds(sprite);
@@ -943,20 +956,37 @@ class StageEditor extends UIState {
 			funkinSprite.extra.set(exID("buttonBoxes"), buttonBoxes);
 		}
 
-		dot.color = lineColor;
-
 		drawLine(corners[0], corners[1]); // tl - tr
 		drawLine(corners[0], corners[2]); // tl - bl
 		drawLine(corners[1], corners[3]); // tr - br
 		drawLine(corners[2], corners[3]); // bl - br
+
+		drawLine(corners[7], corners[9], 0.3); // tc - ac // top center to angle center
+
 		// cross
 		//drawLine(corners[0], corners[3]); // tl - br
 		//drawLine(corners[1], corners[2]); // tr - bl
 
 		dot.color = circleColor;
 
-		for(corner in corners) {
-			drawDot(corner.x, corner.y);
+		final ANGLE_INDEX = StageEditorEdge.ROTATE_CIRCLE.toInt();
+		final CENTER_INDEX = StageEditorEdge.CENTER_CIRCLE.toInt();
+
+		dot.animation.play("default");
+
+		for(i in 0...corners.length) {
+			var corner = corners[i];
+			if(i != CENTER_INDEX) {
+				if(i == ANGLE_INDEX)  {
+					dot.color = hollowColor;
+					drawDot(corner.x, corner.y);
+					dot.animation.play("hollow");
+					dot.color = circleColor;
+					drawDot(corner.x, corner.y);
+				} else {
+					drawDot(corner.x, corner.y);
+				}
+			}
 			buttonBoxes.push(corner);
 		}
 
@@ -988,7 +1018,9 @@ class StageEditor extends UIState {
 			FlxPoint.get(0.5, 1),
 			FlxPoint.get(0.5, 0),
 			// center
-			//FlxPoint.get(0.5, 0.5)
+			FlxPoint.get(0.5, 0.5),
+			//FlxPoint.get(0.5, -100/sprite.frameHeight) // angle
+			FlxPoint.get(0.5, -0.5) // angle
 		], sprite.camera, sprite.frameWidth, sprite.frameHeight);
 
 		//Logs.trace("Guide at " + corners[0].x + ", " + corners[0].y + " sprite at " + sprite.x + ", " + sprite.y);
@@ -1024,6 +1056,10 @@ class StageEditor extends UIState {
 		MIDDLE_RIGHT, //FlxPoint.get(1, 0.5),
 		BOTTOM_MIDDLE, //FlxPoint.get(0.5, 1),
 		TOP_MIDDLE, //FlxPoint.get(0.5, 0),
+
+		CENTER_CIRCLE, //FlxPoint.get(0.5, -0.5)
+
+		ROTATE_CIRCLE, //FlxPoint.get(0.5, -0.5)
 	];
 
 	function tryUpdateHitbox(sprite:FunkinSprite) {
@@ -1048,12 +1084,15 @@ class StageEditor extends UIState {
 						case BOTTOM_LEFT: SCALE_BOTTOM_LEFT;
 						case BOTTOM_MIDDLE: SCALE_BOTTOM;
 						case BOTTOM_RIGHT: SCALE_BOTTOM_RIGHT;
+						case ROTATE_CIRCLE: ROTATE;
 						default: NONE;
 					}
 					Logs.trace("Clicked Dot: " + mouseMode.toString());
 					mousePoint.copyTo(clickPoint);
 					storedPos.set(sprite.x, sprite.y);
+					storedSkew.set(sprite.skew.x, sprite.skew.y);
 					storedScale.copyFrom(sprite.scale);
+					storedAngle = sprite.angle;
 				}
 			}
 		}
@@ -1075,6 +1114,8 @@ class StageEditor extends UIState {
 					//case TOP_MIDDLE | BOTTOM_MIDDLE: MouseCursor.RESIZE_NS;
 					//case TOP_RIGHT | BOTTOM_LEFT: MouseCursor.RESIZE_NESW;
 					//case MIDDLE_LEFT | MIDDLE_RIGHT: MouseCursor.RESIZE_WE;
+
+					case ROTATE_CIRCLE: FlxG.mouse.pressed ? DRAG : #if mac DRAG_OPEN #else CLICK #end;
 					default: ARROW;
 				}
 				break;
@@ -1085,13 +1126,13 @@ class StageEditor extends UIState {
 		if(mouseMode == NONE) return;
 		var relative = clickPoint.subtractNew(mousePoint);
 		// todo: make this origin based
-		relative.rotateByDegrees(sprite.angle);
+		//relative.rotateByDegrees(sprite.angle);
 		call(mouseMode.toString(), [sprite, relative]);
 		cast(sprite.extra.get(exID("button")), StageElementButton).updateInfo();
 		relative.put();
 	}
 
-	var dotCheckSize:Float = 50;
+	var dotCheckSize:Float = 53;
 
 	function checkDot(point:FlxPoint):Bool {
 		var rect = new FlxRect(point.x - dotCheckSize/2, point.y - dotCheckSize/2, dotCheckSize, dotCheckSize);
@@ -1106,28 +1147,29 @@ class StageEditor extends UIState {
 		dot.draw();
 	}
 
-	function drawLine(point1:FlxPoint, point2:FlxPoint) {
+	function drawLine(point1:FlxPoint, point2:FlxPoint, sizeModify:Float = 1) {
 		var dx:Float = point2.x - point1.x;
 		var dy:Float = point2.y - point1.y;
 
 		var angle:Float = Math.atan2(dy, dx);
 		var distance:Float = Math.sqrt(dx * dx + dy * dy);
 
-		dot.setPosition(point1.x, point1.y);
-		dot.angle = angle * FlxAngle.TO_DEG;
-		dot.origin.set(0, dot.frameHeight / 2);
-		dot.scale.x = distance / dot.frameWidth;
-		dot.scale.y = 0.20/stageCamera.zoom;
-		//dot.x -= dot.width / 2;
-		dot.y -= dot.height / 2;
-		dot.draw();
+		line.setPosition(point1.x, point1.y);
+		line.angle = angle * FlxAngle.TO_DEG;
+		line.origin.set(0, line.frameHeight / 2);
+		line.scale.x = distance / line.frameWidth;
+		line.scale.y = 0.20/stageCamera.zoom * sizeModify;
+		//line.x -= line.width / 2;
+		line.y -= line.height / 2;
+		line.draw();
 		// Reset the angle and scale
-		dot.angle = 0;
-		dot.scale.x = dot.scale.y = 1;
-		dot.updateHitbox();
+		line.angle = 0;
+		line.scale.x = line.scale.y = 1;
+		line.updateHitbox();
 	}
 
 	var dot:FlxSprite = null;
+	var line:FlxSprite = null;
 }
 
 enum StageChange {
@@ -1189,9 +1231,9 @@ enum abstract StageEditorMouseMode(Int) {
 }
 
 enum abstract StageEditorEdge(Int) {
-	var NONE;
+	var NONE = -1;
 
-	var TOP_LEFT;
+	var TOP_LEFT = 0;
 	var TOP_MIDDLE;
 	var TOP_RIGHT;
 	var MIDDLE_LEFT;
@@ -1200,8 +1242,11 @@ enum abstract StageEditorEdge(Int) {
 	var BOTTOM_LEFT;
 	var BOTTOM_MIDDLE;
 	var BOTTOM_RIGHT;
+	var CENTER_CIRCLE;
 
-	function toString():String {
+	var ROTATE_CIRCLE;
+
+	public function toString():String {
 		return switch(cast this) {
 			case NONE: "NONE";
 			case TOP_LEFT: "TOP_LEFT";
@@ -1213,6 +1258,25 @@ enum abstract StageEditorEdge(Int) {
 			case BOTTOM_LEFT: "BOTTOM_LEFT";
 			case BOTTOM_MIDDLE: "BOTTOM_MIDDLE";
 			case BOTTOM_RIGHT: "BOTTOM_RIGHT";
+			case CENTER_CIRCLE: "CENTER_CIRCLE";
+			case ROTATE_CIRCLE: "ROTATE_CIRCLE";
+		}
+	}
+
+	public function toInt():Int {
+		return switch(cast this) {
+			case NONE: -1;
+			case TOP_LEFT: 0;
+			case TOP_MIDDLE: 1;
+			case TOP_RIGHT: 2;
+			case MIDDLE_LEFT: 3;
+
+			case MIDDLE_RIGHT: 4;
+			case BOTTOM_LEFT: 5;
+			case BOTTOM_MIDDLE: 6;
+			case BOTTOM_RIGHT: 7;
+			case CENTER_CIRCLE: 8;
+			case ROTATE_CIRCLE: 9;
 		}
 	}
 }