From 736740c157bc884260aeebd379bf76b8d5e49464 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 12 Jun 2025 13:06:30 +0900 Subject: [PATCH] UniVRM-0.130.0 --- Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs | 6 +++--- Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs | 6 +++--- Assets/UniGLTF/package.json | 2 +- Assets/VRM/package.json | 4 ++-- .../ClothSample/ClothViewer/Motions/BvhMotion.cs | 2 +- .../Samples~/VRM10Viewer/FaceCameraTarget.asset | 5 ++--- .../VRM10Viewer/UIToolkit/VRM10MainView.cs | 2 +- .../Samples~/VRM10Viewer/VRM10ViewerController.cs | 2 +- .../Samples~/VRM10Viewer/VRM10VisualPrimitive.cs | 2 +- .../Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs | 2 +- Assets/VRM10/package.json | 4 ++-- ProjectSettings/Vrm10ProjectEditorSettings.asset | 15 +++++++++++++++ 12 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 ProjectSettings/Vrm10ProjectEditorSettings.asset diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs index 8261452a4..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 = 1; - public const string VERSION = "0.129.1"; + 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 b81fd8008..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 = 1; - public const string VERSION = "2.65.1"; + 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 378ea1c48..9defb536e 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.129.1", + "version": "0.130.0", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2021.3", diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 07572e3f1..88868f576 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.129.1", + "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.1", + "com.vrmc.gltf": "0.130.0", "com.unity.ugui": "1.0.0" }, "samples": [ diff --git a/Assets/VRM10/Samples~/ClothSample/ClothViewer/Motions/BvhMotion.cs b/Assets/VRM10/Samples~/ClothSample/ClothViewer/Motions/BvhMotion.cs index e6c397046..671f79fbd 100644 --- a/Assets/VRM10/Samples~/ClothSample/ClothViewer/Motions/BvhMotion.cs +++ b/Assets/VRM10/Samples~/ClothSample/ClothViewer/Motions/BvhMotion.cs @@ -28,7 +28,7 @@ namespace UniVRM10.Cloth.Viewer // create SkinnedMesh for bone visualize var animator = m_context.Root.GetComponent(); m_boxMan = SkeletonMeshUtility.CreateRenderer(animator); - var shaderName = UnityEngine.Rendering.GraphicsSettings.renderPipelineAsset == null + var shaderName = UnityEngine.Rendering.GraphicsSettings.defaultRenderPipeline == null ? "Standard" : "Universal Render Pipeline/Lit" ; diff --git a/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset b/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset index dc5b55f8e..4a4a1220c 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset +++ b/Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset @@ -10,10 +10,8 @@ CustomRenderTexture: m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 5 + serializedVersion: 6 m_Width: 300 m_Height: 300 m_AntiAliasing: 1 @@ -24,6 +22,7 @@ CustomRenderTexture: m_GenerateMips: 1 m_SRGB: 0 m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 m_EnableRandomWrite: 0 diff --git a/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs b/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs index 006291804..23a5b1495 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs @@ -106,7 +106,7 @@ namespace UniVRM10.VRM10Viewer QueryOrAssert(out m_useCustomPbrMaterial, root, "UseCustomPbrMaterial"); QueryOrAssert(out m_useCustomMToonMaterial, root, "UseCustomMToonMaterial"); // URP かつ WebGL で有効にする - m_useCustomMToonMaterial.value = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.renderPipelineAsset != null; + m_useCustomMToonMaterial.value = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.defaultRenderPipeline != null; QueryOrAssert(out m_motionMode, root, "MotionMode"); QueryOrAssert(out m_springboneExternalX, root, "SpringboneExternalX"); QueryOrAssert(out m_springboneExternalY, root, "SpringboneExternalY"); diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerController.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerController.cs index 067fe204b..d0a1e2072 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerController.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerController.cs @@ -115,7 +115,7 @@ namespace UniVRM10.VRM10Viewer if (m_motion != null) { Motion = BvhMotion.LoadBvhFromText(m_motion.text); - if (GraphicsSettings.renderPipelineAsset != null + if (GraphicsSettings.defaultRenderPipeline != null && m_pbrAlphaBlendMaterial != null) { Motion.SetBoxManMaterial(GameObject.Instantiate(m_pbrOpaqueMaterial)); diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs index b87a30f79..3a8b200ad 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs @@ -30,7 +30,7 @@ namespace UniVRM10.VRM10Viewer visual.transform.localScale = Vector3.one; // URP 判定 - if (GraphicsSettings.renderPipelineAsset != null + if (GraphicsSettings.defaultRenderPipeline != null // WebGL ビルドでは GraphicsSettings.renderPipelineAsset が常に null ? || Application.platform == RuntimePlatform.WebGLPlayer) { diff --git a/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs index e316d9d7d..88332f56c 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs @@ -180,7 +180,7 @@ namespace UniVRM10.VRM10Viewer private void Start() { // URP かつ WebGL で有効にする - m_useCustomMToonMaterial.isOn = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.renderPipelineAsset != null; + m_useCustomMToonMaterial.isOn = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.defaultRenderPipeline != null; m_autoEmotion = gameObject.AddComponent(); m_autoBlink = gameObject.AddComponent(); diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index c9dd836eb..926543518 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.129.1", + "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.1" + "com.vrmc.gltf": "0.130.0" }, "samples": [ { diff --git a/ProjectSettings/Vrm10ProjectEditorSettings.asset b/ProjectSettings/Vrm10ProjectEditorSettings.asset new file mode 100644 index 000000000..124120f60 --- /dev/null +++ b/ProjectSettings/Vrm10ProjectEditorSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b096596ea97420ca637d240bc264e28, type: 3} + m_Name: + m_EditorClassIdentifier: + materialDescriptorGeneratorFactory: {fileID: 0}