From cf1698293d69c7ba6ce3fc0a8dfb2969b013bc67 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 7 Jun 2021 19:32:26 +0900 Subject: [PATCH] fix VRMMaterialTests.ExportTest. Shaders (vrm/unlitXXX) are not exists. --- .../Resources/Materials/vrm_unlit_cutout.mat | 7 +- .../Resources/Materials/vrm_unlit_texture.mat | 7 +- .../Materials/vrm_unlit_transparent.mat | 7 +- .../vrm_unlit_transparent_zwrite.mat | 72 ++++++++++++++++--- 4 files changed, 76 insertions(+), 17 deletions(-) diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat index 011092463..624bde342 100644 --- a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat +++ b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_cutout.mat @@ -4,10 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vrm_unlit_cutout - m_Shader: {fileID: 4800000, guid: 4c9ce97af40038f45811fc4b0975a483, type: 3} + m_Shader: {fileID: 10751, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat index 7dfbd566c..9af076473 100644 --- a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat +++ b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_texture.mat @@ -4,10 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vrm_unlit_texture - m_Shader: {fileID: 4800000, guid: 1a70c9898704e1a4691843883f5101af, type: 3} + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat index 61741df5c..cf6e5c489 100644 --- a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat +++ b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent.mat @@ -4,10 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vrm_unlit_transparent - m_Shader: {fileID: 4800000, guid: df359ad0838642d4fa0339514fcbbb2d, type: 3} + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat index bc0c008e2..91f23ab4b 100644 --- a/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat +++ b/Assets/VRM.Samples/Resources/Materials/vrm_unlit_transparent_zwrite.mat @@ -4,16 +4,18 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: vrm_unlit_transparent_zwrite - m_Shader: {fileID: 4800000, guid: 429a3203ab2959741aab76fa2856b450, type: 3} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 1a97144e4ad27a04aafd70f7b915cedb, type: 3} + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2501 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -50,27 +52,81 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OutlineWidthTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ReceiveShadowTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RimTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadeTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadingGradeTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SphereAdd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UvAnimMaskTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: + - _AlphaToMask: 0 + - _BlendMode: 3 - _BumpScale: 1 + - _CullMode: 2 - _Cutoff: 0.5 + - _DebugMode: 0 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _IndirectLightIntensity: 0.1 + - _LightColorAttenuation: 0 + - _MToonVersion: 35 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineColorMode: 0 + - _OutlineCullMode: 1 + - _OutlineLightingMix: 1 + - _OutlineScaledMaxDistance: 1 + - _OutlineWidth: 0.5 + - _OutlineWidthMode: 0 - _Parallax: 0.02 + - _ReceiveShadowRate: 1 + - _RimFresnelPower: 1 + - _RimLift: 0 + - _RimLightingMix: 0 + - _ShadeShift: 0 + - _ShadeToony: 0.9 + - _ShadingGradeRate: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 + - _UvAnimRotation: 0 + - _UvAnimScrollX: 0 + - _UvAnimScrollY: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {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.96999997, g: 0.81, b: 0.86, a: 1}