loading screen now loads before transition (before was transition while loading, wait to finish, then continue)

This commit is contained in:
Harrison Deng 2018-11-01 00:15:29 -05:00
parent d61b18952f
commit 00ca68662c

View File

@ -32,15 +32,17 @@ namespace RhythmBullet.Zer01HD.Game
} }
public override void EnteringTransition(double delta, bool assetsLoaded, ref Color BGColor) public override void EnteringTransition(double delta, bool assetsLoaded, ref Color BGColor)
{
if (assetsLoaded)
{ {
float deltaf = (float)delta; float deltaf = (float)delta;
if (progR < 254 || progG < 254 || progB < 254) if (progR < 254 || progG < 254 || progB < 254)
{ {
if (!recorded) if (!recorded)
{ {
rR = (Color.White.R - BGColor.R) / 2.5f; rR = (Color.White.R - BGColor.R) / 3f;
rG = (Color.White.G - BGColor.G) / 2.5f; rG = (Color.White.G - BGColor.G) / 3f;
rB = (Color.White.B - BGColor.B) / 2.5f; rB = (Color.White.B - BGColor.B) / 3f;
recorded = true; recorded = true;
} }
progR += rR * deltaf; progR += rR * deltaf;
@ -63,11 +65,13 @@ namespace RhythmBullet.Zer01HD.Game
color.B = (byte)progC; color.B = (byte)progC;
color.A = (byte)progC; color.A = (byte)progC;
} }
else if (assetsLoaded) else
{ {
DoneTransition(); DoneTransition();
StartExitTransition(); StartExitTransition();
} }
}
base.EnteringTransition(delta, assetsLoaded, ref BGColor); base.EnteringTransition(delta, assetsLoaded, ref BGColor);
} }