ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Harrison Deng 2018-11-01 00:15:29 -05:00
parent d61b18952f
commit 00ca68662c
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs
View File

@ -33,40 +33,44 @@ namespace RhythmBullet.Zer01HD.Game
public override void EnteringTransition(double delta, bool assetsLoaded, ref Color BGColor)
{
float deltaf = (float)delta;
if (progR < 254 || progG < 254 || progB < 254)
if (assetsLoaded)
{
if (!recorded)
float deltaf = (float)delta;
if (progR < 254 || progG < 254 || progB < 254)
{
rR = (Color.White.R - BGColor.R) / 2.5f;
rG = (Color.White.G - BGColor.G) / 2.5f;
rB = (Color.White.B - BGColor.B) / 2.5f;
recorded = true;
if (!recorded)
{
rR = (Color.White.R - BGColor.R) / 3f;
rG = (Color.White.G - BGColor.G) / 3f;
rB = (Color.White.B - BGColor.B) / 3f;
recorded = true;
}
progR += rR * deltaf;
progR = Math.Min(progR, 254);
progG += rG * deltaf;
progG = Math.Min(progG, 254);
progB += rB * deltaf;
progB = Math.Min(progB, 254);
BGColor.R = (byte)progR;
BGColor.G = (byte)progG;
BGColor.B = (byte)progB;
}
progR += rR * deltaf;
progR = Math.Min(progR, 254);
progG += rG * deltaf;
progG = Math.Min(progG, 254);
progB += rB * deltaf;
progB = Math.Min(progB, 254);
BGColor.R = (byte)progR;
BGColor.G = (byte)progG;
BGColor.B = (byte)progB;
}
else if (progC > 0)
{
float rate = deltaf * 255 / 1.5f;
progC -= rate;
progC = Math.Max(progC, 0);
color.R = (byte)progC;
color.G = (byte)progC;
color.B = (byte)progC;
color.A = (byte)progC;
}
else if (assetsLoaded)
{
DoneTransition();
StartExitTransition();
else if (progC > 0)
{
float rate = deltaf * 255 / 1.5f;
progC -= rate;
progC = Math.Max(progC, 0);
color.R = (byte)progC;
color.G = (byte)progC;
color.B = (byte)progC;
color.A = (byte)progC;
}
else
{
DoneTransition();
StartExitTransition();
}
}
base.EnteringTransition(delta, assetsLoaded, ref BGColor);
}