ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-29 20:03:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change resolving to possibly work correctly for all materials and load specific materials for each collection.

Browse source
This commit is contained in:
Ottermandias 2022-03-24 22:01:39 +01:00
parent b6ed27e235
commit 1e5776a481
16 changed files with 408 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Penumbra/Interop/Resolver/PathResolver.Data.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using Dalamud.Hooking;
@ -92,7 +93,7 @@ public unsafe partial class PathResolver
internal readonly Dictionary< IntPtr, (ModCollection, int) > DrawObjectToObject = new();
// This map links files to their corresponding collection, if it is non-default.
internal readonly Dictionary< Utf8String, ModCollection > PathCollections = new();
internal readonly ConcurrentDictionary< Utf8String, ModCollection > PathCollections = new();
internal GameObject* LastGameObject = null;
@ -225,13 +226,9 @@ public unsafe partial class PathResolver
// Special handling for paths so that we do not store non-owned temporary strings in the dictionary.
private void SetCollection( Utf8String path, ModCollection? collection )
private void SetCollection( Utf8String path, ModCollection collection )
{
if( collection == null )
{
PathCollections.Remove( path );
}
else if( PathCollections.ContainsKey( path ) || path.IsOwned )
if( PathCollections.ContainsKey( path ) || path.IsOwned )
{
PathCollections[ path ] = collection;
}