Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-15 07:00:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2506 from ousttrue/fix/duplicate_rootbone

Browse Source 
[0.x][springbone] rootBone 重複対策
This commit is contained in:
ousttrue 2024-11-19 13:17:04 +09:00 committed by GitHub
commit fbe9342d65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Assets/VRM/Editor/SpringBone/VRMSpringBoneEditor.cs
View File

@ -1,3 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using UniGLTF;
using UnityEditor;
using UnityEngine;
@ -9,6 +12,7 @@ namespace VRM
{
private VRMSpringBone m_target;
private SerializedProperty m_script;
private SerializedProperty m_commentProp;
private SerializedProperty m_gizmoColorProp;
private SerializedProperty m_stiffnessForceProp;
@ -29,6 +33,7 @@ namespace VRM
}
m_target = (VRMSpringBone)target;
m_script = serializedObject.FindProperty("m_Script");
m_commentProp = serializedObject.FindProperty(nameof(VRMSpringBone.m_comment));
m_gizmoColorProp = serializedObject.FindProperty("m_gizmoColor");
m_stiffnessForceProp = serializedObject.FindProperty(nameof(VRMSpringBone.m_stiffnessForce));
@ -42,32 +47,54 @@ namespace VRM
m_updateTypeProp = serializedObject.FindProperty(nameof(VRMSpringBone.m_updateType));
}
public void OnSceneGUI()
{
foreach (var valiation in m_target.Validations)
{
var t = (Transform)valiation.Context.Context;
if (t != null)
{
Handles.Label(t.position, "duplicate rootBone !");
}
}
}
public override void OnInspectorGUI()
{
serializedObject.Update();
// header
using (new EditorGUI.DisabledScope(true))
{
EditorGUILayout.PropertyField(m_script);
}
EditorGUILayout.PropertyField(m_commentProp);
EditorGUILayout.PropertyField(m_gizmoColorProp);
EditorGUILayout.Space();
foreach (var validation in m_target.Validations)
{
validation.DrawGUI();
}
// settings
EditorGUILayout.LabelField("Settings", EditorStyles.boldLabel);
LimitBreakSlider(m_stiffnessForceProp, 0.0f, 4.0f, 0.0f, Mathf.Infinity);
LimitBreakSlider(m_gravityPowerProp, 0.0f, 2.0f, 0.0f, Mathf.Infinity);
EditorGUILayout.PropertyField(m_gravityDirProp);
EditorGUILayout.PropertyField(m_dragForceProp);
EditorGUILayout.PropertyField(m_centerProp);
EditorGUILayout.PropertyField(m_rootBonesProp);
EditorGUILayout.Space();
// collision
EditorGUILayout.LabelField("Collision", EditorStyles.boldLabel);
LimitBreakSlider(m_hitRadiusProp, 0.0f, 0.5f, 0.0f, Mathf.Infinity);
EditorGUILayout.PropertyField(m_colliderGroupsProp);
EditorGUILayout.PropertyField(m_updateTypeProp);
EditorGUILayout.Space();
// runtime
EditorGUILayout.LabelField("Runtime", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(m_updateTypeProp);
serializedObject.ApplyModifiedProperties();
}

41
Assets/VRM/Runtime/SpringBone/VRMSpringBone.cs
View File

@ -1,4 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using UniGLTF;
using UnityEngine;
namespace VRM
@ -47,15 +49,52 @@ namespace VRM
}
[SerializeField] public SpringBoneUpdateType m_updateType = SpringBoneUpdateType.LateUpdate;
List<Transform> m_rootBonesNonNullUnique = new();
List<Transform> RootBonesNonNullUnique
{
get
{
m_rootBonesNonNullUnique.Clear();
m_rootBonesNonNullUnique.AddRange(RootBones.Where(x => x != null).Distinct());
return m_rootBonesNonNullUnique;
}
}
SpringBone.SpringBoneSystem m_system = new();
Dictionary<Transform, int> m_rootCount = new();
List<Validation> m_validations = new();
public List<Validation> Validations => m_validations;
public void OnValidate()
{
Validations.Clear();
m_rootCount.Clear();
foreach (var root in RootBones)
{
if (m_rootCount.TryGetValue(root, out var count))
{
m_rootCount[root] = count + 1;
}
else
{
m_rootCount.Add(root, 1);
}
}
foreach (var (k, v) in m_rootCount)
{
if (v > 1)
{
Validations.Add(Validation.Error($"Duplicate rootBone: {k} => {v}", ValidationContext.Create(k)));
}
}
}
void Awake()
{
Setup();
}
SpringBone.SceneInfo Scene => new(
rootBones: RootBones,
rootBones: RootBonesNonNullUnique,
center: m_center,
colliderGroups: ColliderGroups,
externalForce: ExternalForce);