From e63b1802c0e3aed3710a75417fbe1a02b4e924b4 Mon Sep 17 00:00:00 2001 From: AoiKamishiro Date: Mon, 8 Sep 2025 10:38:55 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"chor:=20URP=E7=89=88=E3=82=B7?= =?UTF-8?q?=E3=82=A7=E3=83=BC=E3=83=80=E3=83=BC=E3=81=AB=20ApplicationSpac?= =?UTF-8?q?eWarp=E5=AF=BE=E5=BF=9C=E3=82=92=E8=BF=BD=E5=8A=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f0cd4039c08ab350d4b4cb074865aa2d742e7449. --- Assets/VRM10/MToon10/Editor/MToonInspector.cs | 1 - .../UnityShaderLab/Properties/MToon10Prop.cs | 3 -- .../Properties/MToon10Properties.cs | 2 -- .../Shaders/vrmc_materials_mtoon_urp.shader | 31 +------------------ 4 files changed, 1 insertion(+), 36 deletions(-) diff --git a/Assets/VRM10/MToon10/Editor/MToonInspector.cs b/Assets/VRM10/MToon10/Editor/MToonInspector.cs index 488234c5e..0c8a3a05d 100644 --- a/Assets/VRM10/MToon10/Editor/MToonInspector.cs +++ b/Assets/VRM10/MToon10/Editor/MToonInspector.cs @@ -249,7 +249,6 @@ namespace VRM10.MToon10.Editor EditorGUILayout.LabelField("DstBlend", ((BlendMode)props[MToon10Prop.UnityDstBlend].floatValue).ToString()); EditorGUILayout.LabelField("ZWrite", ((UnityZWriteMode)props[MToon10Prop.UnityZWrite].floatValue).ToString()); EditorGUILayout.LabelField("AlphaToMask", ((UnityAlphaToMaskMode)props[MToon10Prop.UnityAlphaToMask].floatValue).ToString()); - EditorGUILayout.LabelField("XR Motion Vectors Pass (Space Warp)", (props[MToon10Prop.MotionVector].floatValue) > 0.5f ? "Enabled" : "Disabled"); EditorGUILayout.LabelField("Enabled Keywords", string.Join("\n", mat.shaderKeywords), EditorStyles.textArea); } } diff --git a/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs index b9078c6a1..f3e896097 100644 --- a/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs @@ -56,9 +56,6 @@ UnityDstBlend, UnityZWrite, UnityAlphaToMask, - - // Motion Vector - MotionVector, // for Editor EditorEditMode, diff --git a/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs index a467fba78..fa9904d85 100644 --- a/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs +++ b/Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs @@ -53,8 +53,6 @@ namespace VRM10.MToon10 [MToon10Prop.UnityZWrite] = "_M_ZWrite", [MToon10Prop.UnityAlphaToMask] = "_M_AlphaToMask", - [MToon10Prop.MotionVector] = "_XRMotionVectorsPass", - [MToon10Prop.EditorEditMode] = "_M_EditMode", }; diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader index 224001b0c..881ea9aa0 100644 --- a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader +++ b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader @@ -57,14 +57,11 @@ Shader "VRM10/Universal Render Pipeline/MToon10" _M_ZWrite ("_ZWrite", Float) = 1.0 _M_AlphaToMask ("_AlphaToMask", Float) = 0.0 - // Motion Vector - _XRMotionVectorsPass("_XRMotionVectorsPass", Float) = 1.0 - // etc _M_DebugMode ("_DebugMode", Float) = 0.0 // for Editor - _M_EditMode ("_EditMode", Float) = 0.0 + _M_EditMode ("_EditMode", Float) = 0.0 } // Shader Model 3.0 @@ -84,32 +81,6 @@ Shader "VRM10/Universal Render Pipeline/MToon10" "IgnoreProjector" = "True" } - Pass - { - Name "XRMotionVectors" - Tags { "LightMode" = "XRMotionVectors" } - ColorMask RGBA - - // Stencil write for obj motion pixels - Stencil - { - WriteMask 1 - Ref 1 - Comp Always - Pass Replace - } - - HLSLPROGRAM - #pragma shader_feature_local _ALPHATEST_ON - #pragma multi_compile _ LOD_FADE_CROSSFADE - #pragma shader_feature_local_vertex _ADD_PRECOMPUTED_VELOCITY - #define APPLICATION_SPACE_WARP_MOTION 1 - - #include "Packages/com.unity.render-pipelines.universal/Shaders/BakedLitInput.hlsl" - #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ObjectMotionVectors.hlsl" - ENDHLSL - } - // Universal Forward Pass Pass {