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

slowly implementing CTRL-z movement

Browse source
This commit is contained in:
Cameron Taylor 2023-02-09 01:31:43 -05:00
parent 169309e17d
commit 460da18804
2 changed files with 50 additions and 16 deletions
source/funkin/ui/stageBuildShit
StageEditorCommand.hxStageOffsetSubstate.hx

13
source/funkin/ui/stageBuildShit/StageEditorCommand.hx
View file

@ -18,17 +18,22 @@ class MovePropCommand implements StageEditorCommand
{
var xDiff:Float;
var yDiff:Float;
var realMove:Bool; // if needs a move!
public function new(xDiff:Float = 0, yDiff:Float = 0)
public function new(xDiff:Float = 0, yDiff:Float = 0, ?realMove:Bool = true)
{
this.xDiff = xDiff;
this.yDiff = yDiff;
this.realMove = realMove;
}
public function execute(state:StageOffsetSubstate):Void
{
state.char.x += xDiff;
state.char.y += yDiff;
if (realMove)
{
state.char.x += xDiff;
state.char.y += yDiff;
}
}
public function undo(state:StageOffsetSubstate):Void
@ -39,7 +44,7 @@ class MovePropCommand implements StageEditorCommand
public function toString():String
{
return "Moved char";
return "Moved char " + xDiff + " " + yDiff + " " + realMove;
}
}

53
source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx
View file

@ -81,19 +81,18 @@ class StageOffsetSubstate extends HaxeUISubState
});
}
//
//
//
//
//
FlxMouseEvent.add(thing, spr -> {
// onMouseClick
trace(spr);
var dyn:StageProp = cast spr;
if (dyn != null && dyn.name != null)
{
if (FlxG.keys.pressed.CONTROL) selectProp(dyn.name);
if (FlxG.keys.pressed.CONTROL && char != dyn) selectProp(dyn.name);
}
}, null, spr -> {
// onMouseHover
// ID tag is to see if currently overlapping hold basically!, a bit more reliable than checking transparency!
// used for bug where you can click, and if you click on NO sprite, it snaps the thing to position! unintended!
@ -108,8 +107,13 @@ class StageOffsetSubstate extends HaxeUISubState
spr.alpha = 1;
}
}, spr -> {
spr.ID = 0;
spr.alpha = 1;
// onOut
// this if statement is for when u move ur mouse too fast... figure out how to proper lock it to mouse!
if (char != spr)
{
spr.ID = 0;
spr.alpha = 1;
}
});
}
}
@ -190,16 +194,41 @@ class StageOffsetSubstate extends HaxeUISubState
{
super.update(elapsed);
if (FlxG.keys.justPressed.O)
{
trace("COMMANDS!!!");
trace("-/-/-/-/-/-");
for (ind => cmd in commandStack)
{
var output:String = cmd.toString();
if (curOperation == ind) output += " <---";
trace(output);
}
trace("-/-/-/-/-/-");
}
if (char != null)
{
setUIValue('propXPos', char.x);
setUIValue('propYPos', char.y);
}
if (char != null && char.ID == 1 && FlxG.mouse.pressed)
if (char != null && char.ID == 1)
{
char.x = sprOld.x - (mosPosOld.x - FlxG.mouse.x);
char.y = sprOld.y - (mosPosOld.y - FlxG.mouse.y);
if (FlxG.mouse.pressed)
{
char.x = sprOld.x - (mosPosOld.x - FlxG.mouse.x);
char.y = sprOld.y - (mosPosOld.y - FlxG.mouse.y);
}
if (FlxG.mouse.justReleased)
{
trace("LOL");
var xDiff = (mosPosOld.x - FlxG.mouse.x);
var yDiff = (mosPosOld.y - FlxG.mouse.y);
performCommand(new MovePropCommand(-xDiff, -yDiff, false));
}
}
if (char != null)