From 3b0cccdfab3d912aed70e27361d29faaf99f1915 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 18 Jan 2021 17:59:34 +0900 Subject: [PATCH] prefix VRM10 --- ...or.cs => VRM10SpringBoneColliderGroupEditor.cs} | 14 +++++++------- ... => VRM10SpringBoneColliderGroupEditor.cs.meta} | 2 +- ...VRMSpringBoneView.cs => VRM10SpringBoneView.cs} | 10 +++++----- .../SpringBone/VRM10SpringBoneView.cs.meta} | 2 +- ...pringBoneWindow.cs => VRM10SpringBoneWindow.cs} | 10 +++++----- ...eView.cs.meta => VRM10SpringBoneWindow.cs.meta} | 2 +- .../VRMSpringBoneColliderGroupEditor.cs.meta | 12 ------------ .../Components/SpringBone/SpringBoneLogic.cs | 6 +++--- .../{VRMSpringBone.cs => VRM10SpringBone.cs} | 14 +++++++------- ...MSpringBone.cs.meta => VRM10SpringBone.cs.meta} | 4 +--- ...gBoneCollider.cs => VRM10SpringBoneCollider.cs} | 6 +++--- .../SpringBone/VRM10SpringBoneCollider.cs.meta | 11 +++++++++++ ...derGroup.cs => VRM10SpringBoneColliderGroup.cs} | 14 +++++++------- .../VRM10SpringBoneColliderGroup.cs.meta | 11 +++++++++++ .../{VRMSpringUtility.cs => VRM10SpringUtility.cs} | 2 +- .../SpringBone/VRM10SpringUtility.cs.meta | 11 +++++++++++ .../SpringBone/VRMSpringBoneColliderGroup.cs.meta | 13 ------------- .../Components/SpringBone/VRMSpringUtility.cs.meta | 12 ------------ Assets/VRM10/Runtime/Components/VRM10Controller.cs | 4 ++-- .../VRM10/Runtime/UnityBuilder/ComponentBuilder.cs | 14 +++++++------- .../Runtime/VRMConverter/RuntimeVrmConverter.cs | 10 +++++----- 21 files changed, 89 insertions(+), 95 deletions(-) rename Assets/VRM10/Editor/Components/SpringBone/{VRMSpringBoneColliderGroupEditor.cs => VRM10SpringBoneColliderGroupEditor.cs} (82%) rename Assets/VRM10/Editor/Components/SpringBone/{VRMSpringBoneWindow.cs.meta => VRM10SpringBoneColliderGroupEditor.cs.meta} (83%) rename Assets/VRM10/Editor/Components/SpringBone/{VRMSpringBoneView.cs => VRM10SpringBoneView.cs} (77%) rename Assets/VRM10/{Runtime/Components/SpringBone/SpringBoneCollider.cs.meta => Editor/Components/SpringBone/VRM10SpringBoneView.cs.meta} (83%) rename Assets/VRM10/Editor/Components/SpringBone/{VRMSpringBoneWindow.cs => VRM10SpringBoneWindow.cs} (91%) rename Assets/VRM10/Editor/Components/SpringBone/{VRMSpringBoneView.cs.meta => VRM10SpringBoneWindow.cs.meta} (83%) delete mode 100644 Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs.meta rename Assets/VRM10/Runtime/Components/SpringBone/{VRMSpringBone.cs => VRM10SpringBone.cs} (87%) rename Assets/VRM10/Runtime/Components/SpringBone/{VRMSpringBone.cs.meta => VRM10SpringBone.cs.meta} (71%) rename Assets/VRM10/Runtime/Components/SpringBone/{SpringBoneCollider.cs => VRM10SpringBoneCollider.cs} (71%) create mode 100644 Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs.meta rename Assets/VRM10/Runtime/Components/SpringBone/{VRMSpringBoneColliderGroup.cs => VRM10SpringBoneColliderGroup.cs} (88%) create mode 100644 Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs.meta rename Assets/VRM10/Runtime/Components/SpringBone/{VRMSpringUtility.cs => VRM10SpringUtility.cs} (99%) create mode 100644 Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs.meta delete mode 100644 Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs.meta delete mode 100644 Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs.meta diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs similarity index 82% rename from Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs rename to Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs index b982d82f0..56295eff5 100644 --- a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs +++ b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs @@ -5,14 +5,14 @@ using UnityEngine; namespace UniVRM10 { - [CustomEditor(typeof(VRMSpringBoneColliderGroup))] - public class VRMSpringBoneColliderGroupEditor : Editor + [CustomEditor(typeof(VRM10SpringBoneColliderGroup))] + public class VRM10SpringBoneColliderGroupEditor : Editor { - VRMSpringBoneColliderGroup m_target; + VRM10SpringBoneColliderGroup m_target; private void OnEnable() { - m_target = (VRMSpringBoneColliderGroup)target; + m_target = (VRM10SpringBoneColliderGroup)target; } private void OnSceneGUI() @@ -43,7 +43,7 @@ namespace UniVRM10 [MenuItem("CONTEXT/VRM10SpringBoneColliderGroup/X Mirror")] private static void InvertOffsetX(MenuCommand command) { - var target = command.context as VRMSpringBoneColliderGroup; + var target = command.context as VRM10SpringBoneColliderGroup; if (target == null) return; Undo.RecordObject(target, "X Mirror"); @@ -59,7 +59,7 @@ namespace UniVRM10 [MenuItem("CONTEXT/VRM10SpringBoneColliderGroup/Sort Colliders by Radius")] private static void SortByRadius(MenuCommand command) { - var target = command.context as VRMSpringBoneColliderGroup; + var target = command.context as VRM10SpringBoneColliderGroup; if (target == null) return; Undo.RecordObject(target, "Sort Colliders by Radius"); @@ -70,7 +70,7 @@ namespace UniVRM10 [MenuItem("CONTEXT/VRM10SpringBoneColliderGroup/Sort Colliders by Offset Y")] private static void SortByOffsetY(MenuCommand command) { - var target = command.context as VRMSpringBoneColliderGroup; + var target = command.context as VRM10SpringBoneColliderGroup; if (target == null) return; Undo.RecordObject(target, "Sort Colliders by Offset Y"); diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs.meta b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs.meta similarity index 83% rename from Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs.meta rename to Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs.meta index b92fd0895..0bd7bfe1b 100644 --- a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs.meta +++ b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6903dd580e905a243b9841fafe3871bb +guid: 280a977934f9b9b449ac58bc0f016959 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs similarity index 77% rename from Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs rename to Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs index e69acddb6..5e9e93c11 100644 --- a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs +++ b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs @@ -3,19 +3,19 @@ using UnityEditor.IMGUI.Controls; namespace UniVRM10 { - class VRMSpringBoneTreeView : TreeView + class VRM10SpringBoneTreeView : TreeView { VRM10Controller m_root; - Dictionary m_boneMap = new Dictionary(); + Dictionary m_boneMap = new Dictionary(); - public bool TryGetSpringBone(int id, out VRMSpringBone bone) + public bool TryGetSpringBone(int id, out VRM10SpringBone bone) { return m_boneMap.TryGetValue(id, out bone); } - public VRMSpringBoneTreeView(TreeViewState treeViewState, VRM10Controller root) + public VRM10SpringBoneTreeView(TreeViewState treeViewState, VRM10Controller root) : base(treeViewState) { m_root = root; @@ -32,7 +32,7 @@ namespace UniVRM10 m_boneMap.Clear(); var root = new TreeViewItem { id = 0, depth = -1, displayName = m_root.name }; var allItems = new List(); - var bones = m_root.GetComponentsInChildren(); + var bones = m_root.GetComponentsInChildren(); var id = 1; for (int i = 0; i < bones.Length; ++i, ++id) { diff --git a/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs.meta b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs.meta similarity index 83% rename from Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs.meta rename to Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs.meta index 5df2bad9d..6102f48e6 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs.meta +++ b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b939a4d43f2f17341b3e28bc9c59f8dd +guid: c012308d77f262b4789f2fee6cdb7105 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs similarity index 91% rename from Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs rename to Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs index e4e8aeea9..ea3df9b27 100644 --- a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs +++ b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs @@ -8,12 +8,12 @@ using UnityEngine; namespace UniVRM10 { - public class VRMSpringBoneWindow : EditorWindow + public class VRM10SpringBoneWindow : EditorWindow { [MenuItem(VRMVersion.MENU + "/VRMSpringBoneWindow")] public static void ShowEditorWindow() { - var wnd = GetWindow(); + var wnd = GetWindow(); wnd.titleContent = new GUIContent("VRMSpringBoneWindow"); } @@ -33,7 +33,7 @@ namespace UniVRM10 [SerializeField] TreeViewState m_treeViewState; - VRMSpringBoneTreeView m_treeView; + VRM10SpringBoneTreeView m_treeView; Rect m_treeRect; Rect m_inspectorRect; @@ -64,7 +64,7 @@ namespace UniVRM10 if (m_treeViewState.selectedIDs.Any()) { // selected な SpringBone の Inspector を描画する - if (m_treeView.TryGetSpringBone(m_treeViewState.selectedIDs[0], out VRMSpringBone bone)) + if (m_treeView.TryGetSpringBone(m_treeViewState.selectedIDs[0], out VRM10SpringBone bone)) { // Debug.Log(bone); using (var inspector = new CustomInspector(new SerializedObject(bone))) @@ -102,7 +102,7 @@ namespace UniVRM10 // update treeview Debug.Log(m_currentRoot); m_treeViewState = new TreeViewState(); - m_treeView = new VRMSpringBoneTreeView(m_treeViewState, m_currentRoot); + m_treeView = new VRM10SpringBoneTreeView(m_treeViewState, m_currentRoot); } Repaint(); diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs.meta b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs.meta similarity index 83% rename from Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs.meta rename to Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs.meta index a68f49aca..228370822 100644 --- a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs.meta +++ b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd352799c630a8d49813a5c4d937a847 +guid: 50b4a0f82403ba742b3ae1d7ee14bf05 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs.meta b/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs.meta deleted file mode 100644 index 00b5aa5c0..000000000 --- a/Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a092aa1d5a21feb4db6523a3284ca561 -timeCreated: 1519735770 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneLogic.cs b/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneLogic.cs index 6eed0936c..6a72f1f5a 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneLogic.cs +++ b/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneLogic.cs @@ -65,7 +65,7 @@ namespace UniVRM10 public struct InternalCollider { - public SpringBoneColliderTypes ColliderTypes; + public VRM10SpringBoneColliderTypes ColliderTypes; public Vector3 WorldPosition; public float Radius; public Vector3 WorldTail; @@ -165,11 +165,11 @@ namespace UniVRM10 // すべての衝突判定を順番に実行する switch (collider.ColliderTypes) { - case SpringBoneColliderTypes.Sphere: + case VRM10SpringBoneColliderTypes.Sphere: TrySphereCollision(collider.WorldPosition, collider.Radius, ref nextTail); break; - case SpringBoneColliderTypes.Capsule: + case VRM10SpringBoneColliderTypes.Capsule: TryCapsuleCollision(in collider, ref nextTail); break; diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs similarity index 87% rename from Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs rename to Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs index 8cc409ed0..071a78b27 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs @@ -7,11 +7,11 @@ namespace UniVRM10 /// The base algorithm is http://rocketjump.skr.jp/unity3d/109/ of @ricopin416 /// DefaultExecutionOrder(11000) means calculate springbone after FinalIK( VRIK ) /// - [AddComponentMenu("VRM/VRMSpringBone")] + [AddComponentMenu("VRM10/VRM10SpringBone")] #if UNITY_5_5_OR_NEWER [DefaultExecutionOrder(11000)] #endif - public class VRMSpringBone : MonoBehaviour + public class VRM10SpringBone : MonoBehaviour { [SerializeField] public string m_comment; @@ -44,7 +44,7 @@ namespace UniVRM10 public float m_hitRadius = 0.02f; [SerializeField] - public VRMSpringBoneColliderGroup[] ColliderGroups; + public VRM10SpringBoneColliderGroup[] ColliderGroups; SpringBoneProcessor m_processor = new SpringBoneProcessor(); @@ -74,20 +74,20 @@ namespace UniVRM10 { switch (collider.ColliderType) { - case SpringBoneColliderTypes.Sphere: + case VRM10SpringBoneColliderTypes.Sphere: m_colliderList.Add(new SpringBoneLogic.InternalCollider { - ColliderTypes = SpringBoneColliderTypes.Sphere, + ColliderTypes = VRM10SpringBoneColliderTypes.Sphere, WorldPosition = group.transform.TransformPoint(collider.Offset), Radius = collider.Radius, }); break; - case SpringBoneColliderTypes.Capsule: + case VRM10SpringBoneColliderTypes.Capsule: m_colliderList.Add(new SpringBoneLogic.InternalCollider { - ColliderTypes = SpringBoneColliderTypes.Capsule, + ColliderTypes = VRM10SpringBoneColliderTypes.Capsule, WorldPosition = group.transform.TransformPoint(collider.Offset), Radius = collider.Radius, WorldTail = group.transform.TransformPoint(collider.Tail) diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs.meta b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs.meta similarity index 71% rename from Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs.meta rename to Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs.meta index 11d32a3a4..3e62418a8 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs.meta +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 9972432db4ac7af489ee0b864c5baaf9 -timeCreated: 1517224588 -licenseType: Free +guid: 1f440a6e91549e542bda6d6d741b1409 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs similarity index 71% rename from Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs rename to Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs index 54b957d6a..1f5fe5357 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs @@ -3,16 +3,16 @@ using UnityEngine; namespace UniVRM10 { - public enum SpringBoneColliderTypes + public enum VRM10SpringBoneColliderTypes { Sphere, Capsule, } [Serializable] - public class SpringBoneCollider + public class VRM10SpringBoneCollider { - public SpringBoneColliderTypes ColliderType; + public VRM10SpringBoneColliderTypes ColliderType; /// bone local position public Vector3 Offset; diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs.meta b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs.meta new file mode 100644 index 000000000..5d1c1d17d --- /dev/null +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 35bfb658269b2af478e501de243deda6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs similarity index 88% rename from Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs rename to Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs index dc325d55f..3530ce320 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs @@ -4,17 +4,17 @@ using UnityEngine; namespace UniVRM10 { - [AddComponentMenu("VRM/VRMSpringBoneColliderGroup")] + [AddComponentMenu("VRM10/VRM10SpringBoneColliderGroup")] #if UNITY_5_5_OR_NEWER [DefaultExecutionOrder(11001)] #endif - public class VRMSpringBoneColliderGroup : MonoBehaviour + public class VRM10SpringBoneColliderGroup : MonoBehaviour { [SerializeField] - public SpringBoneCollider[] Colliders = new SpringBoneCollider[]{ - new SpringBoneCollider + public VRM10SpringBoneCollider[] Colliders = new VRM10SpringBoneCollider[]{ + new VRM10SpringBoneCollider { - ColliderType = SpringBoneColliderTypes.Capsule, + ColliderType = VRM10SpringBoneColliderTypes.Capsule, Radius=0.1f } }; @@ -83,11 +83,11 @@ namespace UniVRM10 { switch (y.ColliderType) { - case SpringBoneColliderTypes.Sphere: + case VRM10SpringBoneColliderTypes.Sphere: Gizmos.DrawWireSphere(y.Offset, y.Radius); break; - case SpringBoneColliderTypes.Capsule: + case VRM10SpringBoneColliderTypes.Capsule: // Gizmos.DrawWireSphere(y.Offset, y.Radius); // Gizmos.DrawWireSphere(y.Tail, y.Radius); // Gizmos.DrawLine(y.Offset, y.Tail); diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs.meta b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs.meta new file mode 100644 index 000000000..a53d70632 --- /dev/null +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1542d3467a35afa4dbefa2a112058078 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs similarity index 99% rename from Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs rename to Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs index 429063bff..920e02d55 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs @@ -1,7 +1,7 @@ namespace UniVRM10 { - public static class VRMSpringUtility + public static class VRM10SpringUtility { #if false diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs.meta b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs.meta new file mode 100644 index 000000000..844f7c71f --- /dev/null +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61a4226bc18ddab4daf79fc681690fab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs.meta b/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs.meta deleted file mode 100644 index ff68b26e7..000000000 --- a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 079b0ee290c8a8d40b07314c753397a1 -timeCreated: 1517984922 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs.meta b/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs.meta deleted file mode 100644 index 5a4899621..000000000 --- a/Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 59fca440205c8134a898c5164771468c -timeCreated: 1528358605 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10/Runtime/Components/VRM10Controller.cs b/Assets/VRM10/Runtime/Components/VRM10Controller.cs index 12e8daa1f..9948c3168 100644 --- a/Assets/VRM10/Runtime/Components/VRM10Controller.cs +++ b/Assets/VRM10/Runtime/Components/VRM10Controller.cs @@ -62,7 +62,7 @@ namespace UniVRM10 } VRMConstraint[] m_constraints; - VRMSpringBone[] m_springs; + VRM10SpringBone[] m_springs; Transform m_head; public Transform Head @@ -135,7 +135,7 @@ namespace UniVRM10 // if (m_springs == null) { - m_springs = GetComponentsInChildren(); + m_springs = GetComponentsInChildren(); } foreach (var spring in m_springs) { diff --git a/Assets/VRM10/Runtime/UnityBuilder/ComponentBuilder.cs b/Assets/VRM10/Runtime/UnityBuilder/ComponentBuilder.cs index 47c078174..32de9e0a0 100644 --- a/Assets/VRM10/Runtime/UnityBuilder/ComponentBuilder.cs +++ b/Assets/VRM10/Runtime/UnityBuilder/ComponentBuilder.cs @@ -232,30 +232,30 @@ namespace UniVRM10 // springBone { - var colliders = new Dictionary(); + var colliders = new Dictionary(); if (model.Vrm.SpringBone != null) { foreach (var colliderGroup in model.Vrm.SpringBone.Colliders) { var go = asset.Map.Nodes[colliderGroup.Node]; - var springBoneColliderGroup = go.AddComponent(); + var springBoneColliderGroup = go.AddComponent(); springBoneColliderGroup.Colliders = colliderGroup.Colliders.Select(x => { switch (x.ColliderType) { case VrmLib.VrmSpringBoneColliderTypes.Sphere: - return new UniVRM10.SpringBoneCollider() + return new UniVRM10.VRM10SpringBoneCollider() { - ColliderType = SpringBoneColliderTypes.Sphere, + ColliderType = VRM10SpringBoneColliderTypes.Sphere, Offset = x.Offset.ToUnityVector3(), Radius = x.Radius }; case VrmLib.VrmSpringBoneColliderTypes.Capsule: - return new UniVRM10.SpringBoneCollider() + return new UniVRM10.VRM10SpringBoneCollider() { - ColliderType = SpringBoneColliderTypes.Capsule, + ColliderType = VRM10SpringBoneColliderTypes.Capsule, Offset = x.Offset.ToUnityVector3(), Radius = x.Radius, Tail = x.CapsuleTail.ToUnityVector3(), @@ -286,7 +286,7 @@ namespace UniVRM10 { foreach (var spring in model.Vrm.SpringBone.Springs) { - var springBoneComponent = springBoneObject.AddComponent(); + var springBoneComponent = springBoneObject.AddComponent(); springBoneComponent.m_comment = spring.Comment; springBoneComponent.m_stiffnessForce = spring.Stiffness; springBoneComponent.m_gravityPower = spring.GravityPower; diff --git a/Assets/VRM10/Runtime/VRMConverter/RuntimeVrmConverter.cs b/Assets/VRM10/Runtime/VRMConverter/RuntimeVrmConverter.cs index e38e53a5b..59f94a174 100644 --- a/Assets/VRM10/Runtime/VRMConverter/RuntimeVrmConverter.cs +++ b/Assets/VRM10/Runtime/VRMConverter/RuntimeVrmConverter.cs @@ -343,21 +343,21 @@ namespace UniVRM10 // springBone { - var springBoneColliderGroups = root.GetComponentsInChildren(); + var springBoneColliderGroups = root.GetComponentsInChildren(); if (springBoneColliderGroups != null) { Model.Vrm.SpringBone = new VrmLib.SpringBoneManager(); - var colliders = new Dictionary(); + var colliders = new Dictionary(); foreach (var colliderGroup in springBoneColliderGroups) { var colliderGroups = colliderGroup.Colliders.Select(x => { switch (x.ColliderType) { - case SpringBoneColliderTypes.Sphere: + case VRM10SpringBoneColliderTypes.Sphere: return VrmLib.VrmSpringBoneCollider.CreateSphere(x.Offset.ToNumericsVector3(), x.Radius); - case SpringBoneColliderTypes.Capsule: + case VRM10SpringBoneColliderTypes.Capsule: return VrmLib.VrmSpringBoneCollider.CreateCapsule(x.Offset.ToNumericsVector3(), x.Radius, x.Tail.ToNumericsVector3()); default: @@ -370,7 +370,7 @@ namespace UniVRM10 colliders.Add(colliderGroup, vrmColliderGroup); } - var springBones = root.GetComponentsInChildren(); + var springBones = root.GetComponentsInChildren(); foreach (var springBone in springBones) { var vrmSpringBone = new VrmLib.SpringBone()