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

feat: improve material setter inspector (#1035)

Browse Source
This commit is contained in:
nekobako 2024-08-26 10:05:19 +09:00 committed by GitHub
parent a2b9b817ce
commit 46cf066e04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 81 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Editor/Inspector/MaterialSetter/MaterialSetterStyles.uss
View File

@ -28,20 +28,29 @@
.horizontal #f-object { .horizontal #f-object {
flex-grow: 1; flex-grow: 1;
margin-bottom: 1px;
} }
#f-material-index-int { #f-material-index {
display: none; display: none;
} }
#f-material-index-dropdown {
width: 100px;
}
#f-material-index-original {
flex-grow: 1;
}
#f-material { #f-material {
flex-grow: 1; flex-grow: 1;
} }
.horizontal > Label { .horizontal > Label {
align-self: center; align-self: center;
} width: 100px;
height: 19px;
#f-object > * { margin: 1px -2px 1px 3px;
margin-left: 0; -unity-text-align: middle-left;
} }

94
Editor/Inspector/MaterialSetter/MaterialSwitchObjectEditor.cs
View File

@ -26,7 +26,9 @@ namespace nadena.dev.modular_avatar.core.editor.ShapeChanger
uxml.styleSheets.Add(uss); uxml.styleSheets.Add(uss);
uxml.BindProperty(property); uxml.BindProperty(property);
var f_material_index = uxml.Q<DropdownField>("f-material-index"); var f_material_index = uxml.Q<IntegerField>("f-material-index");
var f_material_index_dropdown = uxml.Q<DropdownField>("f-material-index-dropdown");
var f_material_index_original = uxml.Q<ObjectField>("f-material-index-original");
var f_object = uxml.Q<PropertyField>("f-object"); var f_object = uxml.Q<PropertyField>("f-object");
@ -36,78 +38,106 @@ namespace nadena.dev.modular_avatar.core.editor.ShapeChanger
}); });
UpdateMaterialDropdown(); UpdateMaterialDropdown();
// Link dropdown to material index field // Link dropdown and original field to material index field
var f_material_index_int = uxml.Q<IntegerField>("f-material-index-int");
f_material_index_int.RegisterValueChangedCallback(evt =>
{
f_material_index.SetValueWithoutNotify("" + evt.newValue);
});
f_material_index.RegisterValueChangedCallback(evt => f_material_index.RegisterValueChangedCallback(evt =>
{
f_material_index_dropdown.SetValueWithoutNotify(evt.newValue.ToString());
UpdateOriginalMaterial();
});
f_material_index_dropdown.RegisterValueChangedCallback(evt =>
{ {
if (evt.newValue != null && int.TryParse(evt.newValue, out var i)) if (evt.newValue != null && int.TryParse(evt.newValue, out var i))
{ {
f_material_index_int.value = i; f_material_index.value = i;
} }
}); });
f_material_index_original.SetEnabled(false);
return uxml; return uxml;
void UpdateMaterialDropdown() void UpdateMaterialDropdown()
{ {
var targetObject = AvatarObjectReference.Get(property.FindPropertyRelative("Object")); var sharedMaterials = GetSharedMaterials();
Material[] sharedMaterials;
try
{
sharedMaterials = targetObject?.GetComponent<Renderer>()?.sharedMaterials;
}
catch (MissingComponentException e)
{
sharedMaterials = null;
}
if (sharedMaterials != null) if (sharedMaterials != null)
{ {
var matCount = sharedMaterials.Length; var matCount = sharedMaterials.Length;
f_material_index.SetEnabled(true); f_material_index_dropdown.SetEnabled(true);
f_material_index.choices.Clear(); f_material_index_dropdown.choices.Clear();
for (int i = 0; i < matCount; i++) for (int i = 0; i < matCount; i++)
{ {
f_material_index.choices.Add(i.ToString()); f_material_index_dropdown.choices.Add(i.ToString());
} }
f_material_index.formatListItemCallback = idx_s => f_material_index_dropdown.formatListItemCallback = idx_s =>
{ {
if (string.IsNullOrWhiteSpace(idx_s)) return ""; if (string.IsNullOrWhiteSpace(idx_s)) return "";
var idx = int.Parse(idx_s); var idx = int.Parse(idx_s);
if (idx < 0 || idx >= sharedMaterials.Length) if (idx < 0 || idx >= sharedMaterials.Length)
{ {
return idx + ": <???>"; return $"Element {idx_s}: <???>";
} }
else if (sharedMaterials[idx] == null) else if (sharedMaterials[idx] == null)
{ {
return idx + ": <none>"; return $"Element {idx_s}: <None>";
} }
else else
{ {
return idx + ": " + sharedMaterials[idx].name; return $"Element {idx_s}: {sharedMaterials[idx].name}";
} }
}; };
f_material_index.formatSelectedValueCallback = f_material_index.formatListItemCallback; f_material_index_dropdown.formatSelectedValueCallback = idx_s => $"Element {idx_s}";
} }
else else
{ {
f_material_index.SetEnabled(false); f_material_index_dropdown.SetEnabled(false);
if (f_material_index.choices.Count == 0) if (f_material_index_dropdown.choices.Count == 0)
{ {
f_material_index.choices.Add("0"); f_material_index_dropdown.choices.Add("0");
} }
f_material_index.formatListItemCallback = _ => "<Missing Renderer>"; f_material_index_dropdown.formatListItemCallback = idx_s => "<Missing Renderer>";
f_material_index.formatSelectedValueCallback = f_material_index.formatListItemCallback; f_material_index_dropdown.formatSelectedValueCallback = f_material_index_dropdown.formatListItemCallback;
}
UpdateOriginalMaterial();
}
void UpdateOriginalMaterial()
{
var sharedMaterials = GetSharedMaterials();
if (sharedMaterials != null)
{
var idx = f_material_index.value;
if (idx < 0 || idx >= sharedMaterials.Length)
{
f_material_index_original.SetValueWithoutNotify(null);
}
else
{
f_material_index_original.SetValueWithoutNotify(sharedMaterials[idx]);
}
}
else
{
f_material_index_original.SetValueWithoutNotify(null);
}
}
Material[] GetSharedMaterials()
{
var targetObject = AvatarObjectReference.Get(property.FindPropertyRelative("Object"));
try
{
return targetObject?.GetComponent<Renderer>()?.sharedMaterials;
}
catch (MissingComponentException e)
{
return null;
} }
} }
} }

7
Editor/Inspector/MaterialSetter/MaterialSwitchObjectEditor.uxml
View File

@ -2,10 +2,11 @@
<ui:VisualElement class="toggled-object-editor"> <ui:VisualElement class="toggled-object-editor">
<ui:VisualElement class="horizontal"> <ui:VisualElement class="horizontal">
<ed:PropertyField binding-path="Object" label="" name="f-object" class="f-object"/> <ed:PropertyField binding-path="Object" label="" name="f-object" class="f-object"/>
<ui:DropdownField name="f-material-index" binding-path="MaterialIndex"/>
<ui:VisualElement style="display:none">
<ed:IntegerField binding-path="MaterialIndex" name="f-material-index-int"/>
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement class="horizontal">
<ed:IntegerField name="f-material-index" binding-path="MaterialIndex"/>
<ui:DropdownField name="f-material-index-dropdown"/>
<ed:ObjectField name="f-material-index-original"/>
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement class="horizontal"> <ui:VisualElement class="horizontal">
<ui:Label text="reactive_object.material-setter.set-to" class="ndmf-tr"/> <ui:Label text="reactive_object.material-setter.set-to" class="ndmf-tr"/>