AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-24 13:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove comment and change ImmutableArray to ImmutableList.

Browse Source
This commit is contained in:
raiti-chan 2022-12-18 16:44:44 +09:00
parent 79c220a6d3
commit 644979e238
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Packages/nadena.dev.modular-avatar/Editor/ClonedMenuMappings.cs
View File

@ -7,8 +7,8 @@ namespace nadena.dev.modular_avatar.core.editor
{ {
public static class ClonedMenuMappings public static class ClonedMenuMappings
{ {
private static readonly Dictionary<VRCExpressionsMenu, ImmutableArray<VRCExpressionsMenu>> ClonedMappings = private static readonly Dictionary<VRCExpressionsMenu, ImmutableList<VRCExpressionsMenu>> ClonedMappings =
new Dictionary<VRCExpressionsMenu, ImmutableArray<VRCExpressionsMenu>>(); new Dictionary<VRCExpressionsMenu, ImmutableList<VRCExpressionsMenu>>();
private static readonly Dictionary<VRCExpressionsMenu, VRCExpressionsMenu> OriginalMapping = private static readonly Dictionary<VRCExpressionsMenu, VRCExpressionsMenu> OriginalMapping =
new Dictionary<VRCExpressionsMenu, VRCExpressionsMenu>(); new Dictionary<VRCExpressionsMenu, VRCExpressionsMenu>();
@ -21,16 +21,15 @@ namespace nadena.dev.modular_avatar.core.editor
public static void Add(VRCExpressionsMenu original, VRCExpressionsMenu clonedMenu) public static void Add(VRCExpressionsMenu original, VRCExpressionsMenu clonedMenu)
{ {
if (!ClonedMappings.TryGetValue(original, out ImmutableArray<VRCExpressionsMenu> clonedMenus)) if (!ClonedMappings.TryGetValue(original, out ImmutableList<VRCExpressionsMenu> clonedMenus))
{ {
clonedMenus = ImmutableArray<VRCExpressionsMenu>.Empty; clonedMenus = ImmutableList<VRCExpressionsMenu>.Empty;
} }
// Usually, one menu is rarely duplicated in multiple menus, so don't bother using a Builder
ClonedMappings[original] = clonedMenus.Add(clonedMenu); ClonedMappings[original] = clonedMenus.Add(clonedMenu);
OriginalMapping[clonedMenu] = original; OriginalMapping[clonedMenu] = original;
} }
public static bool TryGetClonedMenus(VRCExpressionsMenu original, out ImmutableArray<VRCExpressionsMenu> clonedMenus) public static bool TryGetClonedMenus(VRCExpressionsMenu original, out ImmutableList<VRCExpressionsMenu> clonedMenus)
{ {
return ClonedMappings.TryGetValue(original, out clonedMenus); return ClonedMappings.TryGetValue(original, out clonedMenus);
} }

2
Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs
View File

@ -125,7 +125,7 @@ namespace nadena.dev.modular_avatar.core.editor
IEnumerable<KeyValuePair<string, VRCExpressionsMenu>> childMenus = GetChildMenus(installer.menuToAppend); IEnumerable<KeyValuePair<string, VRCExpressionsMenu>> childMenus = GetChildMenus(installer.menuToAppend);
IEnumerable<VRCExpressionsMenu> parents = Enumerable.Empty<VRCExpressionsMenu>(); IEnumerable<VRCExpressionsMenu> parents = Enumerable.Empty<VRCExpressionsMenu>();
if (installer.installTargetMenu != null && if (installer.installTargetMenu != null &&
ClonedMenuMappings.TryGetClonedMenus(installer.installTargetMenu, out ImmutableArray<VRCExpressionsMenu> parentMenus)) ClonedMenuMappings.TryGetClonedMenus(installer.installTargetMenu, out ImmutableList<VRCExpressionsMenu> parentMenus))
{ {
parents = parentMenus; parents = parentMenus;
} }