Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show transitions above everything else #410

Merged
merged 17 commits into from
Nov 16, 2023
Merged
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion flixel/addons/transition/Transition.hx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import flixel.addons.transition.TransitionEffect;
import flixel.addons.transition.TransitionFade;
import flixel.addons.transition.TransitionTiles;
import flixel.addons.transition.FlxTransitionSprite.TransitionStatus;
import flixel.FlxCamera;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.FlxSubState;
Expand All @@ -13,6 +14,7 @@ import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
import flixel.util.FlxDestroyUtil;
import flixel.util.FlxTimer;

/**
Expand All @@ -24,21 +26,38 @@ class Transition extends FlxSubState
{
public var finishCallback(get, set):Void->Void;

var _effectCamera:FlxCamera;
var _effect:TransitionEffect;

public function new(data:TransitionData)
{
super(FlxColor.TRANSPARENT);

_effectCamera = new FlxCamera(0, 0, Std.int(data.region.width), Std.int(data.region.height));
FlxG.cameras.add(_effectCamera, false);
_effectCamera.bgColor.alpha = 0;

_effect = createEffect(data);
_effect.scrollFactor.set(0, 0);
add(_effect);

cameras = [transCamera];
Geokureli marked this conversation as resolved.
Show resolved Hide resolved
}

public override function destroy():Void
{
super.destroy();

finishCallback = null;
_effect = null;

_effect = FlxDestroyUtil.destroy(_effect);

if (_effectCamera != null)
{
FlxG.cameras.remove(_effectCamera, true);

_effectCamera = null;
}
}

public function start(NewStatus:TransitionStatus):Void
Expand Down Expand Up @@ -70,6 +89,7 @@ class Transition extends FlxSubState
{
return _effect.finishCallback;
}

return null;
}

Expand All @@ -80,6 +100,7 @@ class Transition extends FlxSubState
_effect.finishCallback = f;
return f;
}

return null;
}
}