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

Merge pull request #1664 from ousttrue/fix10/springbone_center

Browse Source 
[1.0] SpringBone.center 復活
This commit is contained in:
ousttrue 2022-05-31 12:23:43 +09:00 committed by GitHub
commit bcbd4b9cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs
View File

@ -38,9 +38,6 @@ namespace UniVRM10
[SerializeField, Header("Runtime")]
public UpdateTypes UpdateType = UpdateTypes.LateUpdate;
[SerializeField]
public Transform SpringBoneCenter;
[SerializeField, Header("LookAt")]
public bool DrawLookAtGizmo = true;

3
Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10InstanceSpringBone.cs
View File

@ -33,6 +33,9 @@ namespace UniVRM10
[SerializeField]
public List<VRM10SpringBoneJoint> Joints = new List<VRM10SpringBoneJoint>();
[SerializeField]
public Transform Center;
public Spring(string name)
{
Name = name;

2
Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs
View File

@ -72,7 +72,7 @@ namespace UniVRM10
return new FastSpringBoneBuffer(
springBone.Springs.Select(spring => new FastSpringBoneSpring
{
center = m_target.SpringBoneCenter,
center = spring.Center,
colliders = spring.ColliderGroups
.SelectMany(group => group.Colliders)
.Select(collider => new FastSpringBoneCollider

5
Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs
View File

@ -323,6 +323,11 @@ public static Spring Deserialize_Springs_ITEM(JsonNode parsed)
continue;
}
if(key=="center"){
value.Center = kv.Value.GetInt32();
continue;
}
}
return value;
}

3
Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs
View File

@ -112,6 +112,9 @@ namespace UniGLTF.Extensions.VRMC_springBone
// Indices of ColliderGroups that detect collision with this spring.
public int[] ColliderGroups;
// An index of node which is used as a root of center space.
public int? Center;
}
public class VRMC_springBone

5
Assets/VRM10/Runtime/Format/SpringBone/Serializer.g.cs
View File

@ -305,6 +305,11 @@ public static void Serialize_Springs_ITEM(JsonFormatter f, Spring value)
__springs_ITEM_Serialize_ColliderGroups(f, value.ColliderGroups);
}
if(value.Center.HasValue){
f.Key("center");
f.Value(value.Center.GetValueOrDefault());
}
f.EndMap();
}

10
Assets/VRM10/Runtime/IO/Vrm10Exporter.cs
View File

@ -394,6 +394,16 @@ namespace UniVRM10
Joints = x.Joints.Select(y => ExportJoint(y, getNodeIndexFromTransform)).ToList(),
ColliderGroups = x.ColliderGroups.Select(y => controller.SpringBone.ColliderGroups.IndexOf(y)).ToArray(),
};
if (x.Center != null)
{
var center = model.Nodes.IndexOf(converter.Nodes[x.Center.gameObject]);
if (center != -1)
{
spring.Center = center;
}
}
springBone.Springs.Add(spring);
}

5
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@ -595,6 +595,11 @@ namespace UniVRM10
var spring = new Vrm10InstanceSpringBone.Spring(gltfSpring.Name);
controller.SpringBone.Springs.Add(spring);
if (gltfSpring.Center.HasValue)
{
spring.Center = Nodes[gltfSpring.Center.Value];
}
if (gltfSpring.ColliderGroups != null)
{
spring.ColliderGroups = gltfSpring.ColliderGroups.Select(x => controller.SpringBone.ColliderGroups[x]).ToList();

2
vrm-specification

@ -1 +1 @@
Subproject commit 741b0c3f3cb44111d9e9ea179de9e3fc545ac50a
Subproject commit 729461b5c0e22bf74bda2c074c04299187af6333