From dc4aac54f294269c9d063d60666a7eaea58a4775 Mon Sep 17 00:00:00 2001 From: amamagi Date: Tue, 1 Apr 2025 14:46:46 +0900 Subject: [PATCH] update alpha mode showcase --- .../Materials/AlphaModeBase.mat | 185 ++++++++++++++++++ .../Materials/AlphaModeBase.mat.meta | 8 + .../Runtime/MToon10ShowcaseEntryPoint.cs | 4 - .../Settings/Alpha Mode Template.asset | 2 +- .../MToon10Showcase Dependencies.asset | 4 + 5 files changed, 198 insertions(+), 5 deletions(-) create mode 100644 Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat create mode 100644 Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat.meta diff --git a/Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat b/Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat new file mode 100644 index 000000000..5ff3fa5fe --- /dev/null +++ b/Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat @@ -0,0 +1,185 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5077581053916780727 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AlphaModeBase + m_Shader: {fileID: 4800000, guid: 0781c64b7f2a1604ea6aa7e252080372, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 770eec6de1e32c042b64072fb4369f8a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatcapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineWidthTex: + 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} + - _RimTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadeTex: + m_Texture: {fileID: 2800000, guid: 770eec6de1e32c042b64072fb4369f8a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadingShiftTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UvAnimMaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaMode: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DoubleSided: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GiEqualization: 0.9 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _M_AlphaToMask: 0 + - _M_CullMode: 2 + - _M_DebugMode: 0 + - _M_DstBlend: 0 + - _M_EditMode: 1 + - _M_SrcBlend: 1 + - _M_ZWrite: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineLightingMix: 1 + - _OutlineWidth: 0 + - _OutlineWidthMode: 0 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _RenderQueueOffset: 0 + - _RimFresnelPower: 5 + - _RimLift: 0 + - _RimLightingMix: 1 + - _ShadingShiftFactor: -0.05 + - _ShadingShiftTexScale: 1 + - _ShadingToonyFactor: 0.95 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _TransparentWithZWrite: 0 + - _UvAnimRotationSpeed: 0 + - _UvAnimScrollXSpeed: 0 + - _UvAnimScrollYSpeed: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _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, g: 0, b: 0, a: 1} + - _RimColor: {r: 0, g: 0, b: 0, a: 1} + - _ShadeColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat.meta b/Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat.meta new file mode 100644 index 000000000..802bb3760 --- /dev/null +++ b/Assets/VRM10_Samples/MToon10Showcase/Materials/AlphaModeBase.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8358184a5f846474f8244c562b13f3a7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10_Samples/MToon10Showcase/Runtime/MToon10ShowcaseEntryPoint.cs b/Assets/VRM10_Samples/MToon10Showcase/Runtime/MToon10ShowcaseEntryPoint.cs index fd2b0713c..68a05b22e 100644 --- a/Assets/VRM10_Samples/MToon10Showcase/Runtime/MToon10ShowcaseEntryPoint.cs +++ b/Assets/VRM10_Samples/MToon10Showcase/Runtime/MToon10ShowcaseEntryPoint.cs @@ -30,10 +30,6 @@ namespace VRM10.Samples.MToon10Showcase { CreateShowcase(alphaModeShowcase.entries, alphaModeShowcase.baseMaterial, (entry, context) => { - context.BaseColorTexture = dependencies.alphaModeCheckerTexture; - context.BaseColorFactorSrgb = Color.white; - context.ShadeColorTexture = dependencies.alphaModeCheckerTexture; - context.ShadeColorFactorSrgb = Color.white; context.AlphaMode = entry.alphaMode; context.TransparentWithZWriteMode = entry.transparentWithZWriteMode; context.AlphaCutoff = entry.alphaCutoff; diff --git a/Assets/VRM10_Samples/MToon10Showcase/Settings/Alpha Mode Template.asset b/Assets/VRM10_Samples/MToon10Showcase/Settings/Alpha Mode Template.asset index ef03d8431..13466aa2f 100644 --- a/Assets/VRM10_Samples/MToon10Showcase/Settings/Alpha Mode Template.asset +++ b/Assets/VRM10_Samples/MToon10Showcase/Settings/Alpha Mode Template.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8218ff2a8efb4e0180079c635a898336, type: 3} m_Name: Alpha Mode Template m_EditorClassIdentifier: - baseMaterial: {fileID: 2100000, guid: 81f544d870b76884382d3365eff048b2, type: 2} + baseMaterial: {fileID: 2100000, guid: 8358184a5f846474f8244c562b13f3a7, type: 2} entries: - alphaMode: 0 transparentWithZWriteMode: 0 diff --git a/Assets/VRM10_Samples/MToon10Showcase/Settings/MToon10Showcase Dependencies.asset b/Assets/VRM10_Samples/MToon10Showcase/Settings/MToon10Showcase Dependencies.asset index 24b1fa252..88e8b277c 100644 --- a/Assets/VRM10_Samples/MToon10Showcase/Settings/MToon10Showcase Dependencies.asset +++ b/Assets/VRM10_Samples/MToon10Showcase/Settings/MToon10Showcase Dependencies.asset @@ -17,6 +17,10 @@ MonoBehaviour: shadeCheckerTexture: {fileID: 2800000, guid: 8d6a11ae5e99a5b47b59746810a26b46, type: 3} alphaModeCheckerTexture: {fileID: 2800000, guid: 770eec6de1e32c042b64072fb4369f8a, type: 3} + combinedMaskTexture: {fileID: 2800000, guid: 0cded87fdae970446a58c5806dc76bde, type: 3} + matcapTexture: {fileID: 2800000, guid: 2798b728086b52e4caff0fba2b131af8, type: 3} + checkerBwTexture: {fileID: 2800000, guid: 4e0ae81ac9b44ec45bb4d7f6bc08a837, type: 3} + normalMapTexture: {fileID: 2800000, guid: 9d3eb7a616353774fa5084e06c67e51a, type: 3} mtoon10Shader: {fileID: 4800000, guid: 0781c64b7f2a1604ea6aa7e252080372, type: 3} labelTextPrefab: {fileID: 5685776853168224818, guid: 682e9acde1b2bd6408deebec0fa47919, type: 3}