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

prefix VRM10

Browse Source
This commit is contained in:
ousttrue
2021-01-18 17:59:34 +09:00
parent 0746d8d48b
commit 3b0cccdfab
21 changed files with 89 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs → Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs
View File

@@ -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");

2
Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs.meta → Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6903dd580e905a243b9841fafe3871bb
guid: 280a977934f9b9b449ac58bc0f016959
MonoImporter:
externalObjects: {}
serializedVersion: 2

10
Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs → Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs
View File

@@ -3,19 +3,19 @@ using UnityEditor.IMGUI.Controls;
namespace UniVRM10
{
class VRMSpringBoneTreeView : TreeView
class VRM10SpringBoneTreeView : TreeView
{
VRM10Controller m_root;
Dictionary<int, VRMSpringBone> m_boneMap = new Dictionary<int, VRMSpringBone>();
Dictionary<int, VRM10SpringBone> m_boneMap = new Dictionary<int, VRM10SpringBone>();
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<TreeViewItem>();
var bones = m_root.GetComponentsInChildren<VRMSpringBone>();
var bones = m_root.GetComponentsInChildren<VRM10SpringBone>();
var id = 1;
for (int i = 0; i < bones.Length; ++i, ++id)
{

2
Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs.meta → Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneView.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b939a4d43f2f17341b3e28bc9c59f8dd
guid: c012308d77f262b4789f2fee6cdb7105
MonoImporter:
externalObjects: {}
serializedVersion: 2

10
Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneWindow.cs → Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs
View File

@@ -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<VRMSpringBoneWindow>();
var wnd = GetWindow<VRM10SpringBoneWindow>();
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();

2
Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneView.cs.meta → Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneWindow.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cd352799c630a8d49813a5c4d937a847
guid: 50b4a0f82403ba742b3ae1d7ee14bf05
MonoImporter:
externalObjects: {}
serializedVersion: 2

12
Assets/VRM10/Editor/Components/SpringBone/VRMSpringBoneColliderGroupEditor.cs.meta
View File

@@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: a092aa1d5a21feb4db6523a3284ca561
timeCreated: 1519735770
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

6
Assets/VRM10/Runtime/Components/SpringBone/SpringBoneLogic.cs
View File

@@ -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;

14
Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs → Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs
View File

@@ -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 )
/// </summary>
[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)

4
Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBone.cs.meta → Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs.meta
View File

@@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: 9972432db4ac7af489ee0b864c5baaf9
timeCreated: 1517224588
licenseType: Free
guid: 1f440a6e91549e542bda6d6d741b1409
MonoImporter:
externalObjects: {}
serializedVersion: 2

6
Assets/VRM10/Runtime/Components/SpringBone/SpringBoneCollider.cs → Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs
View File

@@ -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;
/// <summary>bone local position</summary>
public Vector3 Offset;

11
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 35bfb658269b2af478e501de243deda6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

14
Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs → Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs
View File

@@ -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);

11
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1542d3467a35afa4dbefa2a112058078
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs → Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs
View File

@@ -1,7 +1,7 @@
namespace UniVRM10
{
public static class VRMSpringUtility
public static class VRM10SpringUtility
{
#if false

11
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringUtility.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 61a4226bc18ddab4daf79fc681690fab
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

13
Assets/VRM10/Runtime/Components/SpringBone/VRMSpringBoneColliderGroup.cs.meta
View File

@@ -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:

12
Assets/VRM10/Runtime/Components/SpringBone/VRMSpringUtility.cs.meta
View File

@@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 59fca440205c8134a898c5164771468c
timeCreated: 1528358605
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/VRM10/Runtime/Components/VRM10Controller.cs
View File

@@ -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<VRMSpringBone>();
m_springs = GetComponentsInChildren<VRM10SpringBone>();
}
foreach (var spring in m_springs)
{

14
Assets/VRM10/Runtime/UnityBuilder/ComponentBuilder.cs
View File

@@ -232,30 +232,30 @@ namespace UniVRM10
// springBone
{
var colliders = new Dictionary<VrmLib.SpringBoneColliderGroup, UniVRM10.VRMSpringBoneColliderGroup>();
var colliders = new Dictionary<VrmLib.SpringBoneColliderGroup, UniVRM10.VRM10SpringBoneColliderGroup>();
if (model.Vrm.SpringBone != null)
{
foreach (var colliderGroup in model.Vrm.SpringBone.Colliders)
{
var go = asset.Map.Nodes[colliderGroup.Node];
var springBoneColliderGroup = go.AddComponent<UniVRM10.VRMSpringBoneColliderGroup>();
var springBoneColliderGroup = go.AddComponent<UniVRM10.VRM10SpringBoneColliderGroup>();
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<UniVRM10.VRMSpringBone>();
var springBoneComponent = springBoneObject.AddComponent<UniVRM10.VRM10SpringBone>();
springBoneComponent.m_comment = spring.Comment;
springBoneComponent.m_stiffnessForce = spring.Stiffness;
springBoneComponent.m_gravityPower = spring.GravityPower;

10
Assets/VRM10/Runtime/VRMConverter/RuntimeVrmConverter.cs
View File

@@ -343,21 +343,21 @@ namespace UniVRM10
// springBone
{
var springBoneColliderGroups = root.GetComponentsInChildren<UniVRM10.VRMSpringBoneColliderGroup>();
var springBoneColliderGroups = root.GetComponentsInChildren<UniVRM10.VRM10SpringBoneColliderGroup>();
if (springBoneColliderGroups != null)
{
Model.Vrm.SpringBone = new VrmLib.SpringBoneManager();
var colliders = new Dictionary<UniVRM10.VRMSpringBoneColliderGroup, VrmLib.SpringBoneColliderGroup>();
var colliders = new Dictionary<UniVRM10.VRM10SpringBoneColliderGroup, VrmLib.SpringBoneColliderGroup>();
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<UniVRM10.VRMSpringBone>();
var springBones = root.GetComponentsInChildren<UniVRM10.VRM10SpringBone>();
foreach (var springBone in springBones)
{
var vrmSpringBone = new VrmLib.SpringBone()