From 9e879e1825f2e99d469492803e61c3af89ef596b Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Wed, 21 Sep 2022 18:36:18 +0900 Subject: [PATCH 1/2] change spec of mtoon10 matcapFactor default value --- .../VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader index 0c3ade27c..76e3d25a9 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/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 From a0225b2a58e5081da70b31a77758511b632d1b66 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Wed, 21 Sep 2022 18:36:31 +0900 Subject: [PATCH 2/2] fix seed-san material --- .../ModelSetup_SeedSan/Materials/mtoon/New Material.mat | 1 + .../ModelSetup_SeedSan/Materials/mtoon/anim_logo.mat | 7 +++++-- .../ModelSetup_SeedSan/Materials/mtoon/arm_mat.mat | 3 ++- .../ModelSetup_SeedSan/Materials/mtoon/arm_plastic.mat | 3 ++- .../ModelSetup_SeedSan/Materials/mtoon/armgear_plastic.mat | 3 ++- .../ModelSetup_SeedSan/Materials/mtoon/body_bake.mat | 5 +++-- .../ModelSetup_SeedSan/Materials/mtoon/body_nm.mat | 3 ++- .../ModelSetup_SeedSan/Materials/mtoon/eye.mat | 5 +++-- .../ModelSetup_SeedSan/Materials/mtoon/eye_trans.mat | 5 +++-- .../ModelSetup_SeedSan/Materials/mtoon/hair.mat | 5 +++-- .../ModelSetup_SeedSan/Materials/mtoon/huku_bake.mat | 5 +++-- .../ModelSetup_SeedSan/Materials/mtoon/robo_face.mat | 5 +++-- 12 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/New Material.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/New Material.mat index d19d81b56..b88823343 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/New Material.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/New Material.mat @@ -124,6 +124,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/anim_logo.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/anim_logo.mat index b9fdf3e34..26e1a9cc2 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/anim_logo.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/anim_logo.mat @@ -130,6 +130,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -146,11 +147,11 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.364 - _ShadingGradeRate: 1 - - _ShadingShiftFactor: 0 + - _ShadingShiftFactor: -0.1 - _ShadingShiftTexScale: 1 - _ShadingToonyFactor: 0.9 - _SmoothnessTextureChannel: 0 @@ -168,6 +169,8 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_mat.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_mat.mat index bb1df16b8..0b4110e3b 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_mat.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_mat.mat @@ -130,7 +130,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -169,6 +169,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 0.31132078, g: 0.31132078, b: 0.31132078, a: 1} - _ShadeColor: {r: 0.6909932, g: 0.6629583, b: 0.735849, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_plastic.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_plastic.mat index 547775e9e..45b9a5a39 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_plastic.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_plastic.mat @@ -131,7 +131,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -170,6 +170,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 0.31132078, g: 0.31132078, b: 0.31132078, a: 1} - _RimColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1} - _ShadeColor: {r: 0.620461, g: 0.644075, b: 0.6886792, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/armgear_plastic.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/armgear_plastic.mat index d97cbde85..ba70ef44b 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/armgear_plastic.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/armgear_plastic.mat @@ -130,7 +130,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -169,6 +169,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 0.09433961, g: 0.09433961, b: 0.09433961, a: 1} - _RimColor: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1} - _ShadeColor: {r: 0.6909932, g: 0.6629583, b: 0.735849, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_bake.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_bake.mat index 5f57261e4..a8de9fd8d 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_bake.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_bake.mat @@ -131,7 +131,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -148,7 +148,7 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.527 - _ShadingGradeRate: 1 @@ -170,6 +170,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0.5283019, g: 0.46351016, b: 0.4311143, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 1, g: 0.8059607, b: 0.740566, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_nm.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_nm.mat index e10078b47..ec89ee2ec 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_nm.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_nm.mat @@ -148,7 +148,7 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.364 - _ShadingGradeRate: 1 @@ -170,6 +170,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0.14509805, g: 0.14117648, b: 0.17254902, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 0.6909932, g: 0.6629583, b: 0.735849, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye.mat index d84046669..466fbc676 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye.mat @@ -130,7 +130,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -147,7 +147,7 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.364 - _ShadingGradeRate: 1 @@ -169,6 +169,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 0.6909932, g: 0.6629583, b: 0.735849, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye_trans.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye_trans.mat index 8fefe71b4..5f1306013 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye_trans.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye_trans.mat @@ -130,7 +130,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 10 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 5 - _M_ZWrite: 0 - _Metallic: 0 @@ -147,7 +147,7 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.5 - _ShadingGradeRate: 1 @@ -169,6 +169,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/hair.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/hair.mat index 920397d46..928939440 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/hair.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/hair.mat @@ -130,7 +130,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -147,7 +147,7 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.364 - _ShadingGradeRate: 1 @@ -169,6 +169,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/huku_bake.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/huku_bake.mat index 037fce92e..ae268e8b3 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/huku_bake.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/huku_bake.mat @@ -131,7 +131,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -148,7 +148,7 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.278 - _ShadingGradeRate: 1 @@ -170,6 +170,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0.42532933, g: 0.47665387, b: 0.509434, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} diff --git a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/robo_face.mat b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/robo_face.mat index 9e2cc088a..1af1626d9 100644 --- a/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/robo_face.mat +++ b/Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/robo_face.mat @@ -130,7 +130,7 @@ Material: - _M_CullMode: 2 - _M_DebugMode: 0 - _M_DstBlend: 0 - - _M_EditMode: 0 + - _M_EditMode: 1 - _M_SrcBlend: 1 - _M_ZWrite: 1 - _Metallic: 0 @@ -147,7 +147,7 @@ Material: - _RenderQueueOffset: 0 - _RimFresnelPower: 1 - _RimLift: 0 - - _RimLightingMix: 0 + - _RimLightingMix: 1 - _ShadeShift: 0 - _ShadeToony: 0.364 - _ShadingGradeRate: 1 @@ -169,6 +169,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 1.7207954, b: 0.5135358, a: 1} + - _MatcapColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 0, g: 0, b: 0, a: 1} - _ShadeColor: {r: 1, g: 1, b: 1, a: 1}