From bda3ab1192ae8ccdd99e75f8deb3c12c3e289239 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 17 Feb 2025 10:44:31 -0500 Subject: [PATCH] update to latest upstream flixel + flixel-addon + flxanimate --- hmm.json | 2 +- source/funkin/input/Controls.hx | 6 +++--- source/funkin/play/character/AnimateAtlasCharacter.hx | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hmm.json b/hmm.json index 7d68e6f21..d8bfd8bb0 100644 --- a/hmm.json +++ b/hmm.json @@ -11,7 +11,7 @@ "name": "flixel", "type": "git", "dir": null, - "ref": "e0e481ca9c147ddaf3c18dd0e560d0bfc038790b", + "ref": "21caee3a4fdbe5a73d74fd7c45d4b35834618998", "url": "https://github.com/FunkinCrew/flixel" }, { diff --git a/source/funkin/input/Controls.hx b/source/funkin/input/Controls.hx index 0ffee7c69..9a7ec88c7 100644 --- a/source/funkin/input/Controls.hx +++ b/source/funkin/input/Controls.hx @@ -705,7 +705,7 @@ class Controls extends FlxActionSet forEachBound(control, function(action, state) addKeys(action, keys, state)); } - public function bindSwipe(control:Control, swipeDir:Int = FlxDirectionFlags.UP, ?swpLength:Float = 90) + public function bindSwipe(control:Control, swipeDir:FlxDirectionFlags = FlxDirectionFlags.UP, ?swpLength:Float = 90) { forEachBound(control, function(action, press) action.add(new FlxActionInputDigitalMobileSwipeGameplay(swipeDir, press, swpLength))); } @@ -1443,9 +1443,9 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital var activateLength:Float = 90; var hapticPressure:Int = 100; - public function new(swipeDir:Int = FlxDirectionFlags.ANY, Trigger:FlxInputState, ?swipeLength:Float = 90) + public function new(swipeDir:FlxDirectionFlags = FlxDirectionFlags.ANY, Trigger:FlxInputState, ?swipeLength:Float = 90) { - super(OTHER, swipeDir, Trigger); + super(OTHER, swipeDir.toInt(), Trigger); activateLength = swipeLength; } diff --git a/source/funkin/play/character/AnimateAtlasCharacter.hx b/source/funkin/play/character/AnimateAtlasCharacter.hx index fd94dbe82..de9ed373f 100644 --- a/source/funkin/play/character/AnimateAtlasCharacter.hx +++ b/source/funkin/play/character/AnimateAtlasCharacter.hx @@ -16,6 +16,7 @@ import flixel.util.FlxDestroyUtil; import funkin.graphics.adobeanimate.FlxAtlasSprite; import funkin.modding.events.ScriptEvent; import funkin.play.character.CharacterData.CharacterRenderType; +import flixel.util.FlxDirectionFlags; import openfl.display.BitmapData; import openfl.display.BlendMode; @@ -389,7 +390,7 @@ class AnimateAtlasCharacter extends BaseCharacter inline function directAlphaTransform(sprite:FlxSprite, alpha:Float):Void sprite.alpha = alpha; // direct set - inline function facingTransform(sprite:FlxSprite, facing:Int):Void + inline function facingTransform(sprite:FlxSprite, facing:FlxDirectionFlags):Void sprite.facing = facing; inline function flipXTransform(sprite:FlxSprite, flipX:Bool):Void @@ -588,7 +589,7 @@ class AnimateAtlasCharacter extends BaseCharacter return alpha = value; } - override function set_facing(value:Int):Int + override function set_facing(value:FlxDirectionFlags):FlxDirectionFlags { if (exists && facing != value) transformChildren(facingTransform, value); return facing = value;