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

fix: incorrect handling of isDefault toggles for implicit parameters in UI (#1085)

Browse Source 
Closes: #1079
This commit is contained in:
bd_ 2024-09-02 17:54:36 -07:00 committed by GitHub
parent 1aa6c03202
commit 371809f430
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Editor/Inspector/Menu/MenuItemGUI.cs
View File

@ -448,6 +448,10 @@ namespace nadena.dev.modular_avatar.core.editor
var knownParamDefault = knownParameter?.DefaultValue; var knownParamDefault = knownParameter?.DefaultValue;
var isDefaultByKnownParam = var isDefaultByKnownParam =
knownParamDefault != null ? _value.floatValue == knownParamDefault : (bool?)null; knownParamDefault != null ? _value.floatValue == knownParamDefault : (bool?)null;
if (knownParameter != null && knownParameter.Source is ModularAvatarMenuItem otherMenuItem)
isDefaultByKnownParam = null;
Object controller = knownParameter?.Source; Object controller = knownParameter?.Source;
var controllerIsElsewhere = controller != null && !(controller is ModularAvatarMenuItem); var controllerIsElsewhere = controller != null && !(controller is ModularAvatarMenuItem);
// If we can't figure out what to reference the parameter names to, disable the UI // If we can't figure out what to reference the parameter names to, disable the UI
@ -462,10 +466,16 @@ namespace nadena.dev.modular_avatar.core.editor
var anyIsDefault = _prop_isDefault.hasMultipleDifferentValues || _prop_isDefault.boolValue; var anyIsDefault = _prop_isDefault.hasMultipleDifferentValues || _prop_isDefault.boolValue;
var multipleSelections = _obj.targetObjects.Length > 1; var multipleSelections = _obj.targetObjects.Length > 1;
var mixedIsDefault = multipleSelections && anyIsDefault; var mixedIsDefault = multipleSelections && anyIsDefault;
using (new EditorGUI.DisabledScope(multipleSelections)) using (new EditorGUI.DisabledScope(multipleSelections || isDefaultByKnownParam != null))
{ {
EditorGUI.BeginChangeCheck();
DrawHorizontalToggleProp(_prop_isDefault, G("menuitem.prop.is_default"), mixedIsDefault, DrawHorizontalToggleProp(_prop_isDefault, G("menuitem.prop.is_default"), mixedIsDefault,
multipleSelections ? false : isDefaultByKnownParam); multipleSelections ? false : isDefaultByKnownParam);
if (EditorGUI.EndChangeCheck())
{
_obj.ApplyModifiedProperties();
ClearConflictingDefaults(_obj);
}
} }
GUILayout.FlexibleSpace(); GUILayout.FlexibleSpace();
@ -514,6 +524,42 @@ namespace nadena.dev.modular_avatar.core.editor
EditorGUILayout.EndHorizontal(); EditorGUILayout.EndHorizontal();
} }
private void ClearConflictingDefaults(SerializedObject serializedObject)
{
if (serializedObject.isEditingMultipleObjects) return;
var menuItem = serializedObject.targetObject as ModularAvatarMenuItem;
if (menuItem == null) return;
var parameterName = menuItem.Control.parameter.name;
if (string.IsNullOrEmpty(parameterName)) return;
var myMappings = ParameterInfo.ForUI.GetParameterRemappingsAt(menuItem.gameObject);
if (myMappings.TryGetValue((ParameterNamespace.Animator, parameterName), out var replacement))
parameterName = replacement.ParameterName;
var avatarRoot = RuntimeUtil.FindAvatarInParents(menuItem.gameObject.transform);
foreach (var mami in avatarRoot.GetComponentsInChildren<ModularAvatarMenuItem>(true))
{
if (mami == menuItem) continue;
var paramMappings = ParameterInfo.ForUI.GetParameterRemappingsAt(mami.gameObject);
var effectiveParam = parameterName;
if (paramMappings.TryGetValue((ParameterNamespace.Animator, parameterName), out replacement))
effectiveParam = replacement.ParameterName;
if (effectiveParam != parameterName) continue;
if (mami.isDefault)
{
Undo.RecordObject(mami, "");
mami.isDefault = false;
EditorUtility.SetDirty(mami);
PrefabUtility.RecordPrefabInstancePropertyModifications(mami);
}
}
}
private void EnsureLabelCount(int i) private void EnsureLabelCount(int i)
{ {
if (_labels == null || _labelsRoot.arraySize < i || _labels.Length < i) if (_labels == null || _labelsRoot.arraySize < i || _labels.Length < i)