Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-14 19:25:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

Few animation editor bugfixes

Browse source
This commit is contained in:
gamerbross 2024-06-15 20:23:55 +02:00
parent 9908f973cf
commit ba4677857a
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hmm.json
View file

@ -30,7 +30,7 @@
"name": "flixel-ui", "name": "flixel-ui",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "719b4f10d94186ed55f6fef1b6618d32abec8c15", "ref": "d0afed7293c71ffdb1184751317fc709b44c9056",
"url": "https://github.com/HaxeFlixel/flixel-ui" "url": "https://github.com/HaxeFlixel/flixel-ui"
}, },
{ {

23
source/funkin/ui/debug/anim/DebugBoundingState.hx
View file

@ -1,6 +1,7 @@
package funkin.ui.debug.anim; package funkin.ui.debug.anim;
import flixel.addons.display.FlxGridOverlay; import flixel.addons.display.FlxGridOverlay;
import flixel.addons.display.FlxBackdrop;
import flixel.addons.ui.FlxInputText; import flixel.addons.ui.FlxInputText;
import flixel.addons.ui.FlxUIDropDownMenu; import flixel.addons.ui.FlxUIDropDownMenu;
import flixel.FlxCamera; import flixel.FlxCamera;
@ -55,7 +56,7 @@ class DebugBoundingState extends FlxState
TODAY'S TO-DO TODAY'S TO-DO
- Cleaner UI - Cleaner UI
*/ */
var bg:FlxSprite; var bg:FlxBackdrop;
var fileInfo:FlxText; var fileInfo:FlxText;
var txtGrp:FlxGroup; var txtGrp:FlxGroup;
@ -80,7 +81,7 @@ class DebugBoundingState extends FlxState
{ {
// get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case? // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera); var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y); return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
} }
override function create() override function create()
@ -103,10 +104,7 @@ class DebugBoundingState extends FlxState
hudCam = new FlxCamera(); hudCam = new FlxCamera();
hudCam.bgColor.alpha = 0; hudCam.bgColor.alpha = 0;
bg = FlxGridOverlay.create(10, 10); bg = new FlxBackdrop(FlxGridOverlay.createGrid(10, 10, FlxG.width, FlxG.height, true, 0xffe7e6e6, 0xffd9d5d5));
// bg = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.GREEN);
bg.scrollFactor.set();
add(bg); add(bg);
// we are setting this as the default draw camera only temporarily, to trick haxeui // we are setting this as the default draw camera only temporarily, to trick haxeui
@ -289,16 +287,20 @@ class DebugBoundingState extends FlxState
public var mouseOffset:FlxPoint = FlxPoint.get(0, 0); public var mouseOffset:FlxPoint = FlxPoint.get(0, 0);
public var oldPos:FlxPoint = FlxPoint.get(0, 0); public var oldPos:FlxPoint = FlxPoint.get(0, 0);
public var movingCharacter:Bool = false;
function mouseOffsetMovement() function mouseOffsetMovement()
{ {
if (swagChar != null) if (swagChar != null)
{ {
if (FlxG.mouse.justPressed) if (FlxG.mouse.justPressed && !haxeUIFocused)
{ {
movingCharacter = true;
mouseOffset.set(FlxG.mouse.x - -swagChar.animOffsets[0], FlxG.mouse.y - -swagChar.animOffsets[1]); mouseOffset.set(FlxG.mouse.x - -swagChar.animOffsets[0], FlxG.mouse.y - -swagChar.animOffsets[1]);
} }
if (!movingCharacter) return;
if (FlxG.mouse.pressed) if (FlxG.mouse.pressed)
{ {
swagChar.animOffsets = [(FlxG.mouse.x - mouseOffset.x) * -1, (FlxG.mouse.y - mouseOffset.y) * -1]; swagChar.animOffsets = [(FlxG.mouse.x - mouseOffset.x) * -1, (FlxG.mouse.y - mouseOffset.y) * -1];
@ -307,6 +309,11 @@ class DebugBoundingState extends FlxState
txtOffsetShit.text = 'Offset: ' + swagChar.animOffsets; txtOffsetShit.text = 'Offset: ' + swagChar.animOffsets;
} }
if (FlxG.mouse.justReleased)
{
movingCharacter = false;
}
} }
} }
@ -373,7 +380,7 @@ class DebugBoundingState extends FlxState
offsetView.visible = true; offsetView.visible = true;
offsetView.active = true; offsetView.active = true;
offsetControls(); offsetControls();
if (!haxeUIFocused) mouseOffsetMovement(); mouseOffsetMovement();
} }
if (FlxG.keys.justPressed.H) hudCam.visible = !hudCam.visible; if (FlxG.keys.justPressed.H) hudCam.visible = !hudCam.visible;