Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-13 14:29:38 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2514 from ousttrue/fix/10_collider_editor_update

Browse Source 
[1.0][springbone] カプセルの頭側もドラッグできるようにするなど
This commit is contained in:
ousttrue
2024-12-23 13:40:27 +09:00
committed by GitHub
parent 66dcc65f8a e3b2071877
commit 9d453a484c
3 changed files with 122 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderEditor.cs
View File

@@ -14,8 +14,16 @@ namespace UniVRM10
SerializedProperty _colliderType;
SerializedProperty _offset;
SerializedProperty _tail;
Tool _last = Tool.None;
bool _openUtility = false;
static VRM10SpringBoneCollider s_selected;
enum HandleType
{
Offset,
Tail,
Normal,
}
static (VRM10SpringBoneCollider Collider, HandleType HandleType)? s_selected;
private void OnEnable()
{
@@ -66,11 +74,39 @@ namespace UniVRM10
EditorGUILayout.BeginHorizontal();
{
if (GUILayout.Button("Drag handle"))
if (GUILayout.Button("Drag offset"))
{
s_selected = _target;
s_selected = (_target, HandleType.Offset);
}
if (
_target.ColliderType == VRM10SpringBoneColliderTypes.Capsule
|| _target.ColliderType == VRM10SpringBoneColliderTypes.CapsuleInside)
{
if (GUILayout.Button("Drag tail"))
{
s_selected = (_target, HandleType.Tail);
}
}
if (_target.ColliderType == VRM10SpringBoneColliderTypes.Plane)
{
if (GUILayout.Button("Drag normal"))
{
s_selected = (_target, HandleType.Normal);
}
}
using (new EditorGUI.DisabledScope(s_selected == default))
{
if (GUILayout.Button("Drag end"))
{
s_selected = default;
}
}
}
EditorGUILayout.EndHorizontal();
_openUtility = EditorGUILayout.Foldout(_openUtility, "utility");
if (_openUtility)
{
if (_target.transform.childCount > 0)
{
if (GUILayout.Button("Fit head-tail capsule"))
@@ -83,7 +119,6 @@ namespace UniVRM10
}
}
}
EditorGUILayout.EndHorizontal();
if (serializedObject.ApplyModifiedProperties())
{
@@ -102,30 +137,80 @@ namespace UniVRM10
{
HandleUtility.Repaint();
if (s_selected == _target)
bool updated = false;
if (s_selected.HasValue && s_selected.Value.Collider == _target)
{
var c = _target;
Handles.matrix = c.transform.localToWorldMatrix;
if (_target.ColliderType == VRM10SpringBoneColliderTypes.Capsule
|| _target.ColliderType == VRM10SpringBoneColliderTypes.CapsuleInside)
if (Tools.current != Tool.None)
{
EditorGUI.BeginChangeCheck();
var newTargetPosition = Handles.PositionHandle(c.Tail, Quaternion.identity);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject(c, "collider");
c.Tail = newTargetPosition;
}
_last = Tools.current;
}
else
Tools.current = Tool.None;
Handles.matrix = _target.transform.localToWorldMatrix;
switch (s_selected.Value.HandleType)
{
EditorGUI.BeginChangeCheck();
var newTargetPosition = Handles.PositionHandle(c.Offset, Quaternion.identity);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject(c, "collider");
c.Offset = newTargetPosition;
}
case HandleType.Offset:
{
Handles.Label(_target.Offset, "Collider offset");
EditorGUI.BeginChangeCheck();
var newTargetPosition = Handles.PositionHandle(_target.Offset, Quaternion.identity);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject(_target, "collider");
_target.Offset = newTargetPosition;
updated = true;
}
}
break;
case HandleType.Tail:
{
Handles.Label(_target.Tail, "Capsule tail");
EditorGUI.BeginChangeCheck();
var newTargetPosition = Handles.PositionHandle(_target.Tail, Quaternion.identity);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject(_target, "collider");
_target.Tail = newTargetPosition;
updated = true;
}
}
break;
case HandleType.Normal:
{
Handles.Label(_target.Offset, "Plane normal");
EditorGUI.BeginChangeCheck();
var r = Quaternion.FromToRotation(Vector3.up, _target.Normal);
var newRotation = Handles.RotationHandle(r, _target.Offset);
Handles.DrawLine(_target.Offset, _target.Offset + _target.Normal);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject(_target, "collider");
_target.Normal = newRotation * Vector3.up;
updated = true;
}
}
break;
}
}
else
{
if (_last != Tool.None)
{
Tools.current = _last;
_last = Tool.None;
}
}
if (updated)
{
_target.OnValidate();
if (Application.isPlaying && updated)
{
// 反映!
_vrm.Runtime.SpringBone.ReconstructSpringBone();
}
}
}

9
Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs
View File

@@ -11,10 +11,16 @@ namespace UniVRM10
[CustomEditor(typeof(VRM10SpringBoneColliderGroup))]
class VRM10SpringBoneColliderGroupEditor : Editor
{
VRM10SpringBoneColliderGroup m_target;
ListView m_colliders;
static VRM10SpringBoneCollider s_collider;
void OnEnable()
{
m_target = (VRM10SpringBoneColliderGroup)target;
}
public override VisualElement CreateInspectorGUI()
{
var root = new VisualElement();
@@ -66,8 +72,9 @@ namespace UniVRM10
return;
}
if (s_collider is VRM10SpringBoneCollider c)
if (s_collider != null && m_target.Colliders.Contains(s_collider))
{
var c = s_collider;
EditorGUI.BeginChangeCheck();
Handles.matrix = c.transform.localToWorldMatrix;
var newTargetPosition = Handles.PositionHandle(c.Offset, Quaternion.identity);

5
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs
View File

@@ -34,6 +34,11 @@ namespace UniVRM10
public bool IsSelected => GetInstanceID() == SelectedGuid;
public void OnValidate()
{
Normal = Normal.normalized;
}
void OnDrawGizmosSelected()
{
DrawGizmos();