Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-17 04:11:23 -05:00
Code Issues Projects Releases Packages Wiki Activity

undo of movements

Browse source
This commit is contained in:
Cameron Taylor 2021-06-02 21:04:43 -04:00
parent 1f91c3bdef
commit 58cede8706
2 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/ui/stageBuildShit/SprStage.hx
View file

@ -11,6 +11,7 @@ class SprStage extends FlxSprite
public var mousePressing:Bool = false;
public var mouseOffset:FlxPoint = FlxPoint.get(0, 0);
public var oldPos:FlxPoint = FlxPoint.get(0, 0);
public function new(?x:Float = 0, ?y:Float = 0, dragShitFunc:SprStage->Void)
{

52
source/ui/stageBuildShit/StageBuilderState.hx
View file

@ -221,6 +221,14 @@ class StageBuilderState extends MusicBeatState
}
}
if (curTool == GRABBING && FlxG.mouse.justReleased)
{
moveSprPos([
curSelectedSpr.x - curSelectedSpr.oldPos.x,
curSelectedSpr.y - curSelectedSpr.oldPos.y
]);
}
if (FlxG.keys.justPressed.Z && actionQueue.length > 0)
{
trace('UNDO - QUEUE LENGTH: ' + actionQueue.length);
@ -250,16 +258,21 @@ class StageBuilderState extends MusicBeatState
}
function changeCurSelected(spr:SprStage)
{
undoRedoCheck(changeCurSelected, curSelectedSpr);
curSelectedSpr = spr;
}
// base check to see if its in a state of undo or redo
function undoRedoCheck(daFunc:Dynamic->Void, daValue:Dynamic)
{
if (!isUndoRedo)
{
actionQueue.push(changeCurSelected);
posQueue.push(curSelectedSpr);
actionQueue.push(daFunc);
posQueue.push(daValue);
}
else
isUndoRedo = false;
curSelectedSpr = spr;
}
function sprDragShitFunc(spr:SprStage)
@ -272,10 +285,30 @@ class StageBuilderState extends MusicBeatState
if (spr.isSelected())
changeTool(GRABBING);
spr.mouseOffset.set(FlxG.mouse.x - spr.x, FlxG.mouse.y - spr.y);
spr.oldPos.set(spr.x, spr.y);
}
// make function for changing cur selection
function moveSprPos(xDiff:Float, yDiff:Float) {}
function moveSprPos(dumbArray:Array<Dynamic>)
{
var xDiff:Float = dumbArray[0];
var yDiff:Float = dumbArray[1];
var forceMove:Bool = dumbArray[2];
// if (forceMove == null)
// forceMove = false;
trace(xDiff);
trace(yDiff);
if (forceMove)
{
curSelectedSpr.x += xDiff;
curSelectedSpr.y += yDiff;
}
undoRedoCheck(moveSprPos, [-xDiff, -yDiff, true]);
}
var isUndoRedo:Bool = false;
var actionQueue:Array<Dynamic->Void> = [];
@ -291,14 +324,7 @@ class StageBuilderState extends MusicBeatState
// NOTE: fix to account if only one layer is in?
sortSprGrp();
if (!isUndoRedo)
{
actionQueue.push(moveLayer);
posQueue.push(layerMovement * -1);
}
else
isUndoRedo = false;
undoRedoCheck(moveLayer, layerMovement * -1);
}
var isShaking:Bool = false;