From 3cddbb0ad8db1efd40ac4e47c614e6cb8fd5d47e Mon Sep 17 00:00:00 2001 From: raiti-chan Date: Sun, 18 Dec 2022 17:01:46 +0900 Subject: [PATCH] rename *Mapping To *Traverse --- .../Editor/Inspector/AvMenuTreeView.cs | 4 +- .../Editor/MenuInstallHook.cs | 4 +- .../Editor/MenuTree.cs | 54 +++++++++---------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs index add6aabd..5f73a280 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/AvMenuTreeView.cs @@ -127,11 +127,11 @@ namespace nadena.dev.modular_avatar.core.editor _visitedMenuStack.Clear(); _menuTree = new MenuTree(Avatar); - _menuTree.AvatarsMenuMapping(); + _menuTree.TraverseAvatarMenu(); foreach (ModularAvatarMenuInstaller installer in Avatar.gameObject.GetComponentsInChildren(true)) { if (installer == TargetInstaller) continue; - _menuTree.MappingMenuInstaller(installer); + _menuTree.TraverseMenuInstaller(installer); } var root = new TreeViewItem(-1, -1, ""); diff --git a/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs b/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs index a23e8f4e..c469fd2e 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MenuInstallHook.cs @@ -47,13 +47,13 @@ namespace nadena.dev.modular_avatar.core.editor _rootMenu = avatar.expressionsMenu; _menuTree = new MenuTree(avatar); - _menuTree.AvatarsMenuMapping(); + _menuTree.TraverseAvatarMenu(); avatar.expressionsMenu = CloneMenu(avatar.expressionsMenu); foreach (ModularAvatarMenuInstaller installer in menuInstallers) { - _menuTree.MappingMenuInstaller(installer); + _menuTree.TraverseMenuInstaller(installer); } foreach (MenuTree.ChildElement childElement in _menuTree.GetChildInstallers(null)) diff --git a/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs b/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs index 9a5be2fd..9074496d 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs @@ -32,35 +32,35 @@ namespace nadena.dev.modular_avatar.core.editor public MenuTree(VRCAvatarDescriptor descriptor) { - this._rootMenu = descriptor.expressionsMenu; - this._included = new HashSet(); - this._menuChildrenMap = new Dictionary(); + _rootMenu = descriptor.expressionsMenu; + _included = new HashSet(); + _menuChildrenMap = new Dictionary(); - if (this._rootMenu == null) + if (_rootMenu == null) { - this._rootMenu = ScriptableObject.CreateInstance(); + _rootMenu = ScriptableObject.CreateInstance(); } - this._included.Add(this._rootMenu); + _included.Add(_rootMenu); } - public void AvatarsMenuMapping() + public void TraverseAvatarMenu() { - if (this._rootMenu == null) return; - this.MappingMenu(this._rootMenu); + if (_rootMenu == null) return; + TraverseMenu(_rootMenu); } - public void MappingMenuInstaller(ModularAvatarMenuInstaller installer) + public void TraverseMenuInstaller(ModularAvatarMenuInstaller installer) { if (!installer.enabled) return; if (installer.menuToAppend == null) return; - this.MappingMenu(installer); + TraverseMenu(installer); } public ImmutableArray GetChildren(VRCExpressionsMenu parent) { - if (parent == null) parent = this._rootMenu; - if (!this._menuChildrenMap.TryGetValue(parent, out ImmutableBuilder immutableBuilder)) return ImmutableArray.Empty; + if (parent == null) parent = _rootMenu; + if (!_menuChildrenMap.TryGetValue(parent, out ImmutableBuilder immutableBuilder)) return ImmutableArray.Empty; if (immutableBuilder.immutableArray == ImmutableArray.Empty) { immutableBuilder.immutableArray = immutableBuilder.builder.ToImmutable(); @@ -75,7 +75,7 @@ namespace nadena.dev.modular_avatar.core.editor if (parentInstaller != null && parentInstaller.menuToAppend == null) yield break; if (parentInstaller == null) { - queue.Enqueue(this._rootMenu); + queue.Enqueue(_rootMenu); } else { @@ -92,7 +92,7 @@ namespace nadena.dev.modular_avatar.core.editor if (visitedMenus.Contains(parentMenu)) continue; visitedMenus.Add(parentMenu); HashSet returnedInstallers = new HashSet(); - foreach (ChildElement childElement in this.GetChildren(parentMenu)) + foreach (ChildElement childElement in GetChildren(parentMenu)) { if (!childElement.isInstallerRoot) { @@ -108,11 +108,11 @@ namespace nadena.dev.modular_avatar.core.editor } - private void MappingMenu(VRCExpressionsMenu root) + private void TraverseMenu(VRCExpressionsMenu root) { foreach (KeyValuePair childMenu in GetChildMenus(root)) { - this.MappingMenu(root, new ChildElement + TraverseMenu(root, new ChildElement { menuName = childMenu.Key, menu = childMenu.Value @@ -120,7 +120,7 @@ namespace nadena.dev.modular_avatar.core.editor } } - private void MappingMenu(ModularAvatarMenuInstaller installer) + private void TraverseMenu(ModularAvatarMenuInstaller installer) { IEnumerable> childMenus = GetChildMenus(installer.menuToAppend); IEnumerable parents = Enumerable.Empty(); @@ -144,7 +144,7 @@ namespace nadena.dev.modular_avatar.core.editor }; foreach (VRCExpressionsMenu parentMenu in parentsMenus) { - this.MappingMenu(parentMenu, childElement); + TraverseMenu(parentMenu, childElement); } } @@ -152,7 +152,7 @@ namespace nadena.dev.modular_avatar.core.editor { foreach (VRCExpressionsMenu parentMenu in parentsMenus) { - this.MappingMenu(parentMenu, new ChildElement + TraverseMenu(parentMenu, new ChildElement { installer = installer, isInstallerRoot = true @@ -161,28 +161,28 @@ namespace nadena.dev.modular_avatar.core.editor } } - private void MappingMenu(VRCExpressionsMenu parent, ChildElement childElement) + private void TraverseMenu(VRCExpressionsMenu parent, ChildElement childElement) { - if (parent == null) parent = this._rootMenu; + if (parent == null) parent = _rootMenu; childElement.parent = parent; - if (!this._menuChildrenMap.TryGetValue(parent, out ImmutableBuilder children)) + if (!_menuChildrenMap.TryGetValue(parent, out ImmutableBuilder children)) { children = new ImmutableBuilder { builder = ImmutableArray.CreateBuilder(), immutableArray = ImmutableArray.Empty }; - this._menuChildrenMap[parent] = children; + _menuChildrenMap[parent] = children; } children.builder.Add(childElement); children.immutableArray = ImmutableArray.Empty; if (childElement.menu == null) return; - if (this._included.Contains(childElement.menu)) return; - this._included.Add(childElement.menu); + if (_included.Contains(childElement.menu)) return; + _included.Add(childElement.menu); foreach (KeyValuePair childMenu in GetChildMenus(childElement.menu)) { - this.MappingMenu(childElement.menu, new ChildElement + TraverseMenu(childElement.menu, new ChildElement { menuName = childMenu.Key, menu = childMenu.Value,