Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-27 21:34:38 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1818 from Santarh/fixMatcapFactor

Browse Source 
Fix `matcapFactor` default value and follow specification.
This commit is contained in:
ousttrue
2022-09-21 18:44:36 +09:00
committed by GitHub
parent efac395b1c a0225b2a58
commit a4d5156b80
13 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/New Material.mat
View File

@@ -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}

7
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/anim_logo.mat
View File

@@ -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: []

3
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_mat.mat
View File

@@ -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}

3
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/arm_plastic.mat
View File

@@ -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}

3
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/armgear_plastic.mat
View File

@@ -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}

5
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_bake.mat
View File

@@ -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}

3
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/body_nm.mat
View File

@@ -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}

5
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye.mat
View File

@@ -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}

5
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/eye_trans.mat
View File

@@ -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}

5
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/hair.mat
View File

@@ -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}

5
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/huku_bake.mat
View File

@@ -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}

5
Assets/VRM10_Samples/ModelSetup_SeedSan/Materials/mtoon/robo_face.mat
View File

@@ -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}

2
Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader
View File

@@ -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