feat: [DXDynamicTexture]ファイルパスの表現揺れを許容するように

automatic9045 · Aug 23, 2023 · 068cfbf · 068cfbf
1 parent 822cf2b
commit 068cfbf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Extensions/AtsEx.Extensions.DXDynamicTexture/TextureManager.cs b/Extensions/AtsEx.Extensions.DXDynamicTexture/TextureManager.cs
@@ -23,6 +23,9 @@ public static class TextureManager
 
         internal static Device DXDevice;
 
+        private readonly static List<string> appliedTextureFileNames = new List<string>();
+        public static IReadOnlyList<string> AppliedTextureFileNames => appliedTextureFileNames;
+
         internal static void Initialize()
         {
             if (IsInitialized) throw new InvalidOperationException("DXDynamicTexture has been already initialized.");
@@ -42,12 +45,19 @@ internal static void Initialize()
         private static void FromFilePostfix(ref Texture __result, Device device, string fileName)
 #pragma warning restore IDE1006 // 命名スタイル
         {
-            var normalizedName = fileName.Replace('\\', '/').ToLowerInvariant();
+            var normalizedName = Path.GetFullPath(fileName.ToLowerInvariant());
+            appliedTextureFileNames.Add(normalizedName);
             foreach (var item in Handles)
             {
                 if (normalizedName.EndsWith(item.Key))
                 {
                     __result = Handles[item.Key].GetOrCreate(device);
+                    System.Windows.Forms.MessageBox.Show(item.Key);
+                }
+
+                if (item.Key.EndsWith("ktisdx.png"))
+                {
+                    System.Windows.Forms.MessageBox.Show($"normalizedName: {normalizedName}, item.Key: {item.Key}");
                 }
             }
             DXDevice = device;
@@ -59,7 +69,7 @@ public static TextureHandle Register(string fileNameEnding, int width, int heigh
             if (!IsPowerOfTwo(width)) throw new ArgumentException("Must be a integral power of 2.", nameof(width));
             if (!IsPowerOfTwo(height)) throw new ArgumentException("Must be a integral power of 2.", nameof(height));
 
-            fileNameEnding = fileNameEnding.ToLowerInvariant().Replace('\\', '/');
+            fileNameEnding = Path.GetFullPath(Path.Combine("a:", fileNameEnding.ToLowerInvariant())).Substring(3);
             if (Handles.ContainsKey(fileNameEnding)) return Handles[fileNameEnding];
             var result = new TextureHandle(width, height);
             Handles.Add(fileNameEnding, result);
@@ -109,6 +119,7 @@ internal static void Dispose()
                 if (item.Value != null && item.Value.IsCreated) item.Value.Dispose();
             }
 
+            appliedTextureFileNames.Clear();
             Harmony.UnpatchAll(Harmony.Id);
         }
 

diff --git a/Extensions/AtsEx.Extensions.DXDynamicTexture/TouchManager.cs b/Extensions/AtsEx.Extensions.DXDynamicTexture/TouchManager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -166,7 +167,7 @@ public static TouchTextureHandle Register(string fileNameEnding, int width, int
             if (!TextureManager.IsPowerOfTwo(width)) throw new ArgumentException("Must be a integral power of 2.", nameof(width));
             if (!TextureManager.IsPowerOfTwo(height)) throw new ArgumentException("Must be a integral power of 2.", nameof(height));
 
-            fileNameEnding = fileNameEnding.ToLowerInvariant().Replace('\\', '/');
+            fileNameEnding = Path.GetFullPath(Path.Combine("a:", fileNameEnding.ToLowerInvariant())).Substring(3);
             if (TextureManager.Handles.ContainsKey(fileNameEnding))
                 return (TouchTextureHandle)TextureManager.Handles[fileNameEnding];
             var result = new TouchTextureHandle(width, height);