Skip to content

[LitMotionAnimation] Made the Components reorderable #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emptybraces wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[LitMotionAnimation] Made the Components reorderable #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d4f284
Made the Components list of LitMotionAnimation reorderable
emptybraces Sep 14, 2025
352776f
Add Duplicate menu
emptybraces Nov 15, 2025
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
9 changes: 7 additions & 2 deletions src/LitMotion/Assets/LitMotion.Animation/Editor/AnimationComponentView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ public class AnimationComponentView : VisualElement
VisualElement container;
readonly VisualElement contextMenuButton;
readonly Foldout foldout;
readonly Toggle foldoutToggle;
readonly VisualElement icon;
readonly Toggle enabledToggle;
readonly ProgressBar progressBar;

public Foldout Foldout => foldout;
public Toggle FoldoutToggle => foldoutToggle;
public Toggle EnabledToggle => enabledToggle;
public VisualElement ContextMenuButton => contextMenuButton;

Expand Down Expand Up @@ -61,6 +63,7 @@ public AnimationComponentView()
};
root.Add(foldout);
foldout.Add(new VisualElement() { style = { height = 5f } });
foldoutToggle = foldout.Q<Toggle>();
var foldoutCheck = foldout.Q(className: Foldout.checkmarkUssClassName);
icon = new VisualElement
{
Expand All @@ -84,7 +87,7 @@ public AnimationComponentView()
{
enabledToggle.pickingMode = PickingMode.Ignore;
enabledToggle.Q(className: Toggle.inputUssClassName).pickingMode = PickingMode.Ignore;
enabledToggle.Q(className: Toggle.textUssClassName).pickingMode = PickingMode.Ignore;
// enabledToggle.Q(className: Toggle.textUssClassName).pickingMode = PickingMode.Ignore; # エラーが出るのでコメント
enabledToggle.Q(className: Toggle.checkmarkUssClassName).pickingMode = PickingMode.Position;
});
foldoutCheck.parent.Add(enabledToggle);
Expand Down Expand Up @@ -127,7 +130,9 @@ public AnimationComponentView()
};
root.Add(contextMenuButton);

container = foldout.contentContainer;
var dynamicContainer = new VisualElement { name = "dynamic-container" };
container = dynamicContainer;
foldout.contentContainer.Add(container);
}

public new void SetEnabled(bool enabled)
Expand Down
160 changes: 105 additions & 55 deletions src/LitMotion/Assets/LitMotion.Animation/Editor/LitMotionAnimationEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,22 +103,93 @@ VisualElement CreateComponentsPanel()
var box = CreateBox("Components");
var views = new List<AnimationComponentView>();

for (int i = 0; i < componentsProperty.arraySize; i++)
var properties = new List<SerializedProperty>();
for (int i = 0; i < componentsProperty.arraySize; ++i)
{
var property = componentsProperty.GetArrayElementAtIndex(i);
var view = CreateComponentGUI(property.Copy());
CreateContextMenuManipulator(componentsProperty, i, false).target = view.Foldout.Q<Toggle>();
properties.Add(componentsProperty.GetArrayElementAtIndex(i));
}

ListView listView = null;
VisualElement MakeItem()
{
var view = new AnimationComponentView();
var dynamicContainer = view.Q<VisualElement>("dynamic-container");
dynamicContainer.RegisterCallback<ChangeEvent<object>>(_ =>
{
componentsProperty.serializedObject.ApplyModifiedProperties();
});
return view;
}
void BindItem(VisualElement element, int index)
{
var view = (AnimationComponentView)element;
var dynamicContainer = view.Q<VisualElement>("dynamic-container");
dynamicContainer.Clear();

var enabledProperty = property.FindPropertyRelative("enabled");
if (enabledProperty != null)
var propertyOriginal = componentsProperty.GetArrayElementAtIndex(index);
var property = propertyOriginal.Copy();
if (string.IsNullOrEmpty(property.managedReferenceFullTypename))
{
view.EnabledToggle.BindProperty(enabledProperty);
view.Text = "(Missing)";
view.Icon = (Texture2D)EditorGUIUtility.IconContent("Error").image;
view.EnabledToggle.value = true;
view.SetEnabled(true);
view.EnabledToggle.Q("unity-checkmark").style.visibility = Visibility.Hidden;
view.Add(new HelpBox("The type referenced in SerializeReference is missing. You may have renamed the type or moved it to a different namespace or assembly.", HelpBoxMessageType.Error));
}
else
{
view.Text = property.FindPropertyRelative("displayName").stringValue;

var targetProperty = property.FindPropertyRelative("target");
if (targetProperty != null)
{
view.Icon = GUIHelper.GetComponentIcon(targetProperty.GetPropertyType());
}

view.TrackPropertyValue(property.FindPropertyRelative("displayName"), x =>
{
view.Text = x.stringValue;
});

box.Add(view);
views.Add(view);
CreateContextMenuManipulator(componentsProperty, i, true).target = view.ContextMenuButton;
view.Foldout.BindProperty(property);
view.FoldoutToggle.BindProperty(property.FindPropertyRelative("foldoutOn"));

var endProperty = property.GetEndProperty();
var isFirst = true;
while (property.NextVisible(isFirst))
{
if (SerializedProperty.EqualContents(property, endProperty)) break;
if (property.name == "enabled") continue;
isFirst = false;

var field = new PropertyField(property);
field.BindProperty(property);
dynamicContainer.Add(field);
}
var enabledProperty = propertyOriginal.FindPropertyRelative("enabled");
if (enabledProperty != null)
view.EnabledToggle.BindProperty(enabledProperty);
CreateContextMenuManipulator(componentsProperty, index, false).target = view.Foldout.Q<Toggle>();
CreateContextMenuManipulator(componentsProperty, index, true).target = view.ContextMenuButton;

}
}
listView = new ListView(properties, -1, MakeItem, BindItem)
{
reorderable = true,
selectionType = SelectionType.Single,
showBorder = true,
virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight,
reorderMode = ListViewReorderMode.Animated,
};
listView.itemIndexChanged += (startIndex, endIndex) =>
{
componentsProperty.MoveArrayElement(startIndex, endIndex);
serializedObject.ApplyModifiedProperties();
listView.Rebuild();
};
box.Add(listView);

var addButton = new Button()
{
Expand All @@ -145,6 +216,24 @@ VisualElement CreateComponentsPanel()
{
if (componentsProperty.arraySize != prevArraySize)
{
if (prevArraySize < componentsProperty.arraySize)
{
var seen = new HashSet<object>();
bool dirty = false;
for (int i = 0; i < componentsProperty.arraySize; ++i)
{
var element = componentsProperty.GetArrayElementAtIndex(i);
var value = element.managedReferenceValue;
if (value != null && !seen.Add(value))
{
var cloned = JsonUtility.FromJson(JsonUtility.ToJson(value), value.GetType());
element.managedReferenceValue = cloned;
dirty = true;
}
}
if (dirty)
serializedObject.ApplyModifiedProperties();
}
RefleshComponentsView(true);
prevArraySize = componentsProperty.arraySize;
}
Expand Down Expand Up @@ -251,51 +340,6 @@ void RefleshComponentsView(bool applyModifiedProperties)
componentRoot.Add(CreateComponentsPanel());
}

AnimationComponentView CreateComponentGUI(SerializedProperty property)
{
var view = new AnimationComponentView();

if (string.IsNullOrEmpty(property.managedReferenceFullTypename))
{
view.Text = "(Missing)";
view.Icon = (Texture2D)EditorGUIUtility.IconContent("Error").image;
view.EnabledToggle.value = true;
view.SetEnabled(true);
view.EnabledToggle.Q("unity-checkmark").style.visibility = Visibility.Hidden;
view.Add(new HelpBox("The type referenced in SerializeReference is missing. You may have renamed the type or moved it to a different namespace or assembly.", HelpBoxMessageType.Error));
}
else
{
view.Text = property.FindPropertyRelative("displayName").stringValue;

var targetProperty = property.FindPropertyRelative("target");
if (targetProperty != null)
{
view.Icon = GUIHelper.GetComponentIcon(targetProperty.GetPropertyType());
}

view.TrackPropertyValue(property.FindPropertyRelative("displayName"), x =>
{
view.Text = x.stringValue;
});

view.Foldout.BindProperty(property);

var endProperty = property.GetEndProperty();
var isFirst = true;
while (property.NextVisible(isFirst))
{
if (SerializedProperty.EqualContents(property, endProperty)) break;
if (property.name == "enabled") continue;
isFirst = false;

view.Add(new PropertyField(property));
}
}

return view;
}

ContextualMenuManipulator CreateContextMenuManipulator(SerializedProperty property, int arrayIndex, bool activeLeftClick)
{
var manipulator = new ContextualMenuManipulator(evt =>
Expand All @@ -310,6 +354,12 @@ ContextualMenuManipulator CreateContextMenuManipulator(SerializedProperty proper

evt.menu.AppendSeparator();

evt.menu.AppendAction("Duplicate", x =>
{
property.InsertArrayElementAtIndex(arrayIndex);
RefleshComponentsView(true);
});

evt.menu.AppendAction("Remove Component", x =>
{
property.DeleteArrayElementAtIndex(arrayIndex);
Expand Down
3 changes: 3 additions & 0 deletions src/LitMotion/Assets/LitMotion.Animation/Runtime/LitMotionAnimationComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@ public virtual void OnPause() { }
public virtual void OnStop() { }

public MotionHandle TrackedHandle { get; set; }
#if UNITY_EDITOR
[SerializeField, HideInInspector] bool foldoutOn = true;
#endif
}
}
2 changes: 1 addition & 1 deletion src/LitMotion/ProjectSettings/URPProjectSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LastMaterialVersion: 9
m_LastMaterialVersion: 10