fix wavedash presentation crash in another way

Author: LozenChen

SpeedrunTool/Source/SaveLoad/Implements/DeepClonerUtils.cs

@@ -44,6 +44,7 @@ private static void Config() {
                 || type == typeof(GraphicsDeviceManager)
                 || type == typeof(Monocle.Commands)
                 || type == typeof(BitTag)
+                || type == typeof(Atlas)
 
                 // XNA GraphicsResource
                 || type.IsSubclassOf(typeof(GraphicsResource))
@@ -80,13 +81,6 @@ private static void Config() {
             }
 
             lock (sourceObj) {
-                if (sourceObj is Atlas atlas) {
-                    if (StateManager.Instance.State == State.Saving && Thread.CurrentThread.IsMainThread()) {
-                        GraphicResourcesHandler.Add(atlas);
-                    }
-                    return atlas;
-                }
-
                 if (sourceObj is VirtualAsset virtualAsset) {
                     if (StateManager.Instance.State == State.Loading || !Thread.CurrentThread.IsMainThread()) {
                         // 预克隆的资源需要等待 LoadState 中移除实体之后才能判断是否需要 Reload，必须等待主线程中再操作

SpeedrunTool/Source/SaveLoad/SaveLoadAction.cs

@@ -260,7 +260,7 @@ public static void SaveStaticMemberValues(Dictionary<Type, Dictionary<string, ob
         }
 
         if (!values.TryGetValue(type, out Dictionary<string, object> dict)) {
-            values[type] = dict = new Dictionary<string, object>();
+            values[type] = dict = [];
         }
 
         foreach (string memberName in memberNames) {

SpeedrunTool/Source/SaveLoad/Utils/GraphicResourcesHandler.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Linq;
+using System.IO;
 
 namespace Celeste.Mod.SpeedrunTool.SaveLoad.Utils;
 internal static class GraphicResourcesHandler {
@@ -8,13 +8,9 @@ public static void Add(VirtualAsset asset) {
         VirtualAssetsHandler.Add(asset);
     }
 
-    public static void Add(Atlas atlas) {
-        AtlasHandler.Add(atlas);
-    }
-
     internal static void AddSaveLoadAction() {
-        AtlasHandler.AddAction();
         VirtualAssetsHandler.ReloadVirtualAssets();
+        AtlasHandler.AddAction();
     }
 
     private static class MemoryLeakHandler {
@@ -36,14 +32,14 @@ private static void Handle() {
 
     private static class VirtualAssetsHandler {
 
-        private static readonly List<VirtualAsset> VirtualAssets = new(); // added and cleared when loading, so no need to be individual
+        private static readonly List<VirtualAsset> VirtualAssets = []; // added and cleared when loading, so no need to be individual
 
         internal static void Add(VirtualAsset asset) {
             VirtualAssets.Add(asset);
         }
         internal static void ReloadVirtualAssets() {
             SaveLoadAction.InternalSafeAdd(
-                loadState: (_, _) => {
+                loadState: static (_, _) => {
                     List<VirtualAsset> list = new List<VirtualAsset>(VirtualAssets);
                     // if load too frequently and switching between different slots, then collection might be modified? idk
                     // so we avoid the crash in this way
@@ -65,12 +61,8 @@ internal static void ReloadVirtualAssets() {
 
                     VirtualAssets.Clear();
                 },
-                clearState: () => {
-                    VirtualAssets.Clear();
-                },
-                preCloneEntities: () => {
-                    VirtualAssets.Clear();
-                }
+                clearState: VirtualAssets.Clear,
+                preCloneEntities: VirtualAssets.Clear
             );
         }
     }
@@ -79,254 +71,18 @@ private static class AtlasHandler {
 
         // This Fixes: WaveDashPresentation 中存档, 结束, 再读档, 会崩溃
 
-        /* 每个存档带有信息: 它存档时持有的 atlas, 以及截止到存档时所有在它的历史上本应释放但没释放的 atlas
-         * 外加 CurrentGame 带有: 它所对应的那个存档的全部信息, 外加读档后新增加的本应释放的 atlas
-         *
-         * 每次清除存档时, 尝试释放这个存档持有的且在其他某个存档/CurrentGame 上本应释放的 atlas
-         * 每次读档时, 将 CurrentGame 的历史回退到读取的档上
-         * 每次存档时, 将 CurrentGame 的历史存入, 持有 atlas
-         * 每次 Dispose 但被阻碍时, 存入 CurrentGame
-         */
-
-        private static Holder CurrentSlot => new Holder(SaveSlotsManager.SlotName, isSlot: true);
-
-        private static readonly Holder CurrentGame = new Holder($"SpeedrunTool/{nameof(AtlasHandler)}/CurrentGame", isSlot: false);
-
-        [Load]
-        private static void Load() {
-            On.Monocle.Atlas.Dispose += Atlas_Dispose;
-        }
-
-        [Unload]
-        private static void Unload() {
-            On.Monocle.Atlas.Dispose -= Atlas_Dispose;
-        }
-
-        private static void Atlas_Dispose(On.Monocle.Atlas.orig_Dispose orig, Atlas self) {
-            bool b = false;
-            if (BipartiteGraph.HasDisposeBarrier(self)) {
-                BipartiteGraph.AddDisposeEdge(self, CurrentGame);
-                b = BipartiteGraph.HasDisposeBarrier(self); // check again. since CurrentGame can be the only barrier
-            }
-            if (b) {
-                Logger.Info($"SpeedrunTool/{nameof(AtlasHandler)}", $"{self.DataPath} was to be disposed but stopped by us.");
-            }
-            else {
-                Logger.Info($"SpeedrunTool/{nameof(AtlasHandler)}", $"Dispose {self.DataPath}");
-                orig(self);
-            }
-        }
-
-        internal static void SafeDispose(Atlas atlas) {
-            // not safe. Just make it easier to debug
-            atlas?.Dispose();
-        }
-
-        internal static void Add(Atlas atlas) {
-            BipartiteGraph.AddHoldEdge(atlas, CurrentSlot);
-        }
-
         internal static void AddAction() {
             SaveLoadAction.InternalSafeAdd(
-                saveState: (_, _) => {
-                    BipartiteGraph.AddTo(CurrentGame, CurrentSlot);
-                },
-                loadState: (_, _) => {
-                    BipartiteGraph.Clone(CurrentSlot, CurrentGame);
-                },
-                clearState: () => {
-                    BipartiteGraph.ClearAndDispose(CurrentSlot);
-                }
-            );
-        }
-
-        private static void DebugLog() {
-            BipartiteGraph.Log();
-        }
-
-
-        internal static class BipartiteGraph {
-            internal enum State { Hold, Dispose } // Hold: don't dispose; Dispose: wanna dispose but failed to
-
-            private static readonly HashSet<Atlas> VerticesAtlas = new HashSet<Atlas>();
-
-            private static readonly HashSet<Holder> VerticesHolder = new HashSet<Holder>();
-
-            private static readonly Dictionary<Atlas, HashSet<Holder>> Atlas2Hold = new(); // only contains Hold edges
-
-            private static readonly Dictionary<Atlas, HashSet<Holder>> Atlas2Dispose = new(); // only contains Dispose edges
-
-            private static readonly Dictionary<Holder, HashSet<Atlas>> Hold2Atlas = new(); // only contains Hold edges
-
-            private static readonly Dictionary<Holder, HashSet<Atlas>> Dispose2Atlas = new(); // only contains Dispose edges
-
-            private static void SafeAdd<TKey, TValue>(Dictionary<TKey, HashSet<TValue>> dict, TKey key, TValue value) {
-                if (dict.TryGetValue(key, out HashSet<TValue> list)) {
-                    list.Add(value);
-                }
-                else {
-                    dict[key] = [value];
-                }
-            }
-
-            private static bool SafeRemove<TKey, TValue>(Dictionary<TKey, HashSet<TValue>> dict, TKey key, TValue value) {
-                bool b = false;
-                if (dict.TryGetValue(key, out HashSet<TValue> list)) {
-                    b = list.Remove(value);
-                    if (list.IsNullOrEmpty()) {
-                        dict.Remove(key);
-                    }
-                }
-                return b;
-            }
-
-            private static void SafeAdd<TKey, TValue>(Dictionary<TKey, HashSet<TValue>> dict1, Dictionary<TValue, HashSet<TKey>> dict2, TKey key, TValue value) {
-                SafeAdd(dict1, key, value);
-                SafeAdd(dict2, value, key);
-            }
-
-            private static bool SafeRemove<TKey, TValue>(Dictionary<TKey, HashSet<TValue>> dict1, Dictionary<TValue, HashSet<TKey>> dict2, TKey key, TValue value) {
-                bool b1 = SafeRemove(dict1, key, value);
-                bool b2 = SafeRemove(dict2, value, key);
-                return b1 || b2;
-            }
-
-            private static bool SafeRemove<TKey, TValue>(Dictionary<TKey, HashSet<TValue>> dict1, Dictionary<TValue, HashSet<TKey>> dict2, TKey key) {
-                if (dict1.TryGetValue(key, out HashSet<TValue> list)) {
-                    foreach (TValue value in list) {
-                        SafeRemove(dict2, value, key);
-                    }
-                    dict1.Remove(key);
-                    return true;
-                }
-                return false;
-            }
-
-            internal static void AddHoldEdge(Atlas atlas, Holder holder) {
-                VerticesAtlas.Add(atlas);
-                VerticesHolder.Add(holder);
-                SafeAdd(Atlas2Hold, Hold2Atlas, atlas, holder);
-                SafeRemove(Atlas2Dispose, Dispose2Atlas, atlas, holder);
-            }
-
-            internal static void AddDisposeEdge(Atlas atlas, Holder holder) {
-                VerticesAtlas.Add(atlas);
-                VerticesHolder.Add(holder);
-                SafeRemove(Atlas2Hold, Hold2Atlas, atlas, holder);
-                SafeAdd(Atlas2Dispose, Dispose2Atlas, atlas, holder);
-            }
-
-            internal static void Clear(Atlas atlas) {
-                VerticesAtlas.Remove(atlas);
-                SafeRemove(Atlas2Hold, Hold2Atlas, atlas);
-                SafeRemove(Atlas2Dispose, Dispose2Atlas, atlas);
-            }
-
-            internal static void Clear(Holder holder) {
-                VerticesHolder.Remove(holder);
-                SafeRemove(Hold2Atlas, Atlas2Hold, holder);
-                SafeRemove(Dispose2Atlas, Atlas2Dispose, holder);
-            }
-
-            internal static void ClearAndDispose(Holder holder) {
-                VerticesHolder.Remove(holder);
-                SafeRemove(Hold2Atlas, Atlas2Hold, holder);
-                HashSet<Atlas> unholding = [.. VerticesAtlas.Where(x => !Atlas2Hold.ContainsKey(x))];
-                foreach (Atlas atlas in unholding.Where(Atlas2Dispose.ContainsKey)) {
-                    SafeDispose(atlas);
-                }
-                foreach (Atlas atlas2 in unholding) {
-                    Clear(atlas2);
-                }
-                SafeRemove(Dispose2Atlas, Atlas2Dispose, holder);
-                HashSet<Holder> holders = [.. VerticesHolder.Where(x => !Hold2Atlas.ContainsKey(x) && !Dispose2Atlas.ContainsKey(x))];
-                foreach (Holder holder2 in holders) {
-                    Clear(holder2);
-                }
-            }
-
-            internal static void Clone(Holder from, Holder to) {
-                ClearAndDispose(to);
-                if (Dispose2Atlas.TryGetValue(from, out HashSet<Atlas> list2)) {
-                    foreach (Atlas atlas in list2) {
-                        AddDisposeEdge(atlas, to);
-                    }
-                }
-                if (Hold2Atlas.TryGetValue(from, out HashSet<Atlas> list1)) {
-                    foreach (Atlas atlas in list1) {
-                        AddHoldEdge(atlas, to);
-                    }
-                }
-            }
-
-            internal static void AddTo(Holder from, Holder to) {
-                if (Dispose2Atlas.TryGetValue(from, out HashSet<Atlas> list2)) {
-                    foreach (Atlas atlas in list2) {
-                        AddDisposeEdge(atlas, to);
-                    }
-                }
-                if (Hold2Atlas.TryGetValue(from, out HashSet<Atlas> list1)) {
-                    foreach (Atlas atlas in list1) {
-                        AddHoldEdge(atlas, to);
-                    }
-                }
-            }
-
-
-            internal static bool HasDisposeBarrier(Atlas atlas) {
-                return Atlas2Hold.ContainsKey(atlas);
-            }
-
-            internal static void Log() {
-#if DEBUG
-                System.Text.StringBuilder sb = new();
-                sb.Append("BipartiteGraph Structure:");
-                foreach (Atlas atlas in VerticesAtlas) {
-                    sb.Append($"\n{atlas.DataPath}");
-                    if (Atlas2Hold.TryGetValue(atlas, out HashSet<Holder> list1)) {
-                        sb.Append($" | hold by -> ");
-                        foreach (Holder holder in list1) {
-                            sb.Append($" {holder.Name}, ");
-                        }
-                    }
-                    if (Atlas2Dispose.TryGetValue(atlas, out HashSet<Holder> list2)) {
-                        sb.Append($" | dispose by -> ");
-                        foreach (Holder holder in list2) {
-                            sb.Append($" {holder.Name}, ");
-                        }
-                    }
-                }
-                sb.Append('\n');
-                foreach (Holder holder in VerticesHolder) {
-                    sb.Append($"\n{holder.Name}");
-                    if (Hold2Atlas.TryGetValue(holder, out HashSet<Atlas> list1)) {
-                        sb.Append($" | hold -> ");
-                        foreach (Atlas atlas in list1) {
-                            sb.Append($" {atlas.DataPath}, ");
-                        }
-                    }
-                    if (Dispose2Atlas.TryGetValue(holder, out HashSet<Atlas> list2)) {
-                        sb.Append($" | dispose -> ");
-                        foreach (Atlas atlas in list2) {
-                            sb.Append($" {atlas.DataPath}, ");
+                loadState: static (_, level) => {
+                    if (level.Tracker.GetEntitiesTrackIfNeeded<WaveDashPresentation>() is { } list && list.IsNotNullOrEmpty()) {
+                        foreach (WaveDashPresentation presentation in list) {
+                            presentation.Gfx?.Dispose();
+                            presentation.Gfx = Atlas.FromAtlas(Path.Combine("Graphics", "Atlases", "WaveDashing"), Atlas.AtlasDataFormat.Packer);
+                            presentation.loading = false;
                         }
                     }
                 }
-                Logger.Debug($"SpeedrunTool/{nameof(Holder)}", sb.ToString());
-#endif
-            }
-        }
-
-        internal struct Holder(string name, bool isSlot) {
-            public enum HolderType { Slot, CurrentRunningGame }
-
-            public string Name = name;
-
-            public HolderType Type = isSlot ? HolderType.Slot : HolderType.CurrentRunningGame;
-
-            public override readonly string ToString() {
-                return $"{nameof(Holder)}[{(Type == HolderType.Slot ? Name : "CurrentGame")}]";
-            }
+            );
         }
     }
 }