From 76563cdebb5fc90c2bea2df6f02c6e3199b5eb30 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 23 Dec 2024 14:04:26 +0900 Subject: [PATCH 1/3] MatCap Texture should be 0.0 when it doesn't exist. --- .../MToon10/Shaders/vrmc_materials_mtoon_lighting_mtoon.hlsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_lighting_mtoon.hlsl b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_lighting_mtoon.hlsl index 490c0d816..87917ac54 100644 --- a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_lighting_mtoon.hlsl +++ b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_lighting_mtoon.hlsl @@ -118,7 +118,7 @@ inline half3 GetMToonLighting_Rim_Matcap(const MToonInput input) return _MatcapColor.rgb * MTOON_SAMPLE_TEXTURE2D(_MatcapTex, matcapUv).rgb; } - return _MatcapColor.rgb; + return 0; } inline half3 GetMToonLighting_Rim(const UnityLighting unityLight, const MToonInput input, const half shadow) From 5d116ee89d8ccc47413eafa82c98985ceb7f9f36 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 23 Dec 2024 14:05:54 +0900 Subject: [PATCH 2/3] MatCapColor value should be [1,1,1] when it isn't defined. --- Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader index 2a2f8f632..82d476f83 100644 --- a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader +++ b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader @@ -29,7 +29,7 @@ Shader "VRM10/MToon10" _EmissionMap ("emissiveTexture", 2D) = "white" {} // Unity specified name // Rim Lighting - _MatcapColor ("mtoon.matcapFactor", Color) = (0, 0, 0, 1) + _MatcapColor ("mtoon.matcapFactor", Color) = (1, 1, 1, 1) _MatcapTex ("mtoon.matcapTexture", 2D) = "black" {} _RimColor ("mtoon.parametricRimColorFactor", Color) = (0, 0, 0, 1) _RimFresnelPower ("mtoon.parametricRimFresnelPowerFactor", Range(0, 100)) = 5.0 From 8d4b6d855c121b2460bf24d133df14bd290a9c91 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 23 Dec 2024 14:15:23 +0900 Subject: [PATCH 3/3] The MToon10 URP shader follows the MToon10 Built-inRP shader --- Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader index 6b5be5799..059953096 100644 --- a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader +++ b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader @@ -29,7 +29,7 @@ Shader "VRM10/Universal Render Pipeline/MToon10" _EmissionMap ("emissiveTexture", 2D) = "white" {} // Unity specified name // Rim Lighting - _MatcapColor ("mtoon.matcapFactor", Color) = (0, 0, 0, 1) + _MatcapColor ("mtoon.matcapFactor", Color) = (1, 1, 1, 1) _MatcapTex ("mtoon.matcapTexture", 2D) = "black" {} _RimColor ("mtoon.parametricRimColorFactor", Color) = (0, 0, 0, 1) _RimFresnelPower ("mtoon.parametricRimFresnelPowerFactor", Range(0, 100)) = 5.0