From 00ca68662c9931e3ef49338b711243ffb7faa3b8 Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Thu, 1 Nov 2018 00:15:29 -0500
Subject: [PATCH] loading screen now loads before transition (before was
 transition while loading, wait to finish, then continue)

---
 .../Zer01HD/Utilities/UI/LoadingScreen.cs     | 66 ++++++++++---------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs b/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs
index ade5e82..7a86710 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs
+++ b/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs
@@ -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);
         }