fix transition sprite graphic classes on html5 (#396)

* fix transition sprite graphic classes on html5 * include transition sprites * keep onLoad arg * prevent crash on invalid transition asset * reduce memory used for diagonal fade * prevent double fade transition effect updates
HaxeFlixel · Jul 27, 2023 · ceb2670 · ceb2670
1 parent c756161
commit ceb2670
Show file tree

Hide file tree

Showing 8 changed files with 174 additions and 142 deletions.
diff --git a/assets/images/transitions/circle.png b/assets/images/transitions/circle.png
diff --git a/assets/images/transitions/diagonal_gradient.png b/assets/images/transitions/diagonal_gradient.png
diff --git a/assets/images/transitions/diamond.png b/assets/images/transitions/diamond.png
diff --git a/assets/images/transitions/square.png b/assets/images/transitions/square.png
diff --git a/flixel/addons/transition/FlxTransitionSprite.hx b/flixel/addons/transition/FlxTransitionSprite.hx
@@ -1,14 +1,63 @@
 package flixel.addons.transition;
 
-import flixel.addons.transition.FlxTransitionSprite.TransitionStatus;
 import flixel.FlxG;
 import flixel.FlxSprite;
+import flixel.addons.transition.FlxTransitionSprite;
 import flixel.graphics.FlxGraphic;
 import flixel.math.FlxPoint;
 import flixel.system.FlxAssets.FlxGraphicAsset;
 import flixel.util.FlxTimer;
 import openfl.display.BitmapData;
 
+#if html5
+@:keep @:bitmap("assets/images/transitions/circle.png")
+private class RawGraphicTransTileCircle extends BitmapData {}
+class GraphicTransTileCircle extends RawGraphicTransTileCircle
+{
+	static inline var WIDTH = 544;
+	static inline var HEIGHT = 32;
+
+	public function new(?onLoad)
+	{
+		super(WIDTH, HEIGHT, true, 0xFFffffff, onLoad);
+		// Set properties because `@:bitmap` constructors ignore width/height
+		this.width = WIDTH;
+		this.height = HEIGHT;
+	}
+}
+
+@:keep @:bitmap("assets/images/transitions/diamond.png")
+private class RawGraphicTransTileDiamond extends BitmapData {}
+class GraphicTransTileDiamond extends RawGraphicTransTileDiamond
+{
+	static inline var WIDTH = 544;
+	static inline var HEIGHT = 32;
+
+	public function new(?onLoad)
+	{
+		super(WIDTH, HEIGHT, true, 0xFFffffff, onLoad);
+		// Set properties because `@:bitmap` constructors ignore width/height
+		this.width = WIDTH;
+		this.height = HEIGHT;
+	}
+}
+
+@:keep @:bitmap("assets/images/transitions/square.png")
+class RawGraphicTransTileSquare extends BitmapData {}
+class GraphicTransTileSquare extends RawGraphicTransTileSquare
+{
+	static inline var WIDTH = 544;
+	static inline var HEIGHT = 32;
+
+	public function new(?onLoad)
+	{
+		super(WIDTH, HEIGHT, true, 0xFFffffff, onLoad);
+		// Set properties because `@:bitmap` constructors ignore width/height
+		this.width = WIDTH;
+		this.height = HEIGHT;
+	}
+}
+#else
 @:keep @:bitmap("assets/images/transitions/circle.png")
 class GraphicTransTileCircle extends BitmapData {}
 
@@ -17,6 +66,7 @@ class GraphicTransTileDiamond extends BitmapData {}
 
 @:keep @:bitmap("assets/images/transitions/square.png")
 class GraphicTransTileSquare extends BitmapData {}
+#end
 
 /**
  *
@@ -45,6 +95,9 @@ class FlxTransitionSprite extends FlxSprite
 		}
 		_delay = Delay;
 		loadGraphic(Graphic, true, GraphicWidth, GraphicHeight);
+
+		if (graphic == null)
+			return;
 
 		graphic.persist = true;
 		graphic.destroyOnNoUse = false;

diff --git a/flixel/addons/transition/Transition.hx b/flixel/addons/transition/Transition.hx
@@ -34,17 +34,10 @@ class Transition extends FlxSubState
 		add(_effect);
 	}
 
-	override public function update(elapsed:Float):Void
-	{
-		super.update(elapsed);
-		_effect.update(elapsed);
-	}
-
 	public override function destroy():Void
 	{
 		super.destroy();
 		finishCallback = null;
-		_effect.destroy();
 		_effect = null;
 	}