From 43c46fbf184c72a89699087706573fe77e2bd7b4 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 27 Jan 2021 16:56:29 +0900 Subject: [PATCH] fix SpringBoneAdapter.ToGltf --- Assets/VRM10/Runtime/IO/VrmSpringBoneAdapter.cs | 1 + Assets/VRM10/Tests.PlayMode/MaterialTests.cs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/VRM10/Runtime/IO/VrmSpringBoneAdapter.cs b/Assets/VRM10/Runtime/IO/VrmSpringBoneAdapter.cs index 3783ee201..24666b69c 100644 --- a/Assets/VRM10/Runtime/IO/VrmSpringBoneAdapter.cs +++ b/Assets/VRM10/Runtime/IO/VrmSpringBoneAdapter.cs @@ -93,6 +93,7 @@ namespace UniVRM10 { spring.Joints.Add(new SpringBoneJoint { + Node = nodes.IndexOfThrow(y.Node), HitRadius = y.HitRadius, DragForce = y.DragForce, GravityDir = y.GravityDir.ToFloat3(), diff --git a/Assets/VRM10/Tests.PlayMode/MaterialTests.cs b/Assets/VRM10/Tests.PlayMode/MaterialTests.cs index a859550b6..12df81084 100644 --- a/Assets/VRM10/Tests.PlayMode/MaterialTests.cs +++ b/Assets/VRM10/Tests.PlayMode/MaterialTests.cs @@ -13,7 +13,7 @@ namespace UniVRM10.Test { public class MaterialTests { - const string _vrmPath = "Tests/Models/Alicia_vrm-1.00/AliciaSolid_vrm-1.00.vrm"; + const string _vrmPath = "Tests/Models/Alicia_vrm-0.51/AliciaSolid_vrm-0.51.vrm"; string[] _mtooSrgbTextureProperties = { VrmLib.MToon.Utils.PropMainTex, @@ -33,6 +33,10 @@ namespace UniVRM10.Test { var fi = new FileInfo(_vrmPath); var bytes = File.ReadAllBytes(fi.FullName); + + // migrate to 1.0 + bytes = Migration.Migrate(bytes); + return ToUnity(bytes); }