cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-25 21:55:55 +00:00
Code Issues Releases Wiki Activity

Camera tween pausing/unpausing additions

Browse source
This commit is contained in:
Jenny Crowe 2024-03-15 01:52:22 -07:00
parent 42506909f7
commit 1541f0aa68
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 0e2c5bf2134c7e517b70cf74afd58abe5c7b5e50 Subproject commit 2237228923c6bd35df1e68e3b2a13dfffd1c243d

23
source/funkin/play/PlayState.hx
View file

@ -412,7 +412,10 @@ class PlayState extends MusicBeatSubState
*/ */
var musicPausedBySubState:Bool = false; var musicPausedBySubState:Bool = false;
var cameraFollowTweenPausedBySubState:Bool = false; // Idea FOR LATER: Store paused tweens in an array, so we know which ones to unpause when leaving the Pause substate. /**
* Track any camera tweens we've paused for a Pause substate, so we can unpause them when we return.
*/
var cameraTweensPausedBySubState:List<FlxTween> = new List<FlxTween>();
/** /**
* False until `create()` has completed. * False until `create()` has completed.
@ -1145,11 +1148,17 @@ class PlayState extends MusicBeatSubState
if (vocals != null) vocals.pause(); if (vocals != null) vocals.pause();
} }
// Pause camera tweening. // Pause camera tweening, and keep track of which tweens we pause.
if (cameraFollowTween != null && cameraFollowTween.active) if (cameraFollowTween != null && cameraFollowTween.active)
{ {
cameraFollowTween.active = false; cameraFollowTween.active = false;
cameraFollowTweenPausedBySubState = true; cameraTweensPausedBySubState.add(cameraFollowTween);
}
if (cameraZoomTween != null && cameraZoomTween.active)
{
cameraZoomTween.active = false;
cameraTweensPausedBySubState.add(cameraZoomTween);
} }
// Pause the countdown. // Pause the countdown.
@ -1180,12 +1189,12 @@ class PlayState extends MusicBeatSubState
musicPausedBySubState = false; musicPausedBySubState = false;
} }
// Resume camera tweening if we paused it. // Resume camera tweens if we paused any.
if (cameraFollowTweenPausedBySubState) for (camTween in cameraTweensPausedBySubState)
{ {
cameraFollowTween.active = true; camTween.active = true;
cameraFollowTweenPausedBySubState = false;
} }
cameraTweensPausedBySubState.clear();
if (currentConversation != null) if (currentConversation != null)
{ {