Merge branch 'dev' of https://github.com/haxeflixel/flixel-demos into…

… dev
HaxeFlixel · May 1, 2024 · acb846c · acb846c
2 parents f546d22 + d2ffcfe
commit acb846c
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 5 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -58,7 +58,7 @@
 		"Features/SplitScreen/source",
 		"Features/SubState/source",
 		"Features/Tilemap/source",
-		"Graphics/FlxAsepriteUtils/source",
+		"Graphics/FlxAsepriteUtil/source",
 		"Input/FlxAccelerometer/source",
 		"Input/FlxAction/source",
 		"Input/FlxMouseEvent/source",

diff --git a/Effects/FlxSpriteFilters/source/PlayState.hx b/Effects/FlxSpriteFilters/source/PlayState.hx
@@ -205,7 +205,8 @@ class PlayState extends FlxState
 
 	function updateFilter(spr:FlxSprite, sprFilter:FlxFilterFrames)
 	{
-		// spr.offset.set();
+		// Reset the offset, it will ballon with each apply call
+		spr.offset.set();
 		sprFilter.applyToSprite(spr, false, true);
 	}
 }
diff --git a/Graphics/FlxAsepriteUtils/Project.xml → Graphics/FlxAsepriteUtil/Project.xml b/Graphics/FlxAsepriteUtils/Project.xml → Graphics/FlxAsepriteUtil/Project.xml
@@ -4,7 +4,7 @@
 
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="FlxAsepriteUtils" file="FlxAsepriteUtils" main="Main" version="0.0.1" company="HaxeFlixel" />
+	<app title="FlxAsepriteUtil" file="FlxAsepriteUtil" main="Main" version="0.0.1" company="HaxeFlixel" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"!-->

diff --git a/Graphics/FlxAsepriteUtils/README.md → Graphics/FlxAsepriteUtil/README.md b/Graphics/FlxAsepriteUtils/README.md → Graphics/FlxAsepriteUtil/README.md
@@ -1,6 +1,6 @@
-# FlxAsepriteUtils
+# FlxAsepriteUtil
 
-Demonstrates how to utilize Aseprite art files with the built-in FlxAsepriteUtils functionality.
+Demonstrates how to utilize Aseprite art files with the built-in FlxAsepriteUtil functionality.
 
 ## Table of Contents
 

diff --git a/Graphics/FlxAsepriteUtils/assets/player.ase → Graphics/FlxAsepriteUtil/assets/player.ase b/Graphics/FlxAsepriteUtils/assets/player.ase → Graphics/FlxAsepriteUtil/assets/player.ase
diff --git a/Graphics/FlxAsepriteUtils/assets/player.json → Graphics/FlxAsepriteUtil/assets/player.json b/Graphics/FlxAsepriteUtils/assets/player.json → Graphics/FlxAsepriteUtil/assets/player.json
diff --git a/Graphics/FlxAsepriteUtils/assets/player.png → Graphics/FlxAsepriteUtil/assets/player.png b/Graphics/FlxAsepriteUtils/assets/player.png → Graphics/FlxAsepriteUtil/assets/player.png
diff --git a/Graphics/FlxAsepriteUtils/assets/pointer.png → Graphics/FlxAsepriteUtil/assets/pointer.png b/Graphics/FlxAsepriteUtils/assets/pointer.png → Graphics/FlxAsepriteUtil/assets/pointer.png
diff --git a/Graphics/FlxAsepriteUtils/source/Main.hx → Graphics/FlxAsepriteUtil/source/Main.hx b/Graphics/FlxAsepriteUtils/source/Main.hx → Graphics/FlxAsepriteUtil/source/Main.hx
diff --git a/...hics/FlxAsepriteUtils/source/PlayState.hx → Graphics/FlxAsepriteUtil/source/PlayState.hx b/...hics/FlxAsepriteUtils/source/PlayState.hx → Graphics/FlxAsepriteUtil/source/PlayState.hx