breaking !

2026-04-25 07:28:51 -05:00 · 2024-08-02 19:46:48 +09:00 · 2024-08-02 19:46:48 +09:00 · 786541e735
commit 786541e735
parent f259df1377
22 changed files with 160 additions and 505 deletions
--- 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 = 124;
-        public const int PATCH = 2;
-        public const string VERSION = "0.124.2";
+        public const int MINOR = 125;
+        public const int PATCH = 0;
+        public const string VERSION = "0.125.0";
    }
 }
--- 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 = 60;
-        public const int PATCH = 2;
-        public const string VERSION = "2.60.2";
+        public const int MINOR = 61;
+        public const int PATCH = 0;
+        public const string VERSION = "2.61.0";
    }
 }
--- a/Assets/UniGLTF/Samples~/GltfViewer/GltfViewer.cs
+++ b/Assets/UniGLTF/Samples~/GltfViewer/GltfViewer.cs
@ -31,7 +31,7 @@ namespace UniGLTF.GltfViewer
            LoadPathAsync(path);
        }

-        async void LoadPathAsync(VRMShaders.PathObject path)
+        async void LoadPathAsync(PathObject path)
        {
            if (_instance)
            {
--- a/Assets/UniGLTF/Samples~/GltfViewer/OpenFileDialog/OpenFileDialog.cs
+++ b/Assets/UniGLTF/Samples~/GltfViewer/OpenFileDialog/OpenFileDialog.cs
@ -2,10 +2,10 @@ namespace UniGLTF.GltfViewer
 {
    public static class OpenFileDialog
    {
-        public static VRMShaders.PathObject Show(string title, params string[] extensions)
+        public static PathObject Show(string title, params string[] extensions)
        {
 #if UNITY_STANDALONE_WIN
-            return VRMShaders.PathObject.FromFullPath(FileDialogForWindows.FileDialog(title, extensions));
+            return PathObject.FromFullPath(FileDialogForWindows.FileDialog(title, extensions));
 #else
            UnityEngine.Debug.LogWarning("Non-Windows runtime file dialogs are not yet implemented.");
            return default;
--- a/Assets/UniGLTF/Samples~/UniHumanoid/HumanBuilderTest.cs
+++ b/Assets/UniGLTF/Samples~/UniHumanoid/HumanBuilderTest.cs
@ -119,7 +119,11 @@ namespace UniHumanoid
                builder.AddLeg(0.1f, 0.3f, 0.4f, 0.1f, 0.1f);

                var description = AvatarDescription.Create(builder.Skeleton);
-                var animator = GetComponentOrThrow<Animator>();
+                var animator = GetComponent<Animator>();
+                if (animator == null)
+                {
+                    throw new System.ArgumentException("no animator");
+                }
                animator.avatar = description.CreateAvatar(root);

                // create SkinnedMesh for bone visualize
@ -132,7 +136,8 @@ namespace UniHumanoid
                renderer.sharedMaterial = m_material;
                //root.gameObject.AddComponent<BoneMapping>();

-                if (TryGetComponent<HumanPoseTransfer>(out var transfer))
+                var transfer = GetComponent<HumanPoseTransfer>();
+                if (transfer != null)
                {
                    transfer.Avatar = animator.avatar;
                    transfer.Setup();
--- a/Assets/UniGLTF/package.json
+++ b/Assets/UniGLTF/package.json
@ -1,6 +1,6 @@
 {
  "name": "com.vrmc.gltf",
-  "version": "0.124.2",
+  "version": "0.125.0",
  "displayName": "UniGLTF",
  "description": "GLTF importer and exporter",
  "unity": "2021.3",
--- a/Assets/VRM/Samples~/FirstPersonSample/VRMRuntimeLoader.cs
+++ b/Assets/VRM/Samples~/FirstPersonSample/VRMRuntimeLoader.cs
@ -3,7 +3,6 @@ using System.IO;
 using UniGLTF;
 using UnityEngine;

-
 namespace VRM.FirstPersonSample
 {
    public class VRMRuntimeLoader : MonoBehaviour
@ -114,7 +113,7 @@ namespace VRM.FirstPersonSample
            var loaded = default(RuntimeGltfInstance);
            if (m_loadAsync)
            {
-                loaded = await context.LoadAsync(new VRMShaders.RuntimeOnlyAwaitCaller());
+                loaded = await context.LoadAsync(new RuntimeOnlyAwaitCaller());
            }
            else
            {
--- a/Assets/VRM/Samples~/RuntimeExporterSample/VRMRuntimeExporter.cs
+++ b/Assets/VRM/Samples~/RuntimeExporterSample/VRMRuntimeExporter.cs
@ -1,7 +1,6 @@
 using System.IO;
+using UniGLTF;
 using UnityEngine;
-using VRMShaders;
-

 namespace VRM.RuntimeExporterSample
 {
--- a/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
+++ b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
@ -7,8 +7,6 @@ using UniGLTF;
 using UniHumanoid;
 using UnityEngine;
 using UnityEngine.UI;
-using VRMShaders;
-

 namespace VRM.SimpleViewer
 {
--- a/Assets/VRM/package.json
+++ b/Assets/VRM/package.json
@ -1,6 +1,6 @@
 {
  "name": "com.vrmc.univrm",
-  "version": "0.124.2",
+  "version": "0.125.0",
  "displayName": "VRM",
  "description": "VRM importer",
  "unity": "2021.3",
@ -14,7 +14,7 @@
    "name": "VRM Consortium"
  },
  "dependencies": {
-    "com.vrmc.gltf": "0.124.2",
+    "com.vrmc.gltf": "0.125.0",
    "com.unity.ugui": "1.0.0"
  },
  "samples": [
--- a/Assets/VRM10/Samples~/SimpleVrma/SimpleVrma.cs
+++ b/Assets/VRM10/Samples~/SimpleVrma/SimpleVrma.cs
@ -1,8 +1,7 @@
 using UniGLTF;
 using UnityEngine;
 using UniVRM10;
-using UniVRM10.VRM10Viewer;
-using VRMShaders;
+
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@ -47,7 +46,7 @@ public class SimpleVrma : MonoBehaviour
            showMeshes: false,
            awaitCaller: new ImmediateCaller());

-        var instance = Vrm.GetComponentOrThrow<RuntimeGltfInstance>();
+        var instance = Vrm.GetComponent<RuntimeGltfInstance>();
        instance.ShowMeshes();
    }

@ -58,11 +57,11 @@ public class SimpleVrma : MonoBehaviour
        using var loader = new VrmAnimationImporter(data);
        var instance = await loader.LoadAsync(new ImmediateCaller());

-        Vrma = instance.GetComponentOrThrow<Vrm10AnimationInstance>();
+        Vrma = instance.GetComponent<Vrm10AnimationInstance>();
        Vrm.Runtime.VrmAnimation = Vrma;
        Debug.Log(Vrma);

-        var animation = Vrma.GetComponentOrThrow<Animation>();
+        var animation = Vrma.GetComponent<Animation>();
        animation.Play();
    }
 }
--- a/Assets/VRM10/Samples~/URPSample/Runtime/UrpSampleUI.cs
+++ b/Assets/VRM10/Samples~/URPSample/Runtime/UrpSampleUI.cs
@ -46,7 +46,7 @@ namespace UniVRM10.URPSample
                    return;
                }

-                var instance = _loadedVrm.GetComponentOrThrow<RuntimeGltfInstance>();
+                var instance = _loadedVrm.GetComponent<RuntimeGltfInstance>();
                instance.ShowMeshes();
                instance.EnableUpdateWhenOffscreen();
                
--- a/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
+++ b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
@ -33,7 +33,8 @@ namespace UniVRM10.FirstPersonSample
            m_target.Source = m_source;
            m_target.SourceType = UniHumanoid.HumanPoseTransfer.HumanPoseTransferSourceType.HumanPoseTransfer;

-            if (m_target.TryGetComponent<Animator>(out var animator))
+            var animator = m_target.GetComponent<Animator>();
+            if (animator != null)
            {
                if (m_faceCamera != null)
                {
@ -68,7 +69,7 @@ namespace UniVRM10.FirstPersonSample
                return;
            }

-            var instance = await LoadAsync(path, new VRMShaders.RuntimeOnlyAwaitCaller());
+            var instance = await LoadAsync(path, new RuntimeOnlyAwaitCaller());

            var root = instance.gameObject;
            root.transform.SetParent(transform, false);
@ -83,14 +84,14 @@ namespace UniVRM10.FirstPersonSample
            SetupTarget(m_target);
        }

-        async Task<Vrm10Instance> LoadAsync(string path, VRMShaders.IAwaitCaller awaitCaller)
+        async Task<Vrm10Instance> LoadAsync(string path, IAwaitCaller awaitCaller)
        {
            var instance = await Vrm10.LoadPathAsync(path, awaitCaller: awaitCaller, showMeshes: false);

            // VR用 FirstPerson 設定
            await instance.Vrm.FirstPerson.SetupAsync(instance.gameObject, awaitCaller);

-            instance.GetComponentOrThrow<RuntimeGltfInstance>().ShowMeshes();
+            instance.GetComponent<RuntimeGltfInstance>().ShowMeshes();

            return instance;
        }
@ -126,7 +127,7 @@ namespace UniVRM10.FirstPersonSample
            {
                GameObject.Destroy(m_source.gameObject);
            }
-            m_source = context.Root.GetComponentOrThrow<UniHumanoid.HumanPoseTransfer>();
+            m_source = context.Root.GetComponent<UniHumanoid.HumanPoseTransfer>();

            SetupTarget(m_target);
        }
--- a/Assets/VRM10/Samples~/VRM10RuntimeExporterSample/VRM10RuntimeExporter.cs
+++ b/Assets/VRM10/Samples~/VRM10RuntimeExporterSample/VRM10RuntimeExporter.cs
@ -1,7 +1,6 @@
 using System.IO;
 using UniGLTF;
 using UnityEngine;
-using VRMShaders;

 namespace UniVRM10.RuntimeExporterSample
 {
@ -47,7 +46,7 @@ namespace UniVRM10.RuntimeExporterSample
            }

            var vrm10 = await Vrm10.LoadPathAsync(path);
-            var loaded = vrm10.GetComponentOrThrow<UniGLTF.RuntimeGltfInstance>();
+            var loaded = vrm10.GetComponent<UniGLTF.RuntimeGltfInstance>();
            loaded.ShowMeshes();
            loaded.EnableUpdateWhenOffscreen();

@ -143,10 +142,7 @@ namespace UniVRM10.RuntimeExporterSample
                model.ConvertCoordinate(VrmLib.Coordinates.Vrm1, ignoreVrm: false);

                // export vrm-1.0
-                var exporter = new UniVRM10.Vrm10Exporter(new RuntimeTextureSerializer(), new GltfExportSettings
-                {
-
-                });
+                var exporter = new Vrm10Exporter(new GltfExportSettings());
                exporter.Export(root, model, converter, new VrmLib.ExportArgs
                {
                }, meta);
--- a/Assets/VRM10/Samples~/VRM10Viewer/Motions/BvhMotion.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/Motions/BvhMotion.cs
@ -28,7 +28,10 @@ namespace UniVRM10.VRM10Viewer
            // create SkinnedMesh for bone visualize
            var animator = m_context.Root.GetComponent<Animator>();
            m_boxMan = SkeletonMeshUtility.CreateRenderer(animator);
-            var material = new Material(Shader.Find("Standard"));
+            var tmpPrimitive = GameObject.CreatePrimitive(PrimitiveType.Quad);
+            var defaultMaterial = tmpPrimitive.GetComponent<Renderer>().sharedMaterial;
+            var material = new Material(defaultMaterial);
+            GameObject.Destroy(tmpPrimitive);
            BoxMan.sharedMaterial = material;
            var mesh = BoxMan.sharedMesh;
            mesh.name = "box-man";
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs
@ -1,5 +1,4 @@
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;


--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity
@ -867,82 +867,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &251940583
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 251940584}
-  - component: {fileID: 251940586}
-  - component: {fileID: 251940585}
-  m_Layer: 5
-  m_Name: Checkmark
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &251940584
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251940583}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 452923209}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &251940585
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251940583}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!222 &251940586
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251940583}
-  m_CullTransparentMesh: 0
 --- !u!1 &284921870
 GameObject:
  m_ObjectHideFlags: 0
@ -1113,11 +1037,9 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 322182885}
-  - component: {fileID: 322182888}
-  - component: {fileID: 322182887}
  - component: {fileID: 322182886}
  m_Layer: 0
-  m_Name: Plane
+  m_Name: Floor
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -1138,70 +1060,19 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &322182886
-MeshRenderer:
+--- !u!114 &322182886
+MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 322182884}
  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 1
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &322182887
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 322182884}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!33 &322182888
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 322182884}
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1e6b73d090be404cad1a0e9839366ce2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _primitiveType: 4
 --- !u!1 &339774396
 GameObject:
  m_ObjectHideFlags: 0
@ -1250,7 +1121,6 @@ RectTransform:
  - {fileID: 634488421}
  - {fileID: 1767738854}
  - {fileID: 103723704}
-  - {fileID: 1438613464}
  - {fileID: 602093298}
  m_Father: {fileID: 124675794}
  m_RootOrder: 0
@ -1480,83 +1350,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 20, y: 20}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &452923208
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 452923209}
-  - component: {fileID: 452923211}
-  - component: {fileID: 452923210}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &452923209
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 452923208}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 251940584}
-  m_Father: {fileID: 1438613464}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 10, y: -10}
-  m_SizeDelta: {x: 20, y: 20}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &452923210
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 452923208}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!222 &452923211
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 452923208}
-  m_CullTransparentMesh: 0
 --- !u!1 &488934504
 GameObject:
  m_ObjectHideFlags: 0
@ -1905,7 +1698,7 @@ RectTransform:
  - {fileID: 154330168}
  - {fileID: 1954133885}
  m_Father: {fileID: 339774397}
-  m_RootOrder: 18
+  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -2533,10 +2326,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 802105004}
-  - component: {fileID: 802105003}
-  - component: {fileID: 802105002}
-  - component: {fileID: 802105001}
  - component: {fileID: 802105005}
+  - component: {fileID: 802105006}
  m_Layer: 5
  m_Name: LookAtTarget
  m_TagString: Untagged
@ -2544,69 +2335,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!23 &802105001
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 802105000}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 1
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!135 &802105002
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 802105000}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &802105003
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 802105000}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!4 &802105004
 Transform:
  m_ObjectHideFlags: 0
@ -2638,6 +2366,19 @@ MonoBehaviour:
  m_angularVelocity: 40
  m_y: 1.5
  m_height: 3
+--- !u!114 &802105006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 802105000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1e6b73d090be404cad1a0e9839366ce2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _primitiveType: 0
 --- !u!1 &806723448
 GameObject:
  m_ObjectHideFlags: 0
@ -5617,93 +5358,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1434602808}
  m_CullTransparentMesh: 0
--- !u!1 &1438613463
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1438613464}
-  - component: {fileID: 1438613465}
-  m_Layer: 5
-  m_Name: UseUrpMaterial
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1438613464
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1438613463}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 452923209}
-  - {fileID: 2090837017}
-  m_Father: {fileID: 339774397}
-  m_RootOrder: 17
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 162, y: 20}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1438613465
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1438613463}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Highlighted
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 452923210}
-  toggleTransition: 1
-  graphic: {fileID: 251940585}
-  m_Group: {fileID: 0}
-  onValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_IsOn: 0
 --- !u!1 &1476033060
 GameObject:
  m_ObjectHideFlags: 0
@ -6033,6 +5687,7 @@ GameObject:
  - component: {fileID: 1629460661}
  - component: {fileID: 1629460658}
  - component: {fileID: 1629460657}
+  - component: {fileID: 1629460663}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@ -6121,6 +5776,39 @@ Transform:
  m_Father: {fileID: 241398689}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1629460663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1629460656}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
 --- !u!1 &1633219307
 GameObject:
  m_ObjectHideFlags: 0
@ -6828,7 +6516,6 @@ MonoBehaviour:
  m_enableLipSync: {fileID: 935566650}
  m_enableAutoBlink: {fileID: 634488422}
  m_enableAutoExpression: {fileID: 1767738855}
-  m_useUrpMaterial: {fileID: 1438613465}
  m_useAsync: {fileID: 602093299}
  m_target: {fileID: 802105000}
  m_motion: {fileID: 4900000, guid: 08df5151e71aed748b13547492fb8b9a, type: 3}
@ -7771,86 +7458,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2055567528}
  m_CullTransparentMesh: 1
--- !u!1 &2090837016
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2090837017}
-  - component: {fileID: 2090837019}
-  - component: {fileID: 2090837018}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &2090837017
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2090837016}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1438613464}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 9, y: -0.5}
-  m_SizeDelta: {x: -28, y: -3}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2090837018
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2090837016}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Use URP Material
--- !u!222 &2090837019
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2090837016}
-  m_CullTransparentMesh: 0
 --- !u!1 &2105159131
 GameObject:
  m_ObjectHideFlags: 0
@ -7942,6 +7549,7 @@ GameObject:
  m_Component:
  - component: {fileID: 2141451818}
  - component: {fileID: 2141451817}
+  - component: {fileID: 2141451819}
  m_Layer: 0
  m_Name: Directional Light
  m_TagString: Untagged
@ -8026,3 +7634,23 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 50, y: -210, z: 0}
+--- !u!114 &2141451819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2141451816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 1
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
@ -5,7 +5,6 @@ using System.Threading;
 using UniGLTF;
 using UnityEngine;
 using UnityEngine.UI;
-using VRMShaders;

 namespace UniVRM10.VRM10Viewer
 {
@ -42,9 +41,6 @@ namespace UniVRM10.VRM10Viewer
        [SerializeField]
        Toggle m_enableAutoExpression = default;

-        [SerializeField]
-        Toggle m_useUrpMaterial = default;
-
        [SerializeField]
        Toggle m_useAsync = default;

@ -270,7 +266,6 @@ namespace UniVRM10.VRM10Viewer
            m_enableLipSync = toggles.First(x => x.name == "EnableLipSync");
            m_enableAutoBlink = toggles.First(x => x.name == "EnableAutoBlink");
            m_enableAutoExpression = toggles.First(x => x.name == "EnableAutoExpression");
-            m_useUrpMaterial = toggles.First(x => x.name == "UseUrpMaterial");
            m_useAsync = toggles.First(x => x.name == "UseAsync");

 #if UNITY_2022_3_OR_NEWER
@ -545,8 +540,7 @@ namespace UniVRM10.VRM10Viewer
                var vrm10Instance = await Vrm10.LoadPathAsync(path,
                    canLoadVrm0X: true,
                    showMeshes: false,
-                    awaitCaller: m_useAsync.enabled ? (IAwaitCaller)new RuntimeOnlyAwaitCaller() : (IAwaitCaller)new ImmediateCaller(),
-                    materialGenerator: GetVrmMaterialDescriptorGenerator(m_useUrpMaterial.isOn),
+                    awaitCaller: m_useAsync.enabled ? new RuntimeOnlyAwaitCaller() : new ImmediateCaller(),
                    vrmMetaInformationCallback: m_texts.UpdateMeta,
                    ct: cancellationToken);
                if (cancellationToken.IsCancellationRequested)
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs
@ -0,0 +1,27 @@
+using UnityEngine;
+
+namespace UniVRM10.VRM10Viewer
+{
+    /// <summary>
+    /// Built-in RP と URP の差異を楽に吸収してプリミティブを表示するためのクラス
+    /// </summary>
+    public class VRM10VisualPrimitive : MonoBehaviour
+    {
+        [SerializeField] private PrimitiveType _primitiveType;
+
+        public PrimitiveType PrimitiveType
+        {
+            get => _primitiveType;
+            set => _primitiveType = value;
+        }
+
+        private void Start()
+        {
+            var visual = GameObject.CreatePrimitive(_primitiveType);
+            visual.transform.SetParent(transform);
+            visual.transform.localPosition = Vector3.zero;
+            visual.transform.localRotation = Quaternion.identity;
+            visual.transform.localScale = Vector3.one;
+        }
+    }
+}
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs.meta
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1e6b73d090be404cad1a0e9839366ce2
+timeCreated: 1721736320
--- a/Assets/VRM10/package.json
+++ b/Assets/VRM10/package.json
@ -1,6 +1,6 @@
 {
  "name": "com.vrmc.vrm",
-  "version": "0.124.2",
+  "version": "0.125.0",
  "displayName": "VRM-1.0",
  "description": "VRM-1.0 importer",
  "unity": "2021.3",
@ -14,7 +14,7 @@
    "name": "VRM Consortium"
  },
  "dependencies": {
-    "com.vrmc.gltf": "0.124.2"
+    "com.vrmc.gltf": "0.125.0"
  },
  "samples": [
    {
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@ -3,30 +3,34 @@
 --- !u!310 &1
 UnityConnectSettings:
  m_ObjectHideFlags: 0
+  serializedVersion: 1
  m_Enabled: 0
  m_TestMode: 0
-  m_TestEventUrl: 
-  m_TestConfigUrl: 
+  m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
+  m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
+  m_ConfigUrl: https://config.uca.cloud.unity3d.com
+  m_DashboardUrl: https://dashboard.unity3d.com
  m_TestInitMode: 0
  CrashReportingSettings:
-    m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
+    m_EventUrl: https://perf-events.cloud.unity3d.com
    m_Enabled: 0
+    m_LogBufferSize: 10
    m_CaptureEditorExceptions: 1
  UnityPurchasingSettings:
    m_Enabled: 0
    m_TestMode: 0
  UnityAnalyticsSettings:
    m_Enabled: 0
-    m_InitializeOnStartup: 1
    m_TestMode: 0
-    m_TestEventUrl: 
-    m_TestConfigUrl: 
+    m_InitializeOnStartup: 1
+    m_PackageRequiringCoreStatsPresent: 0
  UnityAdsSettings:
    m_Enabled: 0
    m_InitializeOnStartup: 1
    m_TestMode: 0
-    m_EnabledPlatforms: 4294967295
    m_IosGameId: 
    m_AndroidGameId: 
+    m_GameIds: {}
+    m_GameId: 
  PerformanceReportingSettings:
    m_Enabled: 0