Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 87 additions & 0 deletions Editor/FaceEmoteInstallerEditor.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
using Paltee.AvatarAid.Runtime;

namespace Paltee.AvatarAid.Editor
{
[CustomEditor(typeof(FaceEmoteInstaller))]
public class FaceEmoteInstallerEditor : UnityEditor.Editor
{
private SerializedProperty _transitionSeconds;
private SerializedProperty _idleMotion;
private SerializedProperty _writeDefaultsValues;
private SerializedProperty _isExpressionSetIndexSaved;
private SerializedProperty _primaryHandSide;
private SerializedProperty _defaultDefinitionIndex;
private SerializedProperty _definitions;

private void OnEnable()
{
_transitionSeconds = serializedObject.FindProperty(nameof(FaceEmoteInstaller.TransitionSeconds));
_idleMotion = serializedObject.FindProperty(nameof(FaceEmoteInstaller.IdleMotion));
_writeDefaultsValues = serializedObject.FindProperty(nameof(FaceEmoteInstaller.WriteDefaultsValues));
_isExpressionSetIndexSaved = serializedObject.FindProperty(nameof(FaceEmoteInstaller.IsExpressionSetIndexSaved));
_primaryHandSide = serializedObject.FindProperty(nameof(FaceEmoteInstaller.PrimaryHandSide));
_defaultDefinitionIndex = serializedObject.FindProperty(nameof(FaceEmoteInstaller.DefaultDefinitionIndex));
_definitions = serializedObject.FindProperty(nameof(FaceEmoteInstaller.Definitions));
}

public override void OnInspectorGUI()
{
serializedObject.Update();

EditorGUILayout.PropertyField(_transitionSeconds);
EditorGUILayout.PropertyField(_idleMotion);
EditorGUILayout.PropertyField(_writeDefaultsValues);
EditorGUILayout.PropertyField(_isExpressionSetIndexSaved);
EditorGUILayout.PropertyField(_primaryHandSide);

EditorGUILayout.Space();
DrawDefaultDefinitionPopup();

if (_isExpressionSetIndexSaved.boolValue)
{
EditorGUILayout.HelpBox(
"Is Expression Set Index Saved が有効な場合、Default Expression Set はパラメータが未保存の初回ロード時のみ適用されます。",
MessageType.Info);
}

EditorGUILayout.Space();
EditorGUILayout.PropertyField(_definitions, true);

serializedObject.ApplyModifiedProperties();
}

private void DrawDefaultDefinitionPopup()
{
var options = new List<string> { "(None)" };
for (int i = 0; i < _definitions.arraySize; i++)
{
var nameProp = _definitions.GetArrayElementAtIndex(i).FindPropertyRelative(nameof(ExpressionSetDefinition.Name));
var label = string.IsNullOrWhiteSpace(nameProp.stringValue) ? $"Set {i}" : nameProp.stringValue;
options.Add(label);
}

var currentSelection = _defaultDefinitionIndex.intValue >= 0 && _defaultDefinitionIndex.intValue < _definitions.arraySize
? _defaultDefinitionIndex.intValue + 1
: 0;

var popupLabel = new GUIContent("Default Expression Set", "アバターロード時・パラメータ未同期時に選択される Expression Set です。");
var rect = EditorGUILayout.GetControlRect();

EditorGUI.BeginProperty(rect, popupLabel, _defaultDefinitionIndex);

var contentRect = EditorGUI.PrefixLabel(rect, popupLabel);

EditorGUI.BeginChangeCheck();
var newSelection = EditorGUI.Popup(contentRect, currentSelection, options.ToArray());
if (EditorGUI.EndChangeCheck())
{
_defaultDefinitionIndex.intValue = newSelection - 1;
}

EditorGUI.EndProperty();
}
}
}
11 changes: 11 additions & 0 deletions Editor/FaceEmoteInstallerEditor.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Editor/FaceEmoteProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ protected void ApplyMAParameters(Runtime.FaceEmoteInstaller installer, GameObjec
var conf = new ParameterConfig()
{
nameOrPrefix = ExpressionSetParameterName,
defaultValue = 0,
defaultValue = installer.HasDefaultDefinition ? installer.DefaultDefinitionIndex : 0,
saved = installer.IsExpressionSetIndexSaved,
syncType = ParameterSyncType.Int
};
Expand Down
7 changes: 7 additions & 0 deletions Runtime/FaceEmoteInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,15 @@ public sealed class FaceEmoteInstaller : MonoBehaviour, IEditorOnly
[SerializeField]
public HandSide PrimaryHandSide;

// デフォルトで選択されるDefinitionのインデックス。-1の場合はデフォルト指定なし(0番扱い)。
[SerializeField]
public int DefaultDefinitionIndex = -1;

[SerializeField]
public List<ExpressionSetDefinition> Definitions;

public bool HasDefaultDefinition =>
Definitions != null && DefaultDefinitionIndex >= 0 && DefaultDefinitionIndex < Definitions.Count;
}

[Serializable]
Expand Down
40 changes: 40 additions & 0 deletions Tests/FaceEmoteProcessorTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,46 @@ public void TestProcess_GeneratesMAParameters(bool isExpressionSetIndexSaved)
CollectionAssert.AreEquivalent(expectedParams, parametersComponent.parameters);
}

[Test]
[TestCase(-1, 0)] // デフォルト未指定の場合は0
[TestCase(0, 0)]
[TestCase(1, 1)]
[TestCase(2, 0)] // Definitionsの範囲外の場合は0扱い
public void TestProcess_GeneratesMAParameters_WithDefaultDefinitionIndex(int defaultDefinitionIndex, int expectedDefaultValue)
{
var gameObject = new GameObject("Test Target");
var installerComponent = gameObject.AddComponent<Runtime.FaceEmoteInstaller>();
installerComponent.Definitions = new List<Runtime.ExpressionSetDefinition>
{
new Runtime.ExpressionSetDefinition(),
new Runtime.ExpressionSetDefinition(),
};
installerComponent.DefaultDefinitionIndex = defaultDefinitionIndex;

var context = new BuildContext(gameObject, "Assets/_TestingResources");

// act
var errors = ErrorReport.CaptureErrors(() => new FaceEmoteProcessor().Process(context));

// assert
Assert.Zero(errors.Count); // no error

var parametersComponent = gameObject.GetComponentInChildren<ModularAvatarParameters>();
Assert.NotNull(parametersComponent);

var expectedParams = new ParameterConfig[]
{
new ParameterConfig()
{
nameOrPrefix = "ExpressionSet",
syncType = ParameterSyncType.Int,
saved = false,
defaultValue = expectedDefaultValue,
},
};
CollectionAssert.AreEquivalent(expectedParams, parametersComponent.parameters);
}

[Test]
public void TestProcess_GeneratesMAMenuItem()
{
Expand Down
Loading