Fix blackscreen on picture background / video background switching

aRandomKiwi · Jul 7, 2021 · 47d4c61 · 47d4c61
1 parent 848d3a0
commit 47d4c61
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 Source/1.3/.vs/RimTheme/v15/.suo
 Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-wal
 Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-shm
-Source/1.3/.vs/RimTheme/v15/.suo
-Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-shm
-Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-wal
+Source/1.1-1.2/.vs/RimTheme/v15/.suo
+Source/1.1-1.2/.vs/RimTheme/v15/Server/sqlite3/storage.ide-wal
+Source/1.1-1.2/.vs/RimTheme/v15/Server/sqlite3/storage.ide-shm
+
diff --git a/1.3/Assemblies/RimThemes.dll b/1.3/Assemblies/RimThemes.dll
diff --git a/Source/1.3/.vs/RimTheme/v15/.suo b/Source/1.3/.vs/RimTheme/v15/.suo
diff --git a/Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide b/Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide
diff --git a/Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-shm b/Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-shm
diff --git a/Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-wal b/Source/1.3/.vs/RimTheme/v15/Server/sqlite3/storage.ide-wal
diff --git a/Source/1.3/Harmony/SaveLoad_Patchs.cs b/Source/1.3/Harmony/SaveLoad_Patchs.cs
@@ -191,6 +191,8 @@ public class GameFinalizeInitPatch
     {
         public static void Prefix()
         {
+            Utils.CurrentMainAnimatedBgPlaying = false;
+            Utils.CurrentMainAnimatedBgSourceSet = false;
             LoaderGM.curStep = LoaderSteps.FinalizeLoad;
         }
     }

diff --git a/Source/1.3/Harmony/UI_BackgroundMain_Patch.cs b/Source/1.3/Harmony/UI_BackgroundMain_Patch.cs
@@ -48,7 +48,9 @@ static bool Prefix()
                     return true;
 
                 //If the animated background is available and loaded, we start reading it!
-                if (Current.ProgramState == ProgramState.Entry && Themes.DBAnimatedBackground.ContainsKey(curTheme) && !Settings.disableVideoBg)
+                bool animatedBgOK = Current.ProgramState == ProgramState.Entry && Themes.DBAnimatedBackground.ContainsKey(curTheme) && !Settings.disableVideoBg;
+                bool animatedBgOKException = false;
+                if (animatedBgOK)
                 {
                     Rect pos;
                     if ((double)Screen.width <= (double)Screen.height * ((double)MainBackgroundSize.x / (double)MainBackgroundSize.y))
@@ -74,6 +76,7 @@ static bool Prefix()
                             Utils.CurrentMainAnimatedBg.enabled = true;
                         }
 
+
                         if (!Utils.CurrentMainAnimatedBgSourceSet)
                         {
                             Utils.CurrentMainAnimatedBg.renderMode = VideoRenderMode.RenderTexture;
@@ -89,7 +92,7 @@ static bool Prefix()
                             Utils.CurrentMainAnimatedBgSourceSet = true;
                             Utils.CurrentMainAnimatedBg.errorReceived += delegate (VideoPlayer source, string message)
                             {
-                                Themes.LogMsg("VideoPlayer_Error : " + message+ " ");
+                                Themes.LogMsg("VideoPlayer_Error : " + message + " ");
                             };
                             Utils.CurrentMainAnimatedBg.time = 0;
                             Utils.CurrentMainAnimatedBg.Prepare();
@@ -101,18 +104,17 @@ static bool Prefix()
                             Utils.CurrentMainAnimatedBg.Play();
                             Utils.CurrentMainAnimatedBgPlaying = true;
                         }
-                        else
-                        {
-                            //To wait RimWorld original background display
-                            return true;
-                        }
+
+                        //To wait show the picture background
+                        animatedBgOKException = true;
                     }
                     else
                     {
                         GUI.DrawTexture(pos, Utils.CurrentMainAnimatedBg.texture, ScaleMode.ScaleToFit);
                     }
                 }
-                else
+
+                if(!animatedBgOK || animatedBgOKException)
                 {
                     bool flag = true;
 

diff --git a/Source/1.3/obj/Debug/RimThemes.csproj.FileListAbsolute.txt b/Source/1.3/obj/Debug/RimThemes.csproj.FileListAbsolute.txt
@@ -17,4 +17,3 @@ C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RimThemes\1.3\Assemb
 C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RimThemes\Source\1.3\obj\Debug\RimThemes.csproj.CoreCompileInputs.cache
 C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RimThemes\Source\1.3\obj\Debug\RimThemes.csproj.CopyComplete
 C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RimThemes\Source\1.3\obj\Debug\RimThemes.dll
-C:\Program Files (x86)\Steam\steamapps\common\RimWorld\mods\RimThemes\Source\1.3\obj\Debug\RimThemes.csprojAssemblyReference.cache
diff --git a/Source/1.3/obj/Debug/RimThemes.csprojAssemblyReference.cache b/Source/1.3/obj/Debug/RimThemes.csprojAssemblyReference.cache
diff --git a/Source/1.3/obj/Debug/RimThemes.dll b/Source/1.3/obj/Debug/RimThemes.dll