Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove mods path from key

Browse Source
This commit is contained in:
JohnCorby 2023-04-24 19:11:00 -07:00
parent 0433495dd4
commit b19478d7e7
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NewHorizons/Utility/Files/ImageUtilities.cs
View File

@ -33,10 +33,11 @@ namespace NewHorizons.Utility.Files
{ {
// Copied from OWML but without the print statement lol // Copied from OWML but without the print statement lol
var path = Path.Combine(mod.ModHelper.Manifest.ModFolderPath, filename); var path = Path.Combine(mod.ModHelper.Manifest.ModFolderPath, filename);
if (_loadedTextures.ContainsKey(path)) var key = path.Substring(0, Main.Instance.ModHelper.OwmlConfig.ModsPath.Length);
if (_loadedTextures.TryGetValue(key, out var existingTexture))
{ {
NHLogger.LogVerbose($"Already loaded image at path: {path}"); NHLogger.LogVerbose($"Already loaded image at path: {path}");
return _loadedTextures[path]; return existingTexture;
} }
NHLogger.LogVerbose($"Loading image at path: {path}"); NHLogger.LogVerbose($"Loading image at path: {path}");
@ -44,10 +45,10 @@ namespace NewHorizons.Utility.Files
{ {
var data = File.ReadAllBytes(path); var data = File.ReadAllBytes(path);
var texture = new Texture2D(2, 2, TextureFormat.RGBA32, useMipmaps, linear); var texture = new Texture2D(2, 2, TextureFormat.RGBA32, useMipmaps, linear);
texture.name = path; texture.name = key;
texture.wrapMode = wrap ? TextureWrapMode.Repeat : TextureWrapMode.Clamp; texture.wrapMode = wrap ? TextureWrapMode.Repeat : TextureWrapMode.Clamp;
texture.LoadImage(data); texture.LoadImage(data);
_loadedTextures.Add(path, texture); _loadedTextures.Add(key, texture);
return texture; return texture;
} }
@ -432,13 +433,13 @@ namespace NewHorizons.Utility.Files
IEnumerator DownloadTexture(string url, int index) IEnumerator DownloadTexture(string url, int index)
{ {
var key = url.Substring(0, Main.Instance.ModHelper.OwmlConfig.ModsPath.Length);
lock (_loadedTextures) lock (_loadedTextures)
{ {
if (_loadedTextures.ContainsKey(url)) if (_loadedTextures.TryGetValue(key, out var existingTexture))
{ {
NHLogger.LogVerbose($"Already loaded image {index}:{url}"); NHLogger.LogVerbose($"Already loaded image {index}:{url}");
var texture = _loadedTextures[url]; imageLoadedEvent?.Invoke(existingTexture, index);
imageLoadedEvent?.Invoke(texture, index);
yield break; yield break;
} }
} }
@ -456,7 +457,7 @@ namespace NewHorizons.Utility.Files
else else
{ {
var texture = new Texture2D(2, 2, TextureFormat.RGBA32, false); var texture = new Texture2D(2, 2, TextureFormat.RGBA32, false);
texture.name = url; texture.name = key;
texture.wrapMode = TextureWrapMode.Clamp; texture.wrapMode = TextureWrapMode.Clamp;
var handler = (DownloadHandlerTexture)uwr.downloadHandler; var handler = (DownloadHandlerTexture)uwr.downloadHandler;
@ -464,15 +465,15 @@ namespace NewHorizons.Utility.Files
lock (_loadedTextures) lock (_loadedTextures)
{ {
if (_loadedTextures.ContainsKey(url)) if (_loadedTextures.TryGetValue(key, out var existingTexture))
{ {
NHLogger.LogVerbose($"Already loaded image {index}:{url}"); NHLogger.LogVerbose($"Already loaded image {index}:{url}");
Destroy(texture); Destroy(texture);
texture = _loadedTextures[url]; texture = existingTexture;
} }
else else
{ {
_loadedTextures.Add(url, texture); _loadedTextures.Add(key, texture);
} }
imageLoadedEvent?.Invoke(texture, index); imageLoadedEvent?.Invoke(texture, index);