AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-02-06 22:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: add "add menu item" button

Browse Source
This commit is contained in:
bd_ 2023-04-04 19:33:19 +09:00
parent 7d97c75ef8
commit 023e8266ec
4 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Packages/nadena.dev.modular-avatar/Editor/Inspector/Menu/MenuPreviewGUI.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using nadena.dev.modular_avatar.core.menu;
using static nadena.dev.modular_avatar.core.editor.Localization;
using UnityEditor;
using UnityEngine;
using VRC.SDK3.Avatars.ScriptableObjects;
@ -168,6 +169,14 @@ namespace nadena.dev.modular_avatar.core.editor
public void PushNode(MenuSource source)
{
var originalSource = source;
if (source is ModularAvatarMenuGroup group)
{
// Avoid calling source.Visit as this results in an extra MenuObjectHeader
// TODO: Avoid this unnecessary header in a cleaner way?
source = new MenuNodesUnder(group.targetObject != null ? group.targetObject : group.gameObject);
}
if (source is ModularAvatarMenuItem item)
{
_gui.PushGuiNode(item, () =>
@ -186,12 +195,24 @@ namespace nadena.dev.modular_avatar.core.editor
}
else
{
using (new MenuObjectHeader(source as UnityEngine.Object).Scope())
using (new MenuObjectHeader(originalSource as UnityEngine.Object).Scope())
{
if (_visited.Contains(source)) return;
_visited.Add(source);
if (_visited.Contains(originalSource)) return;
_visited.Add(originalSource);
source.Visit(this);
if (source is MenuNodesUnder nodesUnder)
{
if (GUILayout.Button(G("menuitem.misc.add_item")))
{
var newChild = new GameObject();
newChild.name = "New item";
newChild.transform.SetParent(nodesUnder.root.transform, false);
newChild.AddComponent<ModularAvatarMenuItem>();
Undo.RegisterCreatedObjectUndo(newChild, "Added menu item");
}
}
}
}
}

3
Packages/nadena.dev.modular-avatar/Editor/Localization/en.json
View File

@ -118,5 +118,6 @@
"menuitem.prop.control_group.tooltip": "Only one toggle in a given group can be selected at the same time",
"menuitem.prop.is_default": "Is Group Default",
"animation_gen.duplicate_binding": "Controls from different control groups are trying to animate the same parameter. Parameter: {0}",
"animation_gen.multiple_defaults": "Multiple default menu items were found in the same control group."
"animation_gen.multiple_defaults": "Multiple default menu items were found in the same control group.",
"menuitem.misc.add_item": "Add menu item"
}

3
Packages/nadena.dev.modular-avatar/Editor/Localization/ja.json
View File

@ -115,5 +115,6 @@
"menuitem.prop.control_group.tooltip": "同じグループ内では、一つのトグルしか起動できません",
"menuitem.prop.is_default": "グループの初期設定にする",
"animation_gen.duplicate_binding": "別々のコントロールグループから、同じパラメーターが操作されています。パラメーター：{0}",
"animation_gen.multiple_defaults": "同じコントロールグループに初期設定に指定されたメニューアイテムが複数あります。"
"animation_gen.multiple_defaults": "同じコントロールグループに初期設定に指定されたメニューアイテムが複数あります。",
"menuitem.misc.add_item": "メニューアイテムを追加"
}

15
Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs
View File

@ -24,8 +24,23 @@ namespace nadena.dev.modular_avatar.core
[FormerlySerializedAs("toggleGroup")] public ControlGroup controlGroup;
public bool isDefault;
protected override void OnValidate()
{
base.OnValidate();
if (Control == null)
{
Control = new VRCExpressionsMenu.Control();
}
}
public override void Visit(NodeContext context)
{
if (Control == null)
{
Control = new VRCExpressionsMenu.Control();
}
var cloned = new VirtualControl(Control);
cloned.subMenu = null;
cloned.name = gameObject.name;