diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs index 8c8b3ff8f..f8e479e93 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs @@ -4,8 +4,8 @@ namespace UniGLTF public static partial class PackageVersion { public const int MAJOR = 0; - public const int MINOR = 129; - public const int PATCH = 3; - public const string VERSION = "0.129.3"; + public const int MINOR = 130; + public const int PATCH = 0; + public const string VERSION = "0.130.0"; } } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index e53ebd034..4f171fad0 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -4,8 +4,8 @@ namespace UniGLTF public static partial class UniGLTFVersion { public const int MAJOR = 2; - public const int MINOR = 65; - public const int PATCH = 3; - public const string VERSION = "2.65.3"; + public const int MINOR = 66; + public const int PATCH = 0; + public const string VERSION = "2.66.0"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index 97761e961..9defb536e 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.129.3", + "version": "0.130.0", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2021.3", diff --git a/Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef b/Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef index b356b2415..afadcbabe 100644 --- a/Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef +++ b/Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef @@ -6,7 +6,8 @@ "GUID:1cd941934d098654fa21a13f28346412", "GUID:b7aa47b240b57de44a4b2021c143c9bf", "GUID:05dd262a0c0a2f841b8252c8c3815582", - "GUID:3e5d614bc16b50d41bd94c8d7444ca46" + "GUID:3e5d614bc16b50d41bd94c8d7444ca46", + "GUID:d8b63aba1907145bea998dd612889d6b" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs index 8f55d7e3a..8f188653c 100644 --- a/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs +++ b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs @@ -343,15 +343,15 @@ namespace VRM.SimpleViewer m_loaded.EnableLipSyncValue = m_enableLipSync.isOn; m_loaded.EnableBlinkValue = m_enableAutoBlink.isOn; m_loaded.SetSpringboneModelLevel(new UniGLTF.SpringBoneJobs.Blittables.BlittableModelLevel - { - ExternalForce = new Vector3( + ( + externalForce: new Vector3( m_springExternalX.value, m_springExternalY.value, m_springExternalZ.value ), - StopSpringBoneWriteback = m_springBonePause.isOn, - SupportsScalingAtRuntime = m_springBoneScaling.isOn, - }); + stopSpringBoneWriteback: m_springBonePause.isOn, + supportsScalingAtRuntime: m_springBoneScaling.isOn + )); m_loaded.Update(); } } diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index b40b7f445..88868f576 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.129.3", + "version": "0.130.0", "displayName": "VRM", "description": "VRM importer", "unity": "2021.3", @@ -14,7 +14,7 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.gltf": "0.129.3", + "com.vrmc.gltf": "0.130.0", "com.unity.ugui": "1.0.0" }, "samples": [ diff --git a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarp.asmdef b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarp.asmdef index 6801da68a..93ddd3c01 100644 --- a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarp.asmdef +++ b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarp.asmdef @@ -6,7 +6,8 @@ "GUID:e47c917724578cc43b5506c17a27e9a0", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:1cd941934d098654fa21a13f28346412", - "GUID:5f875fdc81c40184c8333b9d63c6ddd5" + "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:d8b63aba1907145bea998dd612889d6b" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarpRuntime.cs b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarpRuntime.cs index 883af31c2..a36b11498 100644 --- a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarpRuntime.cs +++ b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarpRuntime.cs @@ -135,12 +135,7 @@ namespace UniVRM10.ClothWarp // } } - public void Process() - { - Process(Time.deltaTime); - } - - void Process(float deltaTime) + public void Process(float deltaTime) { if (!_initialized) { diff --git a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/ClothWarpJobRuntime.cs b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/ClothWarpJobRuntime.cs index e4461c273..294216ad1 100644 --- a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/ClothWarpJobRuntime.cs +++ b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/ClothWarpJobRuntime.cs @@ -193,14 +193,12 @@ namespace UniVRM10.ClothWarp.Jobs var colliderTransformIndex = GetOrAddColliderTransform(collider.transform); colliderRef.Add(colliderInfo.Count); - colliderInfo.Add(new BlittableCollider - { - offset = collider.Offset, - radius = collider.Radius, - tailOrNormal = collider.TailOrNormal, - colliderType = TranslateColliderType(collider.ColliderType), - transformIndex = colliderTransformIndex, - }); + colliderInfo.Add(new BlittableCollider( + offset: collider.Offset, + radius: collider.Radius, + tailOrNormal: collider.TailOrNormal, + colliderType: TranslateColliderType(collider.ColliderType), + colliderTransformIndex: colliderTransformIndex)); _colliders.Add(collider); } @@ -410,11 +408,6 @@ namespace UniVRM10.ClothWarp.Jobs } } - public void Process() - { - Process(Time.deltaTime); - } - public void Process(float deltaTime) { var frame = new FrameInfo(deltaTime, Vector3.zero); diff --git a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/Particle.cs b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/Particle.cs index 2df9886ab..0da858cd4 100644 --- a/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/Particle.cs +++ b/Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/Particle.cs @@ -39,14 +39,12 @@ namespace UniVRM10.ClothWarp.Jobs public BlittableJointMutable ToBlittableJointMutable() { - return new BlittableJointMutable - { - stiffnessForce = Stiffness, - gravityPower = 1.0f, - gravityDir = Gravity, - dragForce = Deceleration, - radius = Radius, - }; + return new BlittableJointMutable( + stiffnessForce: Stiffness, + gravityPower: 1.0f, + gravityDir: Gravity, + dragForce: Deceleration, + radius: Radius); } } diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs index feffbc680..19eb48b60 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs @@ -4,9 +4,11 @@ namespace UniVRM10.VRM10Viewer { class UnlitMaterialImporter : IMaterialImporter { + public BuiltInGltfUnlitMaterialImporter GltfUnlitMaterialImporter { get; } = new(); + bool IMaterialImporter.TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc) { - return BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc); + return GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc); } } } \ No newline at end of file diff --git a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs index b0b04f5c1..85d939350 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs @@ -7,9 +7,11 @@ namespace UniVRM10.VRM10Viewer /// public class UrpMToonMaterialImporter : IMaterialImporter { + public UrpVrm10MToonMaterialImporter MToonMaterialImporter { get; } = new(); + public bool TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc) { - if (UrpVrm10MToonMaterialImporter.TryCreateParam(data, i, out matDesc)) + if (MToonMaterialImporter.TryCreateParam(data, i, out matDesc)) { return true; } diff --git a/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs b/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs index 23a5b1495..8e45be6d8 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs @@ -185,15 +185,14 @@ namespace UniVRM10.VRM10Viewer m_controller.ShowBoxMan(m_showBoxMan.value); if (m_controller.TryUpdate( m_motionMode.value == 0, - new BlittableModelLevel - { - ExternalForce = new Vector3( + new BlittableModelLevel( + externalForce: new Vector3( m_springboneExternalX.value, m_springboneExternalY.value, m_springboneExternalZ.value), - StopSpringBoneWriteback = m_useSpringbonePause.value, - SupportsScalingAtRuntime = m_useSpringboneScaling.value, - }, + stopSpringBoneWriteback: m_useSpringbonePause.value, + supportsScalingAtRuntime: m_useSpringboneScaling.value + ), out var loaded )) { diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef b/Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef index b5eb2e01e..705584a0a 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef @@ -7,7 +7,8 @@ "GUID:e47c917724578cc43b5506c17a27e9a0", "GUID:1cd941934d098654fa21a13f28346412", "GUID:3e5d614bc16b50d41bd94c8d7444ca46", - "GUID:f06555f75b070af458a003d92f9efb00" + "GUID:f06555f75b070af458a003d92f9efb00", + "GUID:d8b63aba1907145bea998dd612889d6b" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs index 88332f56c..1610570e6 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs @@ -226,12 +226,11 @@ namespace UniVRM10.VRM10Viewer m_controller.ShowBoxMan(m_showBoxMan.isOn); if (m_controller.TryUpdate( m_ui.IsTPose, - new BlittableModelLevel - { - ExternalForce = new Vector3(m_springboneExternalX.value, m_springboneExternalY.value, m_springboneExternalZ.value), - StopSpringBoneWriteback = m_springbonePause.isOn, - SupportsScalingAtRuntime = m_springboneScaling.isOn, - }, + new BlittableModelLevel( + externalForce: new Vector3(m_springboneExternalX.value, m_springboneExternalY.value, m_springboneExternalZ.value), + stopSpringBoneWriteback: m_springbonePause.isOn, + supportsScalingAtRuntime: m_springboneScaling.isOn + ), out var loaded )) { diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index 2a684679b..926543518 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.129.3", + "version": "0.130.0", "displayName": "VRM-1.0", "description": "VRM-1.0 importer", "unity": "2021.3", @@ -15,7 +15,7 @@ }, "dependencies": { "com.unity.timeline": "1.7.6", - "com.vrmc.gltf": "0.129.3" + "com.vrmc.gltf": "0.130.0" }, "samples": [ {