From e3bf41178222145b7365ffcf4b81d44539e603ee Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 3 Mar 2025 20:08:40 +0900 Subject: [PATCH 1/2] revert a part of #2540 --- Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader | 2 +- Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader index 82d476f83..2a2f8f632 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) = (1, 1, 1, 1) + _MatcapColor ("mtoon.matcapFactor", Color) = (0, 0, 0, 1) _MatcapTex ("mtoon.matcapTexture", 2D) = "black" {} _RimColor ("mtoon.parametricRimColorFactor", Color) = (0, 0, 0, 1) _RimFresnelPower ("mtoon.parametricRimFresnelPowerFactor", Range(0, 100)) = 5.0 diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader index 059953096..6b5be5799 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) = (1, 1, 1, 1) + _MatcapColor ("mtoon.matcapFactor", Color) = (0, 0, 0, 1) _MatcapTex ("mtoon.matcapTexture", 2D) = "black" {} _RimColor ("mtoon.parametricRimColorFactor", Color) = (0, 0, 0, 1) _RimFresnelPower ("mtoon.parametricRimFresnelPowerFactor", Range(0, 100)) = 5.0 From f2fc164af66a2630c9e4769d1cf237d26bfb6115 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 3 Mar 2025 20:11:24 +0900 Subject: [PATCH 2/2] comment --- Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader | 2 +- Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon.shader index 2a2f8f632..469a34000 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) = (0, 0, 0, 1) // 仕様のデフォルト値は白だが、過去の仕様違反 UniVRM 実装アプリケーションのために黒とする。 https://github.com/vrm-c/UniVRM/pull/2594 _MatcapTex ("mtoon.matcapTexture", 2D) = "black" {} _RimColor ("mtoon.parametricRimColorFactor", Color) = (0, 0, 0, 1) _RimFresnelPower ("mtoon.parametricRimFresnelPowerFactor", Range(0, 100)) = 5.0 diff --git a/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader b/Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader index 6b5be5799..881ea9aa0 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) = (0, 0, 0, 1) // 仕様のデフォルト値は白だが、過去の仕様違反 UniVRM 実装アプリケーションのために黒とする。 https://github.com/vrm-c/UniVRM/pull/2594 _MatcapTex ("mtoon.matcapTexture", 2D) = "black" {} _RimColor ("mtoon.parametricRimColorFactor", Color) = (0, 0, 0, 1) _RimFresnelPower ("mtoon.parametricRimFresnelPowerFactor", Range(0, 100)) = 5.0