From 782ad1de4e542bfa6ed268a5c5d387767b209811 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Thu, 1 Feb 2024 15:49:29 +0900 Subject: [PATCH 01/13] =?UTF-8?q?=E3=83=AA=E3=83=A0=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=88=E5=B9=85=E3=81=AE=E8=A8=88=E7=AE=97=E5=BC=8F=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/WF_Dictionary.cs | 11 +++++---- Editor/WF_MaterialConverter.cs | 16 +++++++++++++ .../Unlit_WF_URP_FakeFur_TransCutout.shader | 11 +++++---- .../Unlit_WF_URP_FakeFur_Transparent.shader | 11 +++++---- .../Unlit_WF_URP_UnToon_Mobile_Opaque.shader | 11 +++++---- ...WF_URP_UnToon_Mobile_Outline_Opaque.shader | 11 +++++---- ...P_UnToon_Mobile_Outline_TransCutout.shader | 11 +++++---- ...it_WF_URP_UnToon_Mobile_TransCutout.shader | 11 +++++---- ...it_WF_URP_UnToon_Mobile_Transparent.shader | 11 +++++---- Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader | 11 +++++---- .../Unlit_WF_URP_UnToon_Outline_Opaque.shader | 11 +++++---- ...t_WF_URP_UnToon_Outline_TransCutout.shader | 11 +++++---- .../Unlit_WF_URP_UnToon_TransCutout.shader | 11 +++++---- .../Unlit_WF_URP_UnToon_Transparent.shader | 11 +++++---- ...nlit_WF_URP_UnToon_Transparent_Mask.shader | 11 +++++---- ...t_WF_URP_UnToon_Transparent_MaskOut.shader | 11 +++++---- Shaders/Unlit_WF_FakeFur_Mix.shader | 11 +++++---- Shaders/Unlit_WF_FakeFur_TransCutout.shader | 11 +++++---- Shaders/Unlit_WF_FakeFur_Transparent.shader | 11 +++++---- ...t_WF_UnToon_Custom_ClearCoat_Opaque.shader | 11 +++++---- ...UnToon_Custom_ClearCoat_TransCutout.shader | 11 +++++---- ...UnToon_Custom_ClearCoat_Transparent.shader | 11 +++++---- .../Unlit_WF_UnToon_Custom_GhostOpaque.shader | 11 +++++---- ...t_WF_UnToon_Custom_GhostTransparent.shader | 11 +++++---- ...nlit_WF_UnToon_Custom_Mirror_Opaque.shader | 11 +++++---- ..._UnToon_Custom_OffsetOutline_Opaque.shader | 11 +++++---- ...Toon_Custom_PowerCap_Outline_Opaque.shader | 11 +++++---- ...Custom_PowerCap_Outline_TransCutout.shader | 11 +++++---- ..._UnToon_Custom_Tess_PowerCap_Opaque.shader | 11 +++++---- ...on_Custom_Tess_PowerCap_TransCutout.shader | 11 +++++---- ...oon_Custom_Transparent_FrostedGlass.shader | 11 +++++---- ...UnToon_Custom_Transparent_Refracted.shader | 11 +++++---- Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader | 11 +++++---- ...lit_WF_UnToon_Mobile_Outline_Opaque.shader | 11 +++++---- ...F_UnToon_Mobile_Outline_TransCutout.shader | 11 +++++---- .../Unlit_WF_UnToon_Mobile_TransCutout.shader | 11 +++++---- .../Unlit_WF_UnToon_Mobile_Transparent.shader | 11 +++++---- Shaders/Unlit_WF_UnToon_Opaque.shader | 11 +++++---- Shaders/Unlit_WF_UnToon_Outline_Opaque.shader | 11 +++++---- ...Unlit_WF_UnToon_Outline_TransCutout.shader | 11 +++++---- ...Unlit_WF_UnToon_Outline_Transparent.shader | 11 +++++---- ..._WF_UnToon_Outline_Transparent3Pass.shader | 11 +++++---- ..._UnToon_Outline_Transparent_MaskOut.shader | 11 +++++---- ...n_Outline_Transparent_MaskOut_Blend.shader | 11 +++++---- .../Unlit_WF_UnToon_PowerCap_Opaque.shader | 11 +++++---- ...nlit_WF_UnToon_PowerCap_TransCutout.shader | 11 +++++---- ...nlit_WF_UnToon_PowerCap_Transparent.shader | 11 +++++---- ...WF_UnToon_PowerCap_Transparent3Pass.shader | 11 +++++---- Shaders/Unlit_WF_UnToon_Tess_Opaque.shader | 11 +++++---- .../Unlit_WF_UnToon_Tess_TransCutout.shader | 11 +++++---- .../Unlit_WF_UnToon_Tess_Transparent.shader | 11 +++++---- ...lit_WF_UnToon_Tess_Transparent3Pass.shader | 11 +++++---- Shaders/Unlit_WF_UnToon_TransCutout.shader | 11 +++++---- Shaders/Unlit_WF_UnToon_Transparent.shader | 11 +++++---- .../Unlit_WF_UnToon_Transparent3Pass.shader | 11 +++++---- .../Unlit_WF_UnToon_Transparent_Mask.shader | 11 +++++---- ...Unlit_WF_UnToon_Transparent_MaskOut.shader | 11 +++++---- ...WF_UnToon_Transparent_MaskOut_Blend.shader | 11 +++++---- .../Unlit_WF_UnToon_TriShade_Opaque.shader | 11 +++++---- ...nlit_WF_UnToon_TriShade_TransCutout.shader | 11 +++++---- ...nlit_WF_UnToon_TriShade_Transparent.shader | 11 +++++---- ...WF_UnToon_TriShade_Transparent3Pass.shader | 11 +++++---- ...WF_UnToon_TriShade_Transparent_Mask.shader | 11 +++++---- ...UnToon_TriShade_Transparent_MaskOut.shader | 11 +++++---- ..._TriShade_Transparent_MaskOut_Blend.shader | 11 +++++---- Shaders/WF_UnToon_Function.cginc | 24 +++++++++++-------- Shaders/WF_UnToon_Uniform.cginc | 9 +++---- 67 files changed, 419 insertions(+), 334 deletions(-) diff --git a/Editor/WF_Dictionary.cs b/Editor/WF_Dictionary.cs index 49cfe6b8..8f54969e 100644 --- a/Editor/WF_Dictionary.cs +++ b/Editor/WF_Dictionary.cs @@ -527,11 +527,12 @@ private static Dictionary ToWFCustomKeywordSetti new WFI18NTranslation("TS", "Dont Ajust Contrast", "影コントラストを調整しない"), // RimLight new WFI18NTranslation("TR", "Rim Color", "リムライト色"), - new WFI18NTranslation("TR", "Power", "強度(マスター)"), - new WFI18NTranslation("TR", "Feather", "境界のぼかし強度"), - new WFI18NTranslation("TR", "Power Top", "強度(上)"), - new WFI18NTranslation("TR", "Power Side", "強度(横)"), - new WFI18NTranslation("TR", "Power Bottom", "強度(下)"), + new WFI18NTranslation("TR", "Width", "幅"), + new WFI18NTranslation("TR", "Width Top", "幅(上)"), + new WFI18NTranslation("TR", "Width Side", "幅(横)"), + new WFI18NTranslation("TR", "Width Bottom", "幅(下)"), + new WFI18NTranslation("TR", "Feather", "ぼかし幅"), + new WFI18NTranslation("TR", "Exponent", "ぼかし指数"), new WFI18NTranslation("TR", "Assign MainTex to MaskTexture", "MainTexをマスクに設定する"), // Overlay Texture new WFI18NTranslation("OVL", "Overlay Color", "オーバーレイ テクスチャ"), diff --git a/Editor/WF_MaterialConverter.cs b/Editor/WF_MaterialConverter.cs index 5e6b06a7..1f37c461 100644 --- a/Editor/WF_MaterialConverter.cs +++ b/Editor/WF_MaterialConverter.cs @@ -1139,6 +1139,12 @@ protected override bool Validate(Material mat) PropertyNameReplacement.Group("2023/08/27"), PropertyNameReplacement.Match("_GL_DisableBackLit", "_TS_DisableBackLit"), // 後でTRにもコピーする + + PropertyNameReplacement.Group("2024/01/28"), + PropertyNameReplacement.Match("_TR_Power", "_TR_Width"), + PropertyNameReplacement.Match("_TR_PowerTop", "_TR_WidthTop"), + PropertyNameReplacement.Match("_TR_PowerSide", "_TR_WidthSide"), + PropertyNameReplacement.Match("_TR_PowerBottom", "_TR_WidthBottom"), }; public static bool ExistsNeedsMigration(Material mat) @@ -1227,6 +1233,16 @@ protected static List> CreateConverterList() WFAccessor.CopyIntValue(ctx.target, "_TS_DisableBackLit", "_TR_DisableBackLit"); } }, + ctx => { + // _TR_Powerありの状態から_TR_Widthに変更されたならば、 + if (HasOldProperty(ctx, "_TR_Power") && HasNewProperty(ctx, "_TR_Width")) + { + WFAccessor.SetFloat(ctx.target, "_TR_Width", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_Width", 1) * 0.05f, 0, 1)); + WFAccessor.SetFloat(ctx.target, "_TR_WidthTop", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_WidthTop", 1) * 10, 0, 1)); + WFAccessor.SetFloat(ctx.target, "_TR_WidthSide", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_WidthSide", 1) * 10, 0, 1)); + WFAccessor.SetFloat(ctx.target, "_TR_WidthBottom", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_WidthBottom", 1) * 10, 0, 1)); + } + }, }; } } diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader index 5f295aba..8317e2e2 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader @@ -147,16 +147,17 @@ Shader "UnlitWF_URP/WF_FakeFur_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader index 1e2a7d2a..e319fb06 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader @@ -144,16 +144,17 @@ Shader "UnlitWF_URP/WF_FakeFur_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader index 5045f8df..e313edbf 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader @@ -121,17 +121,18 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader index c3793966..65719978 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader @@ -132,16 +132,17 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader index 210785e8..f776d8eb 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader @@ -132,16 +132,17 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader index c2d1353d..beaefe33 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader @@ -118,16 +118,17 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader index f499fb22..e6e12847 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader @@ -121,16 +121,17 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader index 21a04b0d..10fff44a 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader @@ -229,8 +229,9 @@ Shader "UnlitWF_URP/WF_UnToon_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -238,9 +239,9 @@ Shader "UnlitWF_URP/WF_UnToon_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader index c387136a..7dc926ef 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader @@ -245,8 +245,9 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -254,9 +255,9 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader index cd05634a..8353b67c 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader @@ -256,8 +256,9 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -265,9 +266,9 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader index 4b26a0a9..0f3a12be 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader @@ -240,8 +240,9 @@ Shader "UnlitWF_URP/WF_UnToon_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -249,9 +250,9 @@ Shader "UnlitWF_URP/WF_UnToon_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader index 6ce74c04..539dd5d2 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader @@ -247,8 +247,9 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -256,9 +257,9 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader index ad429828..3f2b2bda 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader @@ -250,8 +250,9 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_Mask" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -259,9 +260,9 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_Mask" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader index 6008ea61..cda424c9 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader @@ -250,8 +250,9 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -259,9 +260,9 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_MaskOut" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_Mix.shader b/Shaders/Unlit_WF_FakeFur_Mix.shader index a94d872d..ddb8973d 100644 --- a/Shaders/Unlit_WF_FakeFur_Mix.shader +++ b/Shaders/Unlit_WF_FakeFur_Mix.shader @@ -147,16 +147,17 @@ Shader "UnlitWF/WF_FakeFur_Mix" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_TransCutout.shader b/Shaders/Unlit_WF_FakeFur_TransCutout.shader index 31873094..c039565c 100644 --- a/Shaders/Unlit_WF_FakeFur_TransCutout.shader +++ b/Shaders/Unlit_WF_FakeFur_TransCutout.shader @@ -143,16 +143,17 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_Transparent.shader b/Shaders/Unlit_WF_FakeFur_Transparent.shader index ed2df504..8f040f8e 100644 --- a/Shaders/Unlit_WF_FakeFur_Transparent.shader +++ b/Shaders/Unlit_WF_FakeFur_Transparent.shader @@ -140,16 +140,17 @@ Shader "UnlitWF/WF_FakeFur_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader index 302585f7..d50850c8 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader @@ -237,8 +237,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -246,9 +247,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader index c1233664..f263fd54 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader @@ -248,8 +248,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -257,9 +258,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader index 9378a261..0eaf653b 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader @@ -251,8 +251,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -260,9 +261,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Transparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader b/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader index be3a3eb0..85772189 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader @@ -233,8 +233,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostOpaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -242,9 +243,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostOpaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader b/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader index 526248be..3725a365 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader @@ -244,8 +244,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostTransparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -253,9 +254,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostTransparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader index 419948f2..cb45fa16 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader @@ -234,8 +234,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_MirrorControl_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -243,9 +244,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_MirrorControl_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader index 86bbd0b8..3f8d9263 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader @@ -246,8 +246,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_OffsetOutline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -255,9 +256,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_OffsetOutline_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader index efa2ff0d..99a977ef 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader @@ -301,8 +301,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -310,9 +311,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader index 5d4a06ec..cec9c288 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader @@ -312,8 +312,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -321,9 +322,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader index a32ad8ae..6cb7360c 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader @@ -310,8 +310,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -319,9 +320,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader index eaecc62d..a8bbabec 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader @@ -321,8 +321,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -330,9 +331,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader b/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader index 289ba4cb..4b859b99 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader @@ -218,8 +218,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_FrostedGlass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -227,9 +228,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_FrostedGlass" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader index 8063c172..6407645c 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader @@ -252,8 +252,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_Refracted" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -261,9 +262,9 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_Refracted" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader b/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader index fe9a11b5..81ed13bb 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader @@ -121,17 +121,18 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader index ddb1d2d6..ac0cf541 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader @@ -135,17 +135,18 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader index 07a7f640..552c5e13 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader @@ -132,16 +132,17 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader index 90e0f9ab..244fb901 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader @@ -118,16 +118,17 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader b/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader index da0c490a..dab22be2 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader @@ -121,16 +121,17 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] _TR_MaskTex ("[TR] Mask Texture (RGB)", 2D) = "white" {} [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Opaque.shader b/Shaders/Unlit_WF_UnToon_Opaque.shader index f553eb03..37d262ec 100644 --- a/Shaders/Unlit_WF_UnToon_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Opaque.shader @@ -229,8 +229,9 @@ Shader "UnlitWF/WF_UnToon_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -238,9 +239,9 @@ Shader "UnlitWF/WF_UnToon_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader index bf728554..693a2524 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader @@ -245,8 +245,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -254,9 +255,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader index 8c3e4f5b..b9a98c15 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader @@ -256,8 +256,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -265,9 +266,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader index 2b37f78f..b3c05621 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader @@ -263,8 +263,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -272,9 +273,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader index 32cbd4c5..9847abfa 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader @@ -266,8 +266,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -275,9 +276,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent3Pass" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader index 5efd0588..f7f50805 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader @@ -266,8 +266,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -275,9 +276,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader index 316f5d1b..6f575f80 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader @@ -267,8 +267,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut_Blend" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -276,9 +277,9 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut_Blend" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader index 55fc6dea..cb0a4229 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader @@ -285,8 +285,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -294,9 +295,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader b/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader index cecd0570..45612914 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader @@ -296,8 +296,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -305,9 +306,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader index 1b0f32f2..ed60c551 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader @@ -313,8 +313,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -322,9 +323,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader index 15ea9337..8057caec 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader @@ -314,8 +314,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -323,9 +324,9 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent3Pass" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader b/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader index 5d91197a..f0857b2d 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader @@ -254,8 +254,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -263,9 +264,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader index aa729425..2de035fe 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader @@ -265,8 +265,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -274,9 +275,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader b/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader index 623389dd..aca03fd0 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader @@ -258,8 +258,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -267,9 +268,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader index c8787546..6dc99435 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader @@ -275,8 +275,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -284,9 +285,9 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent3Pass" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TransCutout.shader b/Shaders/Unlit_WF_UnToon_TransCutout.shader index a05603b9..713175d8 100644 --- a/Shaders/Unlit_WF_UnToon_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_TransCutout.shader @@ -240,8 +240,9 @@ Shader "UnlitWF/WF_UnToon_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -249,9 +250,9 @@ Shader "UnlitWF/WF_UnToon_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent.shader b/Shaders/Unlit_WF_UnToon_Transparent.shader index f6972a41..e9570f81 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent.shader @@ -247,8 +247,9 @@ Shader "UnlitWF/WF_UnToon_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -256,9 +257,9 @@ Shader "UnlitWF/WF_UnToon_Transparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader index 56b62680..69b1e410 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader @@ -248,8 +248,9 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -257,9 +258,9 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader b/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader index b55519a1..fb3d648f 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader @@ -250,8 +250,9 @@ Shader "UnlitWF/WF_UnToon_Transparent_Mask" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -259,9 +260,9 @@ Shader "UnlitWF/WF_UnToon_Transparent_Mask" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader index 0745d61a..d47d79eb 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader @@ -250,8 +250,9 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -259,9 +260,9 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader index 1add74b9..d1e15292 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader @@ -251,8 +251,9 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut_Blend" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -260,9 +261,9 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut_Blend" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader b/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader index 59b004c3..2877d6ea 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader @@ -186,8 +186,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -195,9 +196,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Opaque" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader b/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader index 2b73e793..ad8c4dbf 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader @@ -197,8 +197,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -206,9 +207,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_TransCutout" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader index 5f6f1f85..20c276e9 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader @@ -202,8 +202,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -211,9 +212,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader index b324c17e..b960c87a 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader @@ -205,8 +205,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -214,9 +215,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent3Pass" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader index 67a58b82..db5d794d 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader @@ -189,8 +189,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_Mask" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -198,9 +199,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_Mask" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader index 53816ae6..0ee800ae 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader @@ -205,8 +205,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -214,9 +215,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader index b78ad1d7..82f6fad3 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader @@ -206,8 +206,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut_Blend" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Power ("[TR] Power", Range(0, 2)) = 1 - _TR_Feather ("[TR] Feather", Range(0, 0.2)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 + _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 _TR_BlendNormal2 ("[TR] Blend Normal 2nd", Range(0, 1)) = 0 [NoScaleOffset] @@ -215,9 +216,9 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut_Blend" { [ToggleUI] _TR_InvMaskVal ("[TR] Invert Mask Value", Range(0, 1)) = 0 [Header(RimLight Advance)] - _TR_PowerTop ("[TR] Power Top", Range(0, 0.5)) = 0.05 - _TR_PowerSide ("[TR] Power Side", Range(0, 0.5)) = 0.1 - _TR_PowerBottom ("[TR] Power Bottom", Range(0, 0.5)) = 0.1 + _TR_WidthTop ("[TR] Width Top", Range(0, 1)) = 0.5 + _TR_WidthSide ("[TR] Width Side", Range(0, 1)) = 1 + _TR_WidthBottom ("[TR] Width Bottom", Range(0, 1)) = 1 [ToggleUI] _TR_DisableBackLit ("[TR] Disable BackLit", Range(0, 1)) = 0 diff --git a/Shaders/WF_UnToon_Function.cginc b/Shaders/WF_UnToon_Function.cginc index 73ad37d9..4de0639f 100644 --- a/Shaders/WF_UnToon_Function.cginc +++ b/Shaders/WF_UnToon_Function.cginc @@ -1133,18 +1133,22 @@ FEATURE_TGL_END #ifdef _TR_ENABLE float calcRimLightPower(float3 vs_normal) { - float side = _TR_Power * _TR_PowerSide; - float top = _TR_Power * _TR_PowerTop; - float bottom = _TR_Power * _TR_PowerBottom; - - half3x3 mat = 0; - mat[0][0] = side + 1; - mat[1][1] = (top + bottom) / 2 + 1; - mat[1][2] = (top - bottom) / 2; + float rimPower = length(vs_normal.xy); + if (rimPower < NZF) { + return 0; + } + else { + float2 dir_vec = vs_normal.xy / rimPower; + dir_vec.x *= _TR_WidthSide * 2; + dir_vec.y *= (_TR_WidthTop + _TR_WidthBottom); + dir_vec.y += (_TR_WidthTop - _TR_WidthBottom); - float2 rim_uv = mul(mat, float3(vs_normal.xy, 1)).xy; + float dir_pwr = length(dir_vec); + float2 rim_max = 1 - _TR_Width * dir_pwr; + float2 rim_min = 1 - (_TR_Width + _TR_Feather) * dir_pwr; - return smoothstep(-NZF, _TR_Feather, length(rim_uv) - 1); + return pow(smoothstep(rim_min - NZF, rim_max, rimPower), max(NZF, _TR_Exponent)); + } } float3 calcRimLightColor(float3 color) { diff --git a/Shaders/WF_UnToon_Uniform.cginc b/Shaders/WF_UnToon_Uniform.cginc index a58800c0..1a1160ca 100644 --- a/Shaders/WF_UnToon_Uniform.cginc +++ b/Shaders/WF_UnToon_Uniform.cginc @@ -296,14 +296,15 @@ FEATURE_TGL (_TR_Enable); half3 _TR_Color; uint _TR_BlendType; - half _TR_Power; + half _TR_Width; half _TR_Feather; + half _TR_Exponent; half _TR_InvMaskVal; half _TR_BlendNormal; half _TR_BlendNormal2; - half _TR_PowerTop; - half _TR_PowerSide; - half _TR_PowerBottom; + half _TR_WidthTop; + half _TR_WidthSide; + half _TR_WidthBottom; half _TR_DisableBackLit; // ------------------------- From 3d7c2fb3bddc35f88dc1db497ac1a813b74167ea Mon Sep 17 00:00:00 2001 From: whiteflare Date: Thu, 1 Feb 2024 15:56:48 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=A8=E3=82=B5=E3=83=B3=E3=83=97=E3=83=AB?= =?UTF-8?q?=E3=83=9E=E3=83=86=E3=83=AA=E3=82=A2=E3=83=AB=E3=82=92=E3=83=9E?= =?UTF-8?q?=E3=82=A4=E3=82=B0=E3=83=AC=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?(BRP)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnToon_CornelBox/Materials/LightBlue.mat | 31 +++++++++++++++--- .../UnToon_CornelBox/Materials/LightWhite.mat | 31 +++++++++++++++--- .../UnToon_CornelBox/Materials/Metallic.mat | 31 +++++++++++++++--- .../UnToon_CornelBox/Materials/SolidGreen.mat | 31 +++++++++++++++--- .../UnToon_CornelBox/Materials/SolidRed.mat | 31 +++++++++++++++--- .../UnToon_CornelBox/Materials/SolidWhite.mat | 31 +++++++++++++++--- .../Materials/SolidWhiteSmooth.mat | 31 +++++++++++++++--- .../Materials/Transparent.mat | 32 ++++++++++++++++--- .../2a7s_2eroVRC/mat/tex_armor.mat | 27 +++++++++++++--- .../2a7s_2eroVRC/mat/tex_body.mat | 27 +++++++++++++--- .../2a7s_2eroVRC/mat/tex_face.mat | 27 +++++++++++++--- .../2a7s_2eroVRC/mat/tex_faceoption.mat | 11 ++++--- .../2a7s_2eroVRC/mat/tex_hair.mat | 27 +++++++++++++--- .../2a7s_2eroVRC/mat/tex_photon.mat | 11 ++++--- Examples/Water/Other/mat_LampSample.mat | 11 ++++--- ...wf00_Basic_\346\250\231\346\272\226.asset" | 31 +++++++++++++++--- "Template/wf01_Skin_\350\202\214.asset" | 31 +++++++++++++++--- "Template/wf02_Face_\351\241\224.asset" | 31 +++++++++++++++--- "Template/wf03_Hair_\351\253\252.asset" | 31 +++++++++++++++--- ...1_Metallic_\351\207\221\345\261\236.asset" | 31 +++++++++++++++--- ...f22_Rubber_\343\202\264\343\203\240.asset" | 31 +++++++++++++++--- ...343\203\225\343\202\241\343\203\274.asset" | 30 ++++++++++++++--- ...wf25_Ghost_\345\271\275\351\234\212.asset" | 28 +++++++++++++--- ...343\203\254\343\203\263\343\202\272.asset" | 32 ++++++++++++++++--- ...343\202\254\343\203\251\343\202\271.asset" | 12 ++++--- 25 files changed, 578 insertions(+), 100 deletions(-) diff --git a/Examples/UnToon_CornelBox/Materials/LightBlue.mat b/Examples/UnToon_CornelBox/Materials/LightBlue.mat index e651ee65..ad6c99e9 100644 --- a/Examples/UnToon_CornelBox/Materials/LightBlue.mat +++ b/Examples/UnToon_CornelBox/Materials/LightBlue.mat @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -133,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -228,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -246,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -269,6 +291,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/LightWhite.mat b/Examples/UnToon_CornelBox/Materials/LightWhite.mat index d25277f3..f7b10e05 100644 --- a/Examples/UnToon_CornelBox/Materials/LightWhite.mat +++ b/Examples/UnToon_CornelBox/Materials/LightWhite.mat @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -133,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -228,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -246,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -269,6 +291,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/Metallic.mat b/Examples/UnToon_CornelBox/Materials/Metallic.mat index ca93131e..a402309c 100644 --- a/Examples/UnToon_CornelBox/Materials/Metallic.mat +++ b/Examples/UnToon_CornelBox/Materials/Metallic.mat @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -145,11 +161,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -240,6 +260,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -273,12 +294,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 @@ -296,6 +318,7 @@ Material: - _TS_Power: 1.5 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/SolidGreen.mat b/Examples/UnToon_CornelBox/Materials/SolidGreen.mat index 3015fa6f..60f7daf8 100644 --- a/Examples/UnToon_CornelBox/Materials/SolidGreen.mat +++ b/Examples/UnToon_CornelBox/Materials/SolidGreen.mat @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -133,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -228,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -246,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 @@ -269,6 +291,7 @@ Material: - _TS_Power: 1.5 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/SolidRed.mat b/Examples/UnToon_CornelBox/Materials/SolidRed.mat index 4b221fe2..fcf87750 100644 --- a/Examples/UnToon_CornelBox/Materials/SolidRed.mat +++ b/Examples/UnToon_CornelBox/Materials/SolidRed.mat @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -133,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -228,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -246,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 @@ -269,6 +291,7 @@ Material: - _TS_Power: 1.5 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/SolidWhite.mat b/Examples/UnToon_CornelBox/Materials/SolidWhite.mat index ec33aab2..b2b75181 100644 --- a/Examples/UnToon_CornelBox/Materials/SolidWhite.mat +++ b/Examples/UnToon_CornelBox/Materials/SolidWhite.mat @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -133,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -228,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -246,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 @@ -269,6 +291,7 @@ Material: - _TS_Power: 1.5 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/SolidWhiteSmooth.mat b/Examples/UnToon_CornelBox/Materials/SolidWhiteSmooth.mat index 240a375a..a2690327 100644 --- a/Examples/UnToon_CornelBox/Materials/SolidWhiteSmooth.mat +++ b/Examples/UnToon_CornelBox/Materials/SolidWhiteSmooth.mat @@ -28,10 +28,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -134,11 +150,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -229,6 +249,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -247,12 +268,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 1 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0 - - _TR_PowerSide: 0.02 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 0 + - _TR_WidthSide: 0.19999999 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 @@ -270,6 +292,7 @@ Material: - _TS_Power: 1.5 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/Transparent.mat b/Examples/UnToon_CornelBox/Materials/Transparent.mat index 8773be88..bc277b62 100644 --- a/Examples/UnToon_CornelBox/Materials/Transparent.mat +++ b/Examples/UnToon_CornelBox/Materials/Transparent.mat @@ -32,10 +32,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -144,11 +160,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _ClearBgSupported: 0 - _CurrentVersion: 0 @@ -173,6 +193,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -245,6 +266,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -263,12 +285,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -286,6 +309,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat index 7116cd45..d108991b 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat @@ -28,10 +28,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DFD_ColorTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -138,11 +150,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 @@ -233,6 +249,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -251,12 +268,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -274,6 +292,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat index 9604bbe7..f29ae737 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat @@ -28,10 +28,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DFD_ColorTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -150,11 +162,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 @@ -245,6 +261,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -278,12 +295,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -301,6 +319,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat index 4cfe1572..ee2a2ea7 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DFD_ColorTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -145,11 +157,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -240,6 +256,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -269,12 +286,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -292,6 +310,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat index 464a0d73..1c81da88 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat @@ -83,6 +83,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -129,12 +130,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -150,6 +152,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _ES_SC_Direction: {r: 0, g: -10, b: 0, a: 0} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat index 55117c7d..b7d5cb53 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DFD_ColorTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -137,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 @@ -232,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -250,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.01 - _TR_InvMaskVal: 0 - - _TR_Power: 0.55 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.027500002 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.25 @@ -273,6 +291,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat index 35a62913..34f26e92 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat @@ -84,6 +84,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 1 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 1 - _ES_SC_AlphaScroll: 1 - _ES_SC_DirType: 0 @@ -130,12 +131,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -151,6 +153,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _ES_SC_Direction: {r: 0, g: 10, b: 0, a: 0} diff --git a/Examples/Water/Other/mat_LampSample.mat b/Examples/Water/Other/mat_LampSample.mat index 887cdeba..420983fe 100644 --- a/Examples/Water/Other/mat_LampSample.mat +++ b/Examples/Water/Other/mat_LampSample.mat @@ -121,18 +121,20 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _QuestSupported: 0 - _TR_BlendNormal: 0 - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -149,6 +151,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 1} - _ES_SC_Direction: {r: 0, g: -10, b: 0, a: 0} diff --git "a/Template/wf00_Basic_\346\250\231\346\272\226.asset" "b/Template/wf00_Basic_\346\250\231\346\272\226.asset" index 6b449811..1cda5683 100644 --- "a/Template/wf00_Basic_\346\250\231\346\272\226.asset" +++ "b/Template/wf00_Basic_\346\250\231\346\272\226.asset" @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -133,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -228,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -246,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 0.8 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.040000003 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -269,6 +291,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf01_Skin_\350\202\214.asset" "b/Template/wf01_Skin_\350\202\214.asset" index fe8a10f2..d5106d53 100644 --- "a/Template/wf01_Skin_\350\202\214.asset" +++ "b/Template/wf01_Skin_\350\202\214.asset" @@ -44,10 +44,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -158,11 +174,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -253,6 +273,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 1 - _NS_InvMaskVal: 0 @@ -282,12 +303,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 0.8 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.040000003 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -305,6 +327,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf02_Face_\351\241\224.asset" "b/Template/wf02_Face_\351\241\224.asset" index b396250d..044ad217 100644 --- "a/Template/wf02_Face_\351\241\224.asset" +++ "b/Template/wf02_Face_\351\241\224.asset" @@ -44,10 +44,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -158,11 +174,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -253,6 +273,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -282,12 +303,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -305,6 +327,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf03_Hair_\351\253\252.asset" "b/Template/wf03_Hair_\351\253\252.asset" index 165d47c0..899c5ae7 100644 --- "a/Template/wf03_Hair_\351\253\252.asset" +++ "b/Template/wf03_Hair_\351\253\252.asset" @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -141,11 +157,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -236,6 +256,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -265,12 +286,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 0.8 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.040000003 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -288,6 +310,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf21_Metallic_\351\207\221\345\261\236.asset" "b/Template/wf21_Metallic_\351\207\221\345\261\236.asset" index 5852d9a2..1473650d 100644 --- "a/Template/wf21_Metallic_\351\207\221\345\261\236.asset" +++ "b/Template/wf21_Metallic_\351\207\221\345\261\236.asset" @@ -28,10 +28,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -134,11 +150,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -229,6 +249,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0.3 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -247,12 +268,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -270,6 +292,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf22_Rubber_\343\202\264\343\203\240.asset" "b/Template/wf22_Rubber_\343\202\264\343\203\240.asset" index 81593962..b3d927f0 100644 --- "a/Template/wf22_Rubber_\343\202\264\343\203\240.asset" +++ "b/Template/wf22_Rubber_\343\202\264\343\203\240.asset" @@ -27,10 +27,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -133,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -228,6 +248,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -246,12 +267,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -269,6 +291,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" "b/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" index 7923bd45..9710cdc0 100644 --- "a/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" +++ "b/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" @@ -19,6 +19,22 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DSV_CtrlTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -81,10 +97,14 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _AL_AlphaToMask: 0 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CurrentVersion: 0 - _Cutoff: 0.2 @@ -129,12 +149,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -149,6 +170,7 @@ Material: - _TS_MinDist: 1 - _TS_Power: 1 - _TS_Steps: 2 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _DFD_Color: {r: 0.1, g: 0.1, b: 0.1, a: 1} diff --git "a/Template/wf25_Ghost_\345\271\275\351\234\212.asset" "b/Template/wf25_Ghost_\345\271\275\351\234\212.asset" index df5c3b39..76eda040 100644 --- "a/Template/wf25_Ghost_\345\271\275\351\234\212.asset" +++ "b/Template/wf25_Ghost_\345\271\275\351\234\212.asset" @@ -31,10 +31,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -138,11 +150,15 @@ Material: - _BumpScale: 1 - _CGO_Enable: 1 - _CGO_Power: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _Category: 0 - _CurrentVersion: 0 @@ -157,6 +173,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -226,6 +243,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -244,12 +262,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 0.8 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.040000003 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -267,6 +286,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" "b/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" index 97397c18..0d1b6cce 100644 --- "a/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" +++ "b/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" @@ -48,10 +48,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DFD_ColorTex: + 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} @@ -154,11 +170,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CRF_BlendNormal: 0.1 - _CRF_Distance: 0.05 @@ -183,6 +203,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -255,6 +276,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -273,12 +295,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -296,6 +319,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" "b/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" index 147890e5..07547041 100644 --- "a/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" +++ "b/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" @@ -168,6 +168,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -240,6 +241,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -258,12 +260,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.05 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 @@ -281,6 +284,7 @@ Material: - _TS_Power: 1 - _TS_Steps: 2 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _AO_TintColor: {r: 0, g: 0, b: 0, a: 1} - _BKT_BackColor: {r: 1, g: 1, b: 1, a: 1} From 8de0458269e83c61887ebed99aef116a84adad67 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Thu, 1 Feb 2024 15:59:39 +0900 Subject: [PATCH 03/13] =?UTF-8?q?ScanAndMigrationExecutor.VERSION=20?= =?UTF-8?q?=E3=82=92=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AA=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/WF_MaterialConverter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Editor/WF_MaterialConverter.cs b/Editor/WF_MaterialConverter.cs index 1f37c461..4ee58b72 100644 --- a/Editor/WF_MaterialConverter.cs +++ b/Editor/WF_MaterialConverter.cs @@ -891,7 +891,7 @@ protected static List> CreateConverterList() static class ScanAndMigrationExecutor { - public const int VERSION = 8; + public const int VERSION = 9; private static readonly string KEY_MIG_VERSION = "UnlitWF.ShaderEditor/autoMigrationVersion"; /// @@ -1140,7 +1140,7 @@ protected override bool Validate(Material mat) PropertyNameReplacement.Group("2023/08/27"), PropertyNameReplacement.Match("_GL_DisableBackLit", "_TS_DisableBackLit"), // 後でTRにもコピーする - PropertyNameReplacement.Group("2024/01/28"), + PropertyNameReplacement.Group("2024/01/28"), // TODO 後で変更 PropertyNameReplacement.Match("_TR_Power", "_TR_Width"), PropertyNameReplacement.Match("_TR_PowerTop", "_TR_WidthTop"), PropertyNameReplacement.Match("_TR_PowerSide", "_TR_WidthSide"), From 5bf6b67780c1f27a1630038162ecc8d80bd31688 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Sat, 3 Feb 2024 18:17:19 +0900 Subject: [PATCH 04/13] =?UTF-8?q?DisableBackLit=20=E3=82=92=E3=83=9E?= =?UTF-8?q?=E3=83=86=E3=83=AA=E3=82=A2=E3=83=AB=E5=85=B1=E9=80=9A=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=AB=E5=85=A5=E3=82=8C=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/WFEditorSetting.cs | 59 +++++++++++++++++++++++++++++++-- Editor/WFMaterialValidator.cs | 30 ++++++++++------- Editor/WF_Common.cs | 35 ++++++++++++++++--- Editor/WF_ShaderCustomEditor.cs | 13 ++------ 4 files changed, 106 insertions(+), 31 deletions(-) diff --git a/Editor/WFEditorSetting.cs b/Editor/WFEditorSetting.cs index 315547ae..957d7136 100644 --- a/Editor/WFEditorSetting.cs +++ b/Editor/WFEditorSetting.cs @@ -81,13 +81,53 @@ public class WFEditorSetting : ScriptableObject [Header("Quest Build Support")] public bool autoSwitchQuestShader = true; - public NearClipCancelMode enableNccInVRC3Avatar = NearClipCancelMode.ForceON; + /// + /// カメラのニアクリップを無視(for VRC3Avatar) + /// + public MatForceSettingMode enableNccInVRC3Avatar = MatForceSettingMode.ForceON; + /// + /// カメラのニアクリップを無視(for VRC3World) + /// + public MatForceSettingMode enableNccInVRC3World = MatForceSettingMode.ForceOFF; - public NearClipCancelMode enableNccInVRC3World = NearClipCancelMode.ForceOFF; + /// + /// 逆光補正しない(for VRC3Avatar) + /// + public MatForceSettingMode disableBackLitInVRC3Avatar = MatForceSettingMode.PerMaterial; + /// + /// 逆光補正しない(for VRC3World) + /// + public MatForceSettingMode disableBackLitInVRC3World = MatForceSettingMode.ForceON; private static WFEditorSetting currentSettings = null; private static int currentPriority = 0; + public MatForceSettingMode GetEnableNccInCurrentEnvironment() + { + switch (WFCommonUtility.GetCurrentEntironment()) + { + case CurrentEntironment.VRCSDK3_Avatar: + return enableNccInVRC3Avatar; + case CurrentEntironment.VRCSDK3_World: + return enableNccInVRC3World; + default: + return MatForceSettingMode.PerMaterial; + } + } + + public MatForceSettingMode GetDisableBackLitInCurrentEnvironment() + { + switch (WFCommonUtility.GetCurrentEntironment()) + { + case CurrentEntironment.VRCSDK3_Avatar: + return disableBackLitInVRC3Avatar; + case CurrentEntironment.VRCSDK3_World: + return disableBackLitInVRC3World; + default: + return MatForceSettingMode.PerMaterial; + } + } + public static WFEditorSetting GetOneOfSettings(bool forceReload = false) { if (forceReload) @@ -128,7 +168,7 @@ private static WFEditorSetting[] LoadAllSettingsFromAssetDatabase() } } - public enum NearClipCancelMode + public enum MatForceSettingMode { PerMaterial = -1, ForceOFF = 0, @@ -166,6 +206,8 @@ class WFEditorSettingEditor : Editor SerializedProperty p_autoSwitchQuestShader; SerializedProperty p_enableNccInVRC3Avatar; SerializedProperty p_enableNccInVRC3World; + SerializedProperty p_disableBackLitInVRC3Avatar; + SerializedProperty p_disableBackLitInVRC3World; private void OnEnable() { @@ -191,6 +233,10 @@ private void OnEnable() // EnableNCC this.p_enableNccInVRC3Avatar = serializedObject.FindProperty(nameof(WFEditorSetting.enableNccInVRC3Avatar)); this.p_enableNccInVRC3World = serializedObject.FindProperty(nameof(WFEditorSetting.enableNccInVRC3World)); + + // DisableBackLit + this.p_disableBackLitInVRC3Avatar = serializedObject.FindProperty(nameof(WFEditorSetting.disableBackLitInVRC3Avatar)); + this.p_disableBackLitInVRC3World = serializedObject.FindProperty(nameof(WFEditorSetting.disableBackLitInVRC3World)); } public override void OnInspectorGUI() @@ -248,6 +294,13 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(p_enableNccInVRC3World, new GUIContent("For VRCSDK3 World")); } + EditorGUILayout.LabelField(WFI18N.Translate("WFEditorSetting", "Disable BackLit")); + using (new EditorGUI.IndentLevelScope()) + { + EditorGUILayout.PropertyField(p_disableBackLitInVRC3Avatar, new GUIContent("For VRCSDK3 Avatar")); + EditorGUILayout.PropertyField(p_disableBackLitInVRC3World, new GUIContent("For VRCSDK3 World")); + } + serializedObject.ApplyModifiedProperties(); WFEditorPrefs.LangMode = (EditorLanguage)EditorGUILayout.EnumPopup("Editor language", WFEditorPrefs.LangMode); diff --git a/Editor/WFMaterialValidator.cs b/Editor/WFMaterialValidator.cs index ea8e410a..b25a2b02 100644 --- a/Editor/WFMaterialValidator.cs +++ b/Editor/WFMaterialValidator.cs @@ -112,13 +112,16 @@ static class WFMaterialValidators } else { - if (WFAccessor.GetBool(target, "_TS_Enable", false) && !WFAccessor.GetBool(target, "_TS_DisableBackLit", true)) + if (WFEditorSetting.GetOneOfSettings().GetDisableBackLitInCurrentEnvironment() == MatForceSettingMode.PerMaterial) { - return true; - } - if (WFAccessor.GetBool(target, "_TR_Enable", false) && !WFAccessor.GetBool(target, "_TR_DisableBackLit", true)) - { - return true; + if (WFAccessor.GetBool(target, "_TS_Enable", false) && !WFAccessor.GetBool(target, "_TS_DisableBackLit", true)) + { + return true; + } + if (WFAccessor.GetBool(target, "_TR_Enable", false) && !WFAccessor.GetBool(target, "_TR_DisableBackLit", true)) + { + return true; + } } } // それ以外は設定不要 @@ -137,13 +140,16 @@ static class WFMaterialValidators { WFAccessor.SetBool(mat, "_GL_DisableBackLit", true); WFAccessor.SetBool(mat, "_GL_DisableBasePos", true); - if (WFAccessor.GetBool(mat, "_TS_Enable", false)) - { - WFAccessor.SetBool(mat, "_TS_DisableBackLit", true); - } - if (WFAccessor.GetBool(mat, "_TR_Enable", false)) + if (WFEditorSetting.GetOneOfSettings().GetDisableBackLitInCurrentEnvironment() == MatForceSettingMode.PerMaterial) { - WFAccessor.SetBool(mat, "_TR_DisableBackLit", true); + if (WFAccessor.GetBool(mat, "_TS_Enable", false)) + { + WFAccessor.SetBool(mat, "_TS_DisableBackLit", true); + } + if (WFAccessor.GetBool(mat, "_TR_Enable", false)) + { + WFAccessor.SetBool(mat, "_TR_DisableBackLit", true); + } } } } diff --git a/Editor/WF_Common.cs b/Editor/WF_Common.cs index c2d70d31..7746edb3 100644 --- a/Editor/WF_Common.cs +++ b/Editor/WF_Common.cs @@ -213,6 +213,7 @@ public static bool SetupMaterial(Material mat) changed |= SetupMaterial_GIFrags(mat); changed |= SetupMaterial_ClearBgPass(mat); changed |= SetupMaterial_NearClipCancel(mat); + changed |= SetupMaterial_DisableBackLit(mat); changed |= SetupMaterial_SetupKeyword(mat); changed |= SetupMaterial_DeleteKeyword(mat); } @@ -304,11 +305,7 @@ private static bool SetupMaterial_NearClipCancel(Material mat) if (mat.HasProperty("_GL_NCC_Enable")) { var oldVal = mat.GetInt("_GL_NCC_Enable"); -#if ENV_VRCSDK3_AVATAR - var newVal = (int)WFEditorSetting.GetOneOfSettings().enableNccInVRC3Avatar; -#elif ENV_VRCSDK3_WORLD - var newVal = (int)WFEditorSetting.GetOneOfSettings().enableNccInVRC3World; -#endif + var newVal = (int)WFEditorSetting.GetOneOfSettings().GetEnableNccInCurrentEnvironment(); if (0 <= newVal && oldVal != newVal) { mat.SetInt("_GL_NCC_Enable", newVal); @@ -319,6 +316,34 @@ private static bool SetupMaterial_NearClipCancel(Material mat) return changed; } + private static bool SetupMaterial_DisableBackLit(Material mat) + { + bool changed = false; +#if ENV_VRCSDK3_AVATAR || ENV_VRCSDK3_WORLD + if (mat.HasProperty("_TS_DisableBackLit")) + { + var oldVal = mat.GetInt("_TS_DisableBackLit"); + var newVal = (int)WFEditorSetting.GetOneOfSettings().GetDisableBackLitInCurrentEnvironment(); + if (0 <= newVal && oldVal != newVal) + { + mat.SetInt("_TS_DisableBackLit", newVal); + changed = true; + } + } + if (mat.HasProperty("_TR_DisableBackLit")) + { + var oldVal = mat.GetInt("_TR_DisableBackLit"); + var newVal = (int)WFEditorSetting.GetOneOfSettings().GetDisableBackLitInCurrentEnvironment(); + if (0 <= newVal && oldVal != newVal) + { + mat.SetInt("_TR_DisableBackLit", newVal); + changed = true; + } + } +#endif + return changed; + } + #endregion #region シェーダ切り替え diff --git a/Editor/WF_ShaderCustomEditor.cs b/Editor/WF_ShaderCustomEditor.cs index b35fa90f..6d5ba59f 100644 --- a/Editor/WF_ShaderCustomEditor.cs +++ b/Editor/WF_ShaderCustomEditor.cs @@ -66,17 +66,8 @@ class ShaderCustomEditor : ShaderGUI new ConditionVisiblePropertyHook("_GL_ShadowCutoff", ctx => IsAnyIntValue(ctx, "_GL_CastShadow", p => 1 <= p), isRegex:false), new ConditionVisiblePropertyHook("_GL_CustomAzimuth|_GL_CustomAltitude", ctx => IsAnyIntValue(ctx, "_GL_LightMode", p => p != 5)), new ConditionVisiblePropertyHook("_GL_CustomLitPos", ctx => IsAnyIntValue(ctx, "_GL_LightMode", p => p == 5), isRegex:false), - new ConditionVisiblePropertyHook("_GL_NCC_Enable", ctx => { - switch(WFCommonUtility.GetCurrentEntironment()) - { - case CurrentEntironment.VRCSDK3_Avatar: - return WFEditorSetting.GetOneOfSettings().enableNccInVRC3Avatar == NearClipCancelMode.PerMaterial; - case CurrentEntironment.VRCSDK3_World: - return WFEditorSetting.GetOneOfSettings().enableNccInVRC3World == NearClipCancelMode.PerMaterial; - default: - return true; - } - }, isRegex:false), + new ConditionVisiblePropertyHook("_GL_NCC_Enable", ctx => WFEditorSetting.GetOneOfSettings().GetEnableNccInCurrentEnvironment() == MatForceSettingMode.PerMaterial, isRegex:false), + new ConditionVisiblePropertyHook("_T[SR]_DisableBackLit", ctx => WFEditorSetting.GetOneOfSettings().GetDisableBackLitInCurrentEnvironment() == MatForceSettingMode.PerMaterial), // 条件付きHide(Grass系列) new ConditionVisiblePropertyHook("_GRS_WorldYBase|_GRS_WorldYScale", ctx => IsAnyIntValue(ctx, "_GRS_HeightType", p => p == 0)), new ConditionVisiblePropertyHook("_GRS_HeightUVType", ctx => IsAnyIntValue(ctx, "_GRS_HeightType", p => p == 1 || p == 2), isRegex:false), From 75e8a1691e31f32dd2c89ba4d83f264e015b8dec Mon Sep 17 00:00:00 2001 From: whiteflare Date: Sun, 4 Feb 2024 02:14:26 +0900 Subject: [PATCH 05/13] =?UTF-8?q?=E3=83=AA=E3=83=A0=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=88=E5=B9=85=E3=81=AE=E4=BF=82=E6=95=B0=E3=82=92=E5=BE=AE?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/WF_MaterialConverter.cs | 2 +- Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader | 2 +- .../Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader | 2 +- Shaders/Unlit_WF_FakeFur_Mix.shader | 2 +- Shaders/Unlit_WF_FakeFur_TransCutout.shader | 2 +- Shaders/Unlit_WF_FakeFur_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader | 2 +- .../Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader | 2 +- ...nlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader | 2 +- .../Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader | 2 +- .../Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader | 2 +- .../Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent_Mask.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader | 2 +- ...Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader | 2 +- Shaders/WF_UnToon_Function.cginc | 5 +++-- 65 files changed, 67 insertions(+), 66 deletions(-) diff --git a/Editor/WF_MaterialConverter.cs b/Editor/WF_MaterialConverter.cs index 4ee58b72..da4402ba 100644 --- a/Editor/WF_MaterialConverter.cs +++ b/Editor/WF_MaterialConverter.cs @@ -1237,7 +1237,7 @@ protected static List> CreateConverterList() // _TR_Powerありの状態から_TR_Widthに変更されたならば、 if (HasOldProperty(ctx, "_TR_Power") && HasNewProperty(ctx, "_TR_Width")) { - WFAccessor.SetFloat(ctx.target, "_TR_Width", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_Width", 1) * 0.05f, 0, 1)); + WFAccessor.SetFloat(ctx.target, "_TR_Width", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_Width", 1) * 0.1f, 0, 1)); WFAccessor.SetFloat(ctx.target, "_TR_WidthTop", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_WidthTop", 1) * 10, 0, 1)); WFAccessor.SetFloat(ctx.target, "_TR_WidthSide", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_WidthSide", 1) * 10, 0, 1)); WFAccessor.SetFloat(ctx.target, "_TR_WidthBottom", Mathf.Clamp(WFAccessor.GetFloat(ctx.target, "_TR_WidthBottom", 1) * 10, 0, 1)); diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader index 8317e2e2..68872177 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader @@ -147,7 +147,7 @@ Shader "UnlitWF_URP/WF_FakeFur_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader index e319fb06..ae42f4d1 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader @@ -144,7 +144,7 @@ Shader "UnlitWF_URP/WF_FakeFur_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader index e313edbf..72d14052 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader @@ -121,7 +121,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader index 65719978..a9a9e212 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader @@ -132,7 +132,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader index f776d8eb..1ac24d6a 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader @@ -132,7 +132,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader index beaefe33..a81c056a 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader @@ -118,7 +118,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader index e6e12847..7fc2509e 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader @@ -121,7 +121,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader index 10fff44a..845c5d8a 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader @@ -229,7 +229,7 @@ Shader "UnlitWF_URP/WF_UnToon_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader index 7dc926ef..16848ab6 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader @@ -245,7 +245,7 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader index 8353b67c..f569b58c 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader @@ -256,7 +256,7 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader index 0f3a12be..d0ff8d76 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader @@ -240,7 +240,7 @@ Shader "UnlitWF_URP/WF_UnToon_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader index 539dd5d2..ff6bb279 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader @@ -247,7 +247,7 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader index 3f2b2bda..c6dcdae0 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader @@ -250,7 +250,7 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_Mask" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader index cda424c9..d6dafe07 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader @@ -250,7 +250,7 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_Mix.shader b/Shaders/Unlit_WF_FakeFur_Mix.shader index ddb8973d..0515162f 100644 --- a/Shaders/Unlit_WF_FakeFur_Mix.shader +++ b/Shaders/Unlit_WF_FakeFur_Mix.shader @@ -147,7 +147,7 @@ Shader "UnlitWF/WF_FakeFur_Mix" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/Unlit_WF_FakeFur_TransCutout.shader b/Shaders/Unlit_WF_FakeFur_TransCutout.shader index c039565c..b44472c8 100644 --- a/Shaders/Unlit_WF_FakeFur_TransCutout.shader +++ b/Shaders/Unlit_WF_FakeFur_TransCutout.shader @@ -143,7 +143,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/Unlit_WF_FakeFur_Transparent.shader b/Shaders/Unlit_WF_FakeFur_Transparent.shader index 8f040f8e..dd597754 100644 --- a/Shaders/Unlit_WF_FakeFur_Transparent.shader +++ b/Shaders/Unlit_WF_FakeFur_Transparent.shader @@ -140,7 +140,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader index d50850c8..69c369a6 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader @@ -237,7 +237,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader index f263fd54..cbe6fddb 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader @@ -248,7 +248,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader index 0eaf653b..d8c09014 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader @@ -251,7 +251,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader b/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader index 85772189..85a5b5d8 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader @@ -233,7 +233,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostOpaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader b/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader index 3725a365..4076530b 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader @@ -244,7 +244,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostTransparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader index cb45fa16..6681661a 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader @@ -234,7 +234,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_MirrorControl_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader index 3f8d9263..4bba692f 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader @@ -246,7 +246,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_OffsetOutline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader index 99a977ef..b605ed07 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader @@ -301,7 +301,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader index cec9c288..6b04f527 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader @@ -312,7 +312,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader index 6cb7360c..e43011c9 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader @@ -310,7 +310,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader index a8bbabec..1efb1195 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader @@ -321,7 +321,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader b/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader index 4b859b99..a08409b6 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader @@ -218,7 +218,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_FrostedGlass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader index 6407645c..d006fab1 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader @@ -252,7 +252,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_Refracted" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader b/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader index 81ed13bb..8fb19a4d 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader @@ -121,7 +121,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader index ac0cf541..3d760152 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader @@ -135,7 +135,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader index 552c5e13..a0f1af75 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader @@ -132,7 +132,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader index 244fb901..03ac47c7 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader @@ -118,7 +118,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader b/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader index dab22be2..4b2e45ab 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader @@ -121,7 +121,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 [NoScaleOffset] diff --git a/Shaders/Unlit_WF_UnToon_Opaque.shader b/Shaders/Unlit_WF_UnToon_Opaque.shader index 37d262ec..89ad86c2 100644 --- a/Shaders/Unlit_WF_UnToon_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Opaque.shader @@ -229,7 +229,7 @@ Shader "UnlitWF/WF_UnToon_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader index 693a2524..c34f00a4 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader @@ -245,7 +245,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader index b9a98c15..850fbbc1 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader @@ -256,7 +256,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader index b3c05621..65c9df82 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader @@ -263,7 +263,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader index 9847abfa..4e220e8e 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader @@ -266,7 +266,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader index f7f50805..6b72c0ff 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader @@ -266,7 +266,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader index 6f575f80..1ecf0a08 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader @@ -267,7 +267,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut_Blend" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader index cb0a4229..5f1c8ea9 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader @@ -285,7 +285,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader b/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader index 45612914..ff9f5031 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader @@ -296,7 +296,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader index ed60c551..9082feae 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader @@ -313,7 +313,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader index 8057caec..9fd3c712 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader @@ -314,7 +314,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader b/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader index f0857b2d..d24a31d2 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader @@ -254,7 +254,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader index 2de035fe..bfedf298 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader @@ -265,7 +265,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader b/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader index aca03fd0..2129b6a9 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader @@ -258,7 +258,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader index 6dc99435..91d0a9b1 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader @@ -275,7 +275,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TransCutout.shader b/Shaders/Unlit_WF_UnToon_TransCutout.shader index 713175d8..a1cca4ab 100644 --- a/Shaders/Unlit_WF_UnToon_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_TransCutout.shader @@ -240,7 +240,7 @@ Shader "UnlitWF/WF_UnToon_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent.shader b/Shaders/Unlit_WF_UnToon_Transparent.shader index e9570f81..1f867794 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent.shader @@ -247,7 +247,7 @@ Shader "UnlitWF/WF_UnToon_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader index 69b1e410..f2537ce3 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader @@ -248,7 +248,7 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader b/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader index fb3d648f..55721031 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader @@ -250,7 +250,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Mask" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader index d47d79eb..b6b70b46 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader @@ -250,7 +250,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader index d1e15292..999c7bf7 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader @@ -251,7 +251,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut_Blend" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader b/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader index 2877d6ea..0b25cb57 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader @@ -186,7 +186,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Opaque" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader b/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader index ad8c4dbf..369e0181 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader @@ -197,7 +197,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_TransCutout" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader index 20c276e9..adda6a98 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader @@ -202,7 +202,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader index b960c87a..4d3b5c90 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader @@ -205,7 +205,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent3Pass" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader index db5d794d..442900ef 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader @@ -189,7 +189,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_Mask" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader index 0ee800ae..7a8b2d5e 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader @@ -205,7 +205,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader index 82f6fad3..dc472db2 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader @@ -206,7 +206,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut_Blend" { _TR_Color ("[TR] Rim Color", Color) = (0.8, 0.8, 0.8, 1) [WF_Enum(UnlitWF.BlendModeTR,ADD,ALPHA,ADD_AND_SUB,MUL)] _TR_BlendType ("[TR] Blend Type", Float) = 0 - _TR_Width ("[TR] Width", Range(0, 1)) = 0.05 + _TR_Width ("[TR] Width", Range(0, 1)) = 0.1 _TR_Feather ("[TR] Feather", Range(0, 1)) = 0.05 _TR_Exponent ("[TR] Exponent", Range(1, 8)) = 1 _TR_BlendNormal ("[TR] Blend Normal", Range(0, 1)) = 0 diff --git a/Shaders/WF_UnToon_Function.cginc b/Shaders/WF_UnToon_Function.cginc index 4de0639f..97804721 100644 --- a/Shaders/WF_UnToon_Function.cginc +++ b/Shaders/WF_UnToon_Function.cginc @@ -1144,8 +1144,9 @@ FEATURE_TGL_END dir_vec.y += (_TR_WidthTop - _TR_WidthBottom); float dir_pwr = length(dir_vec); - float2 rim_max = 1 - _TR_Width * dir_pwr; - float2 rim_min = 1 - (_TR_Width + _TR_Feather) * dir_pwr; + float width = _TR_Width * 0.1; + float2 rim_max = 1 - width * dir_pwr; + float2 rim_min = 1 - (width + _TR_Feather) * dir_pwr; return pow(smoothstep(rim_min - NZF, rim_max, rimPower), max(NZF, _TR_Exponent)); } From 959345c7e04b24c35772f055fd6e6e0407999937 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Sun, 4 Feb 2024 02:31:41 +0900 Subject: [PATCH 06/13] =?UTF-8?q?=E3=83=AA=E3=83=A0=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=88=E5=B9=85=E3=81=AE=E5=BE=AE=E8=AA=BF=E6=95=B4=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6=E3=83=9E=E3=83=86=E3=83=AA?= =?UTF-8?q?=E3=82=A2=E3=83=AB=E3=82=92=E3=82=AF=E3=83=AA=E3=83=B3=E3=83=8A?= =?UTF-8?q?=E3=83=83=E3=83=97(BRP)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Examples/Gem/GemMaterials/BlackGem.mat | 3 +++ Examples/Gem/GemMaterials/GrayGem.mat | 3 +++ Examples/Gem/GemMaterials/LavenderGem.mat | 3 +++ Examples/Gem/GemMaterials/PurpleGem.mat | 3 +++ Examples/Gem/GemMaterials/RedGem.mat | 3 +++ Examples/Gem/GemMaterials/TurquoiseGem.mat | 3 +++ Examples/Gem/GemMaterials/WhiteGem.mat | 3 +++ Examples/Gem/GemMaterials/YellowAndBlueGem.mat | 3 +++ Examples/UnToon_CornelBox/Materials/LightBlue.mat | 2 +- Examples/UnToon_CornelBox/Materials/LightWhite.mat | 2 +- Examples/UnToon_CornelBox/Materials/Metallic.mat | 2 +- Examples/UnToon_CornelBox/Materials/Outline.mat | 1 + Examples/UnToon_CornelBox/Materials/SolidGreen.mat | 2 +- Examples/UnToon_CornelBox/Materials/SolidRed.mat | 2 +- Examples/UnToon_CornelBox/Materials/SolidWhite.mat | 2 +- Examples/UnToon_CornelBox/Materials/Transparent.mat | 2 +- Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat | 4 ++-- Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat | 2 +- Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat | 4 ++-- .../UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat | 2 +- Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat | 2 +- Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat | 2 +- Examples/Water/Other/mat_LampSample.mat | 2 +- "Template/wf00_Basic_\346\250\231\346\272\226.asset" | 2 +- "Template/wf01_Skin_\350\202\214.asset" | 2 +- "Template/wf02_Face_\351\241\224.asset" | 2 +- "Template/wf03_Hair_\351\253\252.asset" | 2 +- ...250\346\203\205\343\203\221\343\203\274\343\203\204.asset" | 1 + "Template/wf21_Metallic_\351\207\221\345\261\236.asset" | 2 +- "Template/wf22_Rubber_\343\202\264\343\203\240.asset" | 2 +- .../wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" | 2 +- "Template/wf24_Gem_\345\256\235\347\237\263.asset" | 3 +++ ...251\343\202\271\343\203\254\343\203\263\343\202\272.asset" | 2 +- ...202\343\202\212\343\202\254\343\203\251\343\202\271.asset" | 2 +- 34 files changed, 54 insertions(+), 25 deletions(-) diff --git a/Examples/Gem/GemMaterials/BlackGem.mat b/Examples/Gem/GemMaterials/BlackGem.mat index a6788bbe..d352fa67 100644 --- a/Examples/Gem/GemMaterials/BlackGem.mat +++ b/Examples/Gem/GemMaterials/BlackGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 0.045542486, g: 0.04282353, b: 0.050980393, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/Gem/GemMaterials/GrayGem.mat b/Examples/Gem/GemMaterials/GrayGem.mat index 56da92ad..2654cfdf 100644 --- a/Examples/Gem/GemMaterials/GrayGem.mat +++ b/Examples/Gem/GemMaterials/GrayGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 0.385, g: 0.385, b: 0.385, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/Gem/GemMaterials/LavenderGem.mat b/Examples/Gem/GemMaterials/LavenderGem.mat index d0ad8825..d36515ee 100644 --- a/Examples/Gem/GemMaterials/LavenderGem.mat +++ b/Examples/Gem/GemMaterials/LavenderGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 0.6952468, g: 0.64161134, b: 1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/Gem/GemMaterials/PurpleGem.mat b/Examples/Gem/GemMaterials/PurpleGem.mat index 8cd2eb19..b8709f9a 100644 --- a/Examples/Gem/GemMaterials/PurpleGem.mat +++ b/Examples/Gem/GemMaterials/PurpleGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1, g: 0.419708, b: 0.52527535, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/Gem/GemMaterials/RedGem.mat b/Examples/Gem/GemMaterials/RedGem.mat index a19f5314..658da063 100644 --- a/Examples/Gem/GemMaterials/RedGem.mat +++ b/Examples/Gem/GemMaterials/RedGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1.2, g: 0.2, b: 0.2, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/Gem/GemMaterials/TurquoiseGem.mat b/Examples/Gem/GemMaterials/TurquoiseGem.mat index c802e6f6..4b5c7c4f 100644 --- a/Examples/Gem/GemMaterials/TurquoiseGem.mat +++ b/Examples/Gem/GemMaterials/TurquoiseGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 0.61931795, g: 0.9435569, b: 0.8464332, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/Gem/GemMaterials/WhiteGem.mat b/Examples/Gem/GemMaterials/WhiteGem.mat index afb717ac..38baa628 100644 --- a/Examples/Gem/GemMaterials/WhiteGem.mat +++ b/Examples/Gem/GemMaterials/WhiteGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/Gem/GemMaterials/YellowAndBlueGem.mat b/Examples/Gem/GemMaterials/YellowAndBlueGem.mat index ed9c49a1..69370c79 100644 --- a/Examples/Gem/GemMaterials/YellowAndBlueGem.mat +++ b/Examples/Gem/GemMaterials/YellowAndBlueGem.mat @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 0.8, g: 0.3982159, b: 0.14559999, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/LightBlue.mat b/Examples/UnToon_CornelBox/Materials/LightBlue.mat index ad6c99e9..c2dae02f 100644 --- a/Examples/UnToon_CornelBox/Materials/LightBlue.mat +++ b/Examples/UnToon_CornelBox/Materials/LightBlue.mat @@ -270,7 +270,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_CornelBox/Materials/LightWhite.mat b/Examples/UnToon_CornelBox/Materials/LightWhite.mat index f7b10e05..48b7127f 100644 --- a/Examples/UnToon_CornelBox/Materials/LightWhite.mat +++ b/Examples/UnToon_CornelBox/Materials/LightWhite.mat @@ -270,7 +270,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_CornelBox/Materials/Metallic.mat b/Examples/UnToon_CornelBox/Materials/Metallic.mat index a402309c..66c859a3 100644 --- a/Examples/UnToon_CornelBox/Materials/Metallic.mat +++ b/Examples/UnToon_CornelBox/Materials/Metallic.mat @@ -297,7 +297,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_CornelBox/Materials/Outline.mat b/Examples/UnToon_CornelBox/Materials/Outline.mat index 1ea4e56e..ef9f2a65 100644 --- a/Examples/UnToon_CornelBox/Materials/Outline.mat +++ b/Examples/UnToon_CornelBox/Materials/Outline.mat @@ -63,6 +63,7 @@ Material: - _TL_LineWidth: 0.3 - _TL_Z_Shift: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_CornelBox/Materials/SolidGreen.mat b/Examples/UnToon_CornelBox/Materials/SolidGreen.mat index 60f7daf8..833738f4 100644 --- a/Examples/UnToon_CornelBox/Materials/SolidGreen.mat +++ b/Examples/UnToon_CornelBox/Materials/SolidGreen.mat @@ -270,7 +270,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_CornelBox/Materials/SolidRed.mat b/Examples/UnToon_CornelBox/Materials/SolidRed.mat index fcf87750..934c1a23 100644 --- a/Examples/UnToon_CornelBox/Materials/SolidRed.mat +++ b/Examples/UnToon_CornelBox/Materials/SolidRed.mat @@ -270,7 +270,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_CornelBox/Materials/SolidWhite.mat b/Examples/UnToon_CornelBox/Materials/SolidWhite.mat index b2b75181..5f3ce01a 100644 --- a/Examples/UnToon_CornelBox/Materials/SolidWhite.mat +++ b/Examples/UnToon_CornelBox/Materials/SolidWhite.mat @@ -270,7 +270,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_CornelBox/Materials/Transparent.mat b/Examples/UnToon_CornelBox/Materials/Transparent.mat index bc277b62..7004351c 100644 --- a/Examples/UnToon_CornelBox/Materials/Transparent.mat +++ b/Examples/UnToon_CornelBox/Materials/Transparent.mat @@ -288,7 +288,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat index d108991b..96513cb7 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_armor.mat @@ -271,7 +271,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 @@ -300,7 +300,7 @@ Material: - _CHM_ColorG: {r: 1, g: 1, b: 1, a: 1} - _CHM_ColorR: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DFD_Color: {r: 0.09999997, g: 0.09999997, b: 0.09999997, a: 1} + - _DFD_Color: {r: 0.1, g: 0.1, b: 0.1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} - _ES_SC_Direction: {r: 0, g: -10, b: 0, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat index f29ae737..6fadcd87 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_body.mat @@ -327,7 +327,7 @@ Material: - _CHM_ColorG: {r: 1, g: 1, b: 1, a: 1} - _CHM_ColorR: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DFD_Color: {r: 0.09999997, g: 0.09999997, b: 0.09999997, a: 1} + - _DFD_Color: {r: 0.1, g: 0.1, b: 0.1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} - _ES_SC_Direction: {r: 0, g: -10, b: 0, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat index ee2a2ea7..76a99d83 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_face.mat @@ -289,7 +289,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 @@ -318,7 +318,7 @@ Material: - _CHM_ColorG: {r: 1, g: 1, b: 1, a: 1} - _CHM_ColorR: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DFD_Color: {r: 0.09999997, g: 0.09999997, b: 0.09999997, a: 1} + - _DFD_Color: {r: 0.1, g: 0.1, b: 0.1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} - _ES_SC_Direction: {r: 0, g: -10, b: 0, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat index 1c81da88..e9f66d61 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_faceoption.mat @@ -133,7 +133,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat index b7d5cb53..aaf0c745 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_hair.mat @@ -299,7 +299,7 @@ Material: - _CHM_ColorG: {r: 1, g: 1, b: 1, a: 1} - _CHM_ColorR: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DFD_Color: {r: 0.09999997, g: 0.09999997, b: 0.09999997, a: 1} + - _DFD_Color: {r: 0.1, g: 0.1, b: 0.1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} - _ES_SC_Direction: {r: 0, g: -10, b: 0, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat index 34f26e92..d4e635b8 100644 --- a/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat +++ b/Examples/UnToon_Sample_2A-7s/2a7s_2eroVRC/mat/tex_photon.mat @@ -134,7 +134,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git a/Examples/Water/Other/mat_LampSample.mat b/Examples/Water/Other/mat_LampSample.mat index 420983fe..825237f0 100644 --- a/Examples/Water/Other/mat_LampSample.mat +++ b/Examples/Water/Other/mat_LampSample.mat @@ -131,7 +131,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf00_Basic_\346\250\231\346\272\226.asset" "b/Template/wf00_Basic_\346\250\231\346\272\226.asset" index 1cda5683..3357d4dc 100644 --- "a/Template/wf00_Basic_\346\250\231\346\272\226.asset" +++ "b/Template/wf00_Basic_\346\250\231\346\272\226.asset" @@ -270,7 +270,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.040000003 + - _TR_Width: 0.08 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf01_Skin_\350\202\214.asset" "b/Template/wf01_Skin_\350\202\214.asset" index d5106d53..7f3499ad 100644 --- "a/Template/wf01_Skin_\350\202\214.asset" +++ "b/Template/wf01_Skin_\350\202\214.asset" @@ -306,7 +306,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.040000003 + - _TR_Width: 0.08 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf02_Face_\351\241\224.asset" "b/Template/wf02_Face_\351\241\224.asset" index 044ad217..000749de 100644 --- "a/Template/wf02_Face_\351\241\224.asset" +++ "b/Template/wf02_Face_\351\241\224.asset" @@ -306,7 +306,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf03_Hair_\351\253\252.asset" "b/Template/wf03_Hair_\351\253\252.asset" index 899c5ae7..ce66fafa 100644 --- "a/Template/wf03_Hair_\351\253\252.asset" +++ "b/Template/wf03_Hair_\351\253\252.asset" @@ -289,7 +289,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.040000003 + - _TR_Width: 0.08 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf09_FacialEffect_\350\241\250\346\203\205\343\203\221\343\203\274\343\203\204.asset" "b/Template/wf09_FacialEffect_\350\241\250\346\203\205\343\203\221\343\203\274\343\203\204.asset" index 27532c00..102bbf88 100644 --- "a/Template/wf09_FacialEffect_\350\241\250\346\203\205\343\203\221\343\203\274\343\203\204.asset" +++ "b/Template/wf09_FacialEffect_\350\241\250\346\203\205\343\203\221\343\203\274\343\203\204.asset" @@ -76,6 +76,7 @@ Material: - _LBE_IndirectMultiplier: 1 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _GL_CustomLitPos: {r: 0, g: 3, b: 0, a: 1} diff --git "a/Template/wf21_Metallic_\351\207\221\345\261\236.asset" "b/Template/wf21_Metallic_\351\207\221\345\261\236.asset" index 1473650d..6577e892 100644 --- "a/Template/wf21_Metallic_\351\207\221\345\261\236.asset" +++ "b/Template/wf21_Metallic_\351\207\221\345\261\236.asset" @@ -271,7 +271,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf22_Rubber_\343\202\264\343\203\240.asset" "b/Template/wf22_Rubber_\343\202\264\343\203\240.asset" index b3d927f0..788d6024 100644 --- "a/Template/wf22_Rubber_\343\202\264\343\203\240.asset" +++ "b/Template/wf22_Rubber_\343\202\264\343\203\240.asset" @@ -270,7 +270,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" "b/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" index 9710cdc0..8129235c 100644 --- "a/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" +++ "b/Template/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" @@ -152,7 +152,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf24_Gem_\345\256\235\347\237\263.asset" "b/Template/wf24_Gem_\345\256\235\347\237\263.asset" index 5975235f..154f08fa 100644 --- "a/Template/wf24_Gem_\345\256\235\347\237\263.asset" +++ "b/Template/wf24_Gem_\345\256\235\347\237\263.asset" @@ -69,6 +69,7 @@ Material: - _ES_AU_Slope: 0.2 - _ES_AuLinkEnable: 0 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -105,8 +106,10 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _QuestSupported: 0 - _UseVertexColor: 0 + - _VRCFallback: 0 m_Colors: - _Color: {r: 0.6952468, g: 0.64161134, b: 1, a: 1} - _DSV_SparkColor: {r: 1, g: 1, b: 1, a: 1} diff --git "a/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" "b/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" index 0d1b6cce..80a4aceb 100644 --- "a/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" +++ "b/Template/wf26_GlassLens_\343\202\254\343\203\251\343\202\271\343\203\254\343\203\263\343\202\272.asset" @@ -298,7 +298,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 diff --git "a/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" "b/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" index 07547041..3957419e 100644 --- "a/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" +++ "b/Template/wf27_FrostedGlass_\343\201\217\343\202\202\343\202\212\343\202\254\343\203\251\343\202\271.asset" @@ -263,7 +263,7 @@ Material: - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Width: 0.05 + - _TR_Width: 0.1 - _TR_WidthBottom: 1 - _TR_WidthSide: 1 - _TR_WidthTop: 0.5 From 657d2b9b7480513358494a6830d6d2ef9db0e914 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Tue, 6 Feb 2024 12:22:24 +0900 Subject: [PATCH 07/13] =?UTF-8?q?=E3=83=9E=E3=83=86=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E6=9C=80=E6=96=B0=E5=8C=96=E3=81=A8=E3=82=AF?= =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=83=8A=E3=83=83=E3=83=97(URP)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/LightBlue.mat | 26 +++++++++++++++--- .../Materials/LightWhite.mat | 26 +++++++++++++++--- .../Materials/Metallic 1.mat | 26 +++++++++++++++--- .../Materials/SolidGreen.mat | 26 +++++++++++++++--- .../Materials/SolidRed.mat | 26 +++++++++++++++--- .../Materials/SolidWhite.mat | 26 +++++++++++++++--- .../Materials/SolidWhiteSmooth 1.mat | 26 +++++++++++++++--- .../Materials/Transparent.mat | 27 ++++++++++++++++--- .../Materials/tex_armor 1.mat | 26 +++++++++++++++--- .../Materials/tex_body 1.mat | 25 ++++++++++++++--- .../Materials/tex_face 1.mat | 25 ++++++++++++++--- .../Materials/tex_faceoption 1.mat | 27 ++++++++++++++++--- .../Materials/tex_hair 1.mat | 26 +++++++++++++++--- .../Materials/tex_photon 1.mat | 27 ++++++++++++++++--- ...wf00_Basic_\346\250\231\346\272\226.asset" | 26 +++++++++++++++--- "Template/URP/wf01_Skin_\350\202\214.asset" | 26 +++++++++++++++--- "Template/URP/wf02_Face_\351\241\224.asset" | 26 +++++++++++++++--- "Template/URP/wf03_Hair_\351\253\252.asset" | 26 +++++++++++++++--- ...1_Metallic_\351\207\221\345\261\236.asset" | 26 +++++++++++++++--- ...f22_Rubber_\343\202\264\343\203\240.asset" | 26 +++++++++++++++--- ...343\203\225\343\202\241\343\203\274.asset" | 25 ++++++++++++++--- .../wf24_Gem_\345\256\235\347\237\263.asset" | 1 + 22 files changed, 463 insertions(+), 84 deletions(-) diff --git a/Examples/UnToonURP_CornelBox/Materials/LightBlue.mat b/Examples/UnToonURP_CornelBox/Materials/LightBlue.mat index f12e4ca8..a71d7f29 100644 --- a/Examples/UnToonURP_CornelBox/Materials/LightBlue.mat +++ b/Examples/UnToonURP_CornelBox/Materials/LightBlue.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/LightWhite.mat b/Examples/UnToonURP_CornelBox/Materials/LightWhite.mat index 78d150a3..de5f4af3 100644 --- a/Examples/UnToonURP_CornelBox/Materials/LightWhite.mat +++ b/Examples/UnToonURP_CornelBox/Materials/LightWhite.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/Metallic 1.mat b/Examples/UnToonURP_CornelBox/Materials/Metallic 1.mat index b01c2c93..3e79015c 100644 --- a/Examples/UnToonURP_CornelBox/Materials/Metallic 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/Metallic 1.mat @@ -28,10 +28,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -130,11 +142,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -205,6 +221,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -223,12 +240,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 1 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0 - - _TR_PowerSide: 0.02 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 0 + - _TR_WidthSide: 0.19999999 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 diff --git a/Examples/UnToonURP_CornelBox/Materials/SolidGreen.mat b/Examples/UnToonURP_CornelBox/Materials/SolidGreen.mat index b16e95fc..a899d890 100644 --- a/Examples/UnToonURP_CornelBox/Materials/SolidGreen.mat +++ b/Examples/UnToonURP_CornelBox/Materials/SolidGreen.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 diff --git a/Examples/UnToonURP_CornelBox/Materials/SolidRed.mat b/Examples/UnToonURP_CornelBox/Materials/SolidRed.mat index 8a0e760a..3758c058 100644 --- a/Examples/UnToonURP_CornelBox/Materials/SolidRed.mat +++ b/Examples/UnToonURP_CornelBox/Materials/SolidRed.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 diff --git a/Examples/UnToonURP_CornelBox/Materials/SolidWhite.mat b/Examples/UnToonURP_CornelBox/Materials/SolidWhite.mat index 8d5706f1..e04cc122 100644 --- a/Examples/UnToonURP_CornelBox/Materials/SolidWhite.mat +++ b/Examples/UnToonURP_CornelBox/Materials/SolidWhite.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 diff --git a/Examples/UnToonURP_CornelBox/Materials/SolidWhiteSmooth 1.mat b/Examples/UnToonURP_CornelBox/Materials/SolidWhiteSmooth 1.mat index f132ce4d..65f5afe2 100644 --- a/Examples/UnToonURP_CornelBox/Materials/SolidWhiteSmooth 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/SolidWhiteSmooth 1.mat @@ -28,10 +28,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -130,11 +142,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -205,6 +221,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -223,12 +240,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 1 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0 - - _TR_PowerSide: 0.02 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 0 + - _TR_WidthSide: 0.19999999 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.5 - _TS_1stFeather: 0 - _TS_2ndBorder: 0.3 diff --git a/Examples/UnToonURP_CornelBox/Materials/Transparent.mat b/Examples/UnToonURP_CornelBox/Materials/Transparent.mat index 9a82c5a0..adc48e26 100644 --- a/Examples/UnToonURP_CornelBox/Materials/Transparent.mat +++ b/Examples/UnToonURP_CornelBox/Materials/Transparent.mat @@ -31,10 +31,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -138,16 +150,21 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 - _DetailNormalMapScale: 0.4 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -218,6 +235,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -236,12 +254,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/tex_armor 1.mat b/Examples/UnToonURP_CornelBox/Materials/tex_armor 1.mat index 242baf67..902cd511 100644 --- a/Examples/UnToonURP_CornelBox/Materials/tex_armor 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/tex_armor 1.mat @@ -28,10 +28,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -130,11 +142,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 @@ -205,6 +221,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -223,12 +240,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/tex_body 1.mat b/Examples/UnToonURP_CornelBox/Materials/tex_body 1.mat index f0e811d5..cf25aac7 100644 --- a/Examples/UnToonURP_CornelBox/Materials/tex_body 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/tex_body 1.mat @@ -28,10 +28,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -138,11 +150,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 1 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 @@ -239,12 +255,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 1 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.1 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 1 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/tex_face 1.mat b/Examples/UnToonURP_CornelBox/Materials/tex_face 1.mat index e228d461..1d6f7670 100644 --- a/Examples/UnToonURP_CornelBox/Materials/tex_face 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/tex_face 1.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -137,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -238,12 +254,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/tex_faceoption 1.mat b/Examples/UnToonURP_CornelBox/Materials/tex_faceoption 1.mat index a786a2c7..33cd6ad8 100644 --- a/Examples/UnToonURP_CornelBox/Materials/tex_faceoption 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/tex_faceoption 1.mat @@ -31,10 +31,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -138,16 +150,21 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 - _DetailNormalMapScale: 0.4 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 0 - _ES_SC_AlphaScroll: 0 - _ES_SC_DirType: 0 @@ -218,6 +235,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -236,12 +254,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/tex_hair 1.mat b/Examples/UnToonURP_CornelBox/Materials/tex_hair 1.mat index e0c209a0..7696db7b 100644 --- a/Examples/UnToonURP_CornelBox/Materials/tex_hair 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/tex_hair 1.mat @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 1 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0 - - _TR_PowerSide: 0.05 - - _TR_PowerTop: 0.01 + - _TR_Width: 0.1 + - _TR_WidthBottom: 0 + - _TR_WidthSide: 0.5 + - _TR_WidthTop: 0.099999994 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git a/Examples/UnToonURP_CornelBox/Materials/tex_photon 1.mat b/Examples/UnToonURP_CornelBox/Materials/tex_photon 1.mat index 5730ad56..9e0e6019 100644 --- a/Examples/UnToonURP_CornelBox/Materials/tex_photon 1.mat +++ b/Examples/UnToonURP_CornelBox/Materials/tex_photon 1.mat @@ -31,10 +31,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -138,16 +150,21 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 0 - _CurrentVersion: 0 - _DetailNormalMapScale: 0.4 - _ES_BlendType: 0 + - _ES_ChangeAlpha: 0 - _ES_Enable: 1 - _ES_SC_AlphaScroll: 1 - _ES_SC_DirType: 0 @@ -218,6 +235,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -236,12 +254,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf00_Basic_\346\250\231\346\272\226.asset" "b/Template/URP/wf00_Basic_\346\250\231\346\272\226.asset" index 67ebe01e..8ec23b57 100644 --- "a/Template/URP/wf00_Basic_\346\250\231\346\272\226.asset" +++ "b/Template/URP/wf00_Basic_\346\250\231\346\272\226.asset" @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 0.8 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.080000006 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf01_Skin_\350\202\214.asset" "b/Template/URP/wf01_Skin_\350\202\214.asset" index b7308b85..d1fe7753 100644 --- "a/Template/URP/wf01_Skin_\350\202\214.asset" +++ "b/Template/URP/wf01_Skin_\350\202\214.asset" @@ -44,10 +44,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailNormalMap: m_Texture: {fileID: 2800000, guid: ba587353da6c721418c7a2b4bd4cd7bf, type: 3} m_Scale: {x: 8, y: 8} @@ -154,11 +166,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -229,6 +245,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 1 - _NS_InvMaskVal: 0 @@ -254,12 +271,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 0.8 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.080000006 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf02_Face_\351\241\224.asset" "b/Template/URP/wf02_Face_\351\241\224.asset" index 9f9c1323..d200e08e 100644 --- "a/Template/URP/wf02_Face_\351\241\224.asset" +++ "b/Template/URP/wf02_Face_\351\241\224.asset" @@ -44,10 +44,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -154,11 +166,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -229,6 +245,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -254,12 +271,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf03_Hair_\351\253\252.asset" "b/Template/URP/wf03_Hair_\351\253\252.asset" index 448bda2e..7fa4b95e 100644 --- "a/Template/URP/wf03_Hair_\351\253\252.asset" +++ "b/Template/URP/wf03_Hair_\351\253\252.asset" @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -137,11 +149,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -212,6 +228,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -237,12 +254,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 1 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 0.8 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.080000006 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf21_Metallic_\351\207\221\345\261\236.asset" "b/Template/URP/wf21_Metallic_\351\207\221\345\261\236.asset" index 73646ef6..e5d06f11 100644 --- "a/Template/URP/wf21_Metallic_\351\207\221\345\261\236.asset" +++ "b/Template/URP/wf21_Metallic_\351\207\221\345\261\236.asset" @@ -28,10 +28,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -130,11 +142,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -205,6 +221,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0.3 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -223,12 +240,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf22_Rubber_\343\202\264\343\203\240.asset" "b/Template/URP/wf22_Rubber_\343\202\264\343\203\240.asset" index 48e71257..ba8cc52e 100644 --- "a/Template/URP/wf22_Rubber_\343\202\264\343\203\240.asset" +++ "b/Template/URP/wf22_Rubber_\343\202\264\343\203\240.asset" @@ -27,10 +27,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _CHM_3chMaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + 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} @@ -129,11 +141,15 @@ Material: - _BKT_Enable: 0 - _BKT_UVType: 0 - _BumpScale: 1 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CHM_Enable: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CullMode: 2 - _CurrentVersion: 0 @@ -204,6 +220,7 @@ Material: - _MT_SpecSmooth: 0.8 - _MT_Specular: 0 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _NM_Power: 0.25 - _NS_Enable: 0 - _NS_InvMaskVal: 0 @@ -222,12 +239,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" "b/Template/URP/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" index b73f252a..61911edd 100644 --- "a/Template/URP/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" +++ "b/Template/URP/wf23_Fur_\343\203\225\343\202\241\343\203\274.asset" @@ -19,6 +19,18 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _CGR_GradMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CGR_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CLC_MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _FUR_BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -77,10 +89,14 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _AL_AlphaToMask: 0 + - _CGR_Enable: 0 + - _CGR_InvMaskVal: 0 - _CLC_DeltaH: 0 - _CLC_DeltaS: 0 - _CLC_DeltaV: 0 - _CLC_Enable: 0 + - _CLC_Gamma: 1 + - _CLC_InvMaskVal: 0 - _CLC_Monochrome: 0 - _CurrentVersion: 0 - _Cutoff: 0.2 @@ -113,12 +129,13 @@ Material: - _TR_BlendType: 0 - _TR_DisableBackLit: 0 - _TR_Enable: 0 + - _TR_Exponent: 1 - _TR_Feather: 0.05 - _TR_InvMaskVal: 0 - - _TR_Power: 1 - - _TR_PowerBottom: 0.1 - - _TR_PowerSide: 0.1 - - _TR_PowerTop: 0.05 + - _TR_Width: 0.1 + - _TR_WidthBottom: 1 + - _TR_WidthSide: 1 + - _TR_WidthTop: 0.5 - _TS_1stBorder: 0.4 - _TS_1stFeather: 0.05 - _TS_2ndBorder: 0.2 diff --git "a/Template/URP/wf24_Gem_\345\256\235\347\237\263.asset" "b/Template/URP/wf24_Gem_\345\256\235\347\237\263.asset" index c84a6a47..7d8d4417 100644 --- "a/Template/URP/wf24_Gem_\345\256\235\347\237\263.asset" +++ "b/Template/URP/wf24_Gem_\345\256\235\347\237\263.asset" @@ -68,6 +68,7 @@ Material: - _GMR_Monochrome: 1 - _GMR_Power: 1 - _NM_Enable: 0 + - _NM_InvConvex: 0 - _UseVertexColor: 0 m_Colors: - _Color: {r: 0.6952468, g: 0.64161134, b: 1, a: 1} From 8270a8c308e1c40505cd24809b9455b61f061831 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Tue, 6 Feb 2024 12:45:25 +0900 Subject: [PATCH 08/13] =?UTF-8?q?BRP=E7=92=B0=E5=A2=83=E3=81=A7=E3=81=AFUR?= =?UTF-8?q?P=E3=83=9E=E3=83=86=E3=83=AA=E3=82=A2=E3=83=AB=E3=82=92?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=B3=E3=83=8A=E3=83=83=E3=83=97=EF=BC=86?= =?UTF-8?q?=E3=83=9E=E3=82=A4=E3=82=B0=E3=83=AC=E3=83=BC=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/WF_MaterialEditUtility.cs | 5 ++++- Editor/WF_ShaderToolWindow.cs | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Editor/WF_MaterialEditUtility.cs b/Editor/WF_MaterialEditUtility.cs index 36d5935c..aa7c7d84 100644 --- a/Editor/WF_MaterialEditUtility.cs +++ b/Editor/WF_MaterialEditUtility.cs @@ -509,7 +509,10 @@ private static bool IsUnlitWFMaterial(Material mm) { if (mm != null && mm.shader != null) { - return mm.shader.name.Contains("UnlitWF") && !mm.shader.name.Contains("Debug"); + if (mm.shader.name.Contains("UnlitWF") && !mm.shader.name.Contains("Debug")) + { + return mm.shader.name.Contains("URP") == WFCommonUtility.IsURP(); + } } return false; } diff --git a/Editor/WF_ShaderToolWindow.cs b/Editor/WF_ShaderToolWindow.cs index 1f802708..be179caa 100644 --- a/Editor/WF_ShaderToolWindow.cs +++ b/Editor/WF_ShaderToolWindow.cs @@ -384,7 +384,10 @@ public static bool IsUnlitWFMaterial(Material mm) { if (mm != null && mm.shader != null) { - return mm.shader.name.Contains("UnlitWF") && !mm.shader.name.Contains("Debug"); + if (mm.shader.name.Contains("UnlitWF") && !mm.shader.name.Contains("Debug")) + { + return mm.shader.name.Contains("URP") == WFCommonUtility.IsURP(); + } } return false; } From e11b1dccea0e1cd8ed32ceef1b03af0b0682512a Mon Sep 17 00:00:00 2001 From: whiteflare Date: Wed, 7 Feb 2024 01:54:51 +0900 Subject: [PATCH 09/13] =?UTF-8?q?Particle/Addition=20=E3=81=A8=20Multiply?= =?UTF-8?q?=20=E3=81=AE=20alpha=20=E8=A8=88=E7=AE=97=E3=81=8C=E3=81=AA?= =?UTF-8?q?=E3=82=93=E3=81=8B=E5=A4=89=E3=81=A0=E3=81=A3=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shaders/Unlit_WF_Particle_Addition.shader | 6 +++--- Shaders/Unlit_WF_Particle_Multiply.shader | 6 +++--- Shaders/WF_Common.cginc | 1 + Shaders/WF_Particle.cginc | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Shaders/Unlit_WF_Particle_Addition.shader b/Shaders/Unlit_WF_Particle_Addition.shader index 9289c99a..32067578 100644 --- a/Shaders/Unlit_WF_Particle_Addition.shader +++ b/Shaders/Unlit_WF_Particle_Addition.shader @@ -109,7 +109,7 @@ Shader "UnlitWF/WF_Particle_Addition" { #define _WF_MAIN_Z_SHIFT (_PA_Z_Offset) #define _WF_MOBILE #define _WF_CUSTOM_FOG_COLOR (fixed4(0, 0, 0, 0)) - #define _WF_PREMUL_ALPHA + #define _WF_PREMUL_ALPHA d.color.rgb *= d.color.a; if (MAX_RGB(d.color.rgb) <= 0) { discard; } #pragma shader_feature_local _ _ES_SCROLL_ENABLE #pragma shader_feature_local _ _ES_AULINK_ENABLE @@ -145,7 +145,7 @@ Shader "UnlitWF/WF_Particle_Addition" { #define _WF_MAIN_Z_SHIFT (_PA_Z_Offset) #define _WF_MOBILE #define _WF_CUSTOM_FOG_COLOR (fixed4(0, 0, 0, 0)) - #define _WF_PREMUL_ALPHA + #define _WF_PREMUL_ALPHA d.color.rgb *= d.color.a; if (MAX_RGB(d.color.rgb) <= 0) { discard; } #pragma shader_feature_local _ _ES_SCROLL_ENABLE #pragma shader_feature_local _ _ES_AULINK_ENABLE @@ -181,7 +181,7 @@ Shader "UnlitWF/WF_Particle_Addition" { #define _WF_MAIN_Z_SHIFT (_PA_Z_Offset) #define _WF_MOBILE #define _WF_CUSTOM_FOG_COLOR (fixed4(0, 0, 0, 0)) - #define _WF_PREMUL_ALPHA + #define _WF_PREMUL_ALPHA d.color.rgb *= d.color.a; if (MAX_RGB(d.color.rgb) <= 0) { discard; } #pragma shader_feature_local _ _ES_SCROLL_ENABLE #pragma shader_feature_local _ _ES_AULINK_ENABLE diff --git a/Shaders/Unlit_WF_Particle_Multiply.shader b/Shaders/Unlit_WF_Particle_Multiply.shader index e2893709..f2946500 100644 --- a/Shaders/Unlit_WF_Particle_Multiply.shader +++ b/Shaders/Unlit_WF_Particle_Multiply.shader @@ -109,7 +109,7 @@ Shader "UnlitWF/WF_Particle_Multiply" { #define _WF_MAIN_Z_SHIFT (_PA_Z_Offset) #define _WF_MOBILE #define _WF_CUSTOM_FOG_COLOR (fixed4(1, 1, 1, 0)) - #define _WF_PREMUL_ALPHA + #define _WF_PREMUL_ALPHA d.color.rgb = lerp(ONE_VEC3, d.color.rgb, d.color.a); if (1 <= MIN_RGB(d.color.rgb)) { discard; } #pragma shader_feature_local _ _ES_SCROLL_ENABLE #pragma shader_feature_local _ _ES_AULINK_ENABLE @@ -145,7 +145,7 @@ Shader "UnlitWF/WF_Particle_Multiply" { #define _WF_MAIN_Z_SHIFT (_PA_Z_Offset) #define _WF_MOBILE #define _WF_CUSTOM_FOG_COLOR (fixed4(1, 1, 1, 0)) - #define _WF_PREMUL_ALPHA + #define _WF_PREMUL_ALPHA d.color.rgb = lerp(ONE_VEC3, d.color.rgb, d.color.a); if (1 <= MIN_RGB(d.color.rgb)) { discard; } #pragma shader_feature_local _ _ES_SCROLL_ENABLE #pragma shader_feature_local _ _ES_AULINK_ENABLE @@ -181,7 +181,7 @@ Shader "UnlitWF/WF_Particle_Multiply" { #define _WF_MAIN_Z_SHIFT (_PA_Z_Offset) #define _WF_MOBILE #define _WF_CUSTOM_FOG_COLOR (fixed4(1, 1, 1, 0)) - #define _WF_PREMUL_ALPHA + #define _WF_PREMUL_ALPHA d.color.rgb = lerp(ONE_VEC3, d.color.rgb, d.color.a); if (1 <= MIN_RGB(d.color.rgb)) { discard; } #pragma shader_feature_local _ _ES_SCROLL_ENABLE #pragma shader_feature_local _ _ES_AULINK_ENABLE diff --git a/Shaders/WF_Common.cginc b/Shaders/WF_Common.cginc index 1afab2de..1a152a68 100644 --- a/Shaders/WF_Common.cginc +++ b/Shaders/WF_Common.cginc @@ -56,6 +56,7 @@ #define MAX3(r, g, b) max(r, max(g, b) ) #define AVE3(r, g, b) ((r + g + b) / 3) #define MAX_RGB(v) max(v.r, max(v.g, v.b)) + #define MIN_RGB(v) min(v.r, min(v.g, v.b)) #define AVE_RGB(v) ((v.r + v.g + v.b) / 3) #define INVERT_MASK_VALUE(rgba, inv) saturate( TGL_OFF(inv) ? rgba : half4(1 - rgba.rgb, rgba.a) ) diff --git a/Shaders/WF_Particle.cginc b/Shaders/WF_Particle.cginc index 00700152..5a488b59 100644 --- a/Shaders/WF_Particle.cginc +++ b/Shaders/WF_Particle.cginc @@ -197,7 +197,7 @@ drawParticleVertexColor(d); // 頂点カラー #ifdef _WF_PREMUL_ALPHA - d.color.rgb *= d.color.a; + _WF_PREMUL_ALPHA #endif drawAlphaMask(d); // アルファ From 16352e7a6e333226b930c7318b89b9cc2cb03652 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Thu, 8 Feb 2024 14:40:13 +0900 Subject: [PATCH 10/13] =?UTF-8?q?Refracted=20=E3=81=AE=E5=B1=88=E6=8A=98?= =?UTF-8?q?=E7=8E=87=E3=82=92=200.8=20=E3=81=BE=E3=81=A7=E4=B8=8B=E3=81=92?= =?UTF-8?q?=E3=82=89=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A8=E3=80=81alpha=20=3D=200=20=E3=81=AE?= =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=81=AB=20discard=20=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Unlit_WF_UnToon_Custom_Transparent_Refracted.shader | 2 +- Shaders/WF_UnToon_Function.cginc | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader index d006fab1..98a119e5 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader @@ -38,7 +38,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_Refracted" { [WFHeaderAlwaysOn(Refraction)] _CRF_Enable ("[CRF] Enable", Float) = 1 - _CRF_RefractiveIndex ("[CRF] Refractive Index", Range(1.0, 3.0)) = 1.33 + _CRF_RefractiveIndex ("[CRF] Refractive Index", Range(0.8, 3.0)) = 1.33 _CRF_Distance ("[CRF] Distance", Range(0, 10)) = 10.0 _CRF_Tint ("[CRF] Tint Color", Color) = (0.5, 0.5, 0.5) _CRF_BlendNormal ("[CRF] Blend Normal", Range(0, 1)) = 0.1 diff --git a/Shaders/WF_UnToon_Function.cginc b/Shaders/WF_UnToon_Function.cginc index 97804721..f027bedc 100644 --- a/Shaders/WF_UnToon_Function.cginc +++ b/Shaders/WF_UnToon_Function.cginc @@ -235,9 +235,11 @@ FEATURE_TGL_END float fa = 1 - abs( dot( d.ws_normal, d.ws_view_dir ) ); d.color.a = lerp( d.color.a, maxValue, fa * fa * fa * fa ); #endif - if (d.color.a <= 0) { - discard; - } + #ifndef _WF_PB_GRAB_TEXTURE + if (d.color.a <= 0) { + discard; + } + #endif } #else #define drawAlphaMask(d) d.color.a = 1.0 From ced0070afdb3a70f97947d4b8cd73505b09f0284 Mon Sep 17 00:00:00 2001 From: whiteflare Date: Sun, 11 Feb 2024 16:48:53 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=A2=E3=82=BB?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=AE=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/WFEditorSetting.cs | 34 ++++++++++++++++++++++++++++++++++ Editor/WF_Dictionary.cs | 1 + 2 files changed, 35 insertions(+) diff --git a/Editor/WFEditorSetting.cs b/Editor/WFEditorSetting.cs index 957d7136..5a315734 100644 --- a/Editor/WFEditorSetting.cs +++ b/Editor/WFEditorSetting.cs @@ -304,6 +304,40 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); WFEditorPrefs.LangMode = (EditorLanguage)EditorGUILayout.EnumPopup("Editor language", WFEditorPrefs.LangMode); + + EditorGUILayout.Space(); + GUI.Label(EditorGUILayout.GetControlRect(), "Other", EditorStyles.boldLabel); + + if (GUI.Button(EditorGUILayout.GetControlRect(), WFI18N.Translate("WFEditorSetting", "Create New Settings asset"))) + { + CreateNewSettingsAsset(); + } + } + + private void CreateNewSettingsAsset() + { + if (target == null) + { + return; + } + var path = EditorUtility.SaveFilePanelInProject("Create New Settings asset", "", "asset", ""); + if (string.IsNullOrWhiteSpace(path)) + { + return; + } + + // 現在の設定をコピーして新しいアセットとする + var newSettings = Instantiate((WFEditorSetting)target); + // 優先度は現在有効になっている設定より小さくする + newSettings.settingPriority = WFEditorSetting.GetOneOfSettings().settingPriority - 1; + + // 新規作成 + AssetDatabase.CreateAsset(newSettings, path); + // 選択する + Selection.activeObject = newSettings; + + // リロード + WFEditorSetting.GetOneOfSettings(true); } private GUIContent toDisplay(SerializedProperty p) diff --git a/Editor/WF_Dictionary.cs b/Editor/WF_Dictionary.cs index 8f54969e..ee541c28 100644 --- a/Editor/WF_Dictionary.cs +++ b/Editor/WF_Dictionary.cs @@ -735,6 +735,7 @@ private static Dictionary ToWFCustomKeywordSetti new WFI18NTranslation("WFEditorSetting", "Enable Scan Projects", "Shaderインポート時にプロジェクトをスキャン"), new WFI18NTranslation("WFEditorSetting", "Enable Migration When Import", "マテリアルインポート時にマテリアルを最新化"), new WFI18NTranslation("WFEditorSetting", "Auto Switch Quest Shader", "Quest向けシェーダに自動で切り替える"), + new WFI18NTranslation("WFEditorSetting", "Create New Settings asset", "設定アセットファイルを新規作成"), // その他のテキスト new WFI18NTranslation(WFMessageText.NewerVersion, "新しいバージョンがリリースされています。\n最新版: "), From 370f2cfafc87e7d0c1929df0aac9d4194990467f Mon Sep 17 00:00:00 2001 From: whiteflare Date: Sun, 11 Feb 2024 16:54:04 +0900 Subject: [PATCH 12/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E6=99=82?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_Transparent.shader | 2 +- Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader | 2 +- Shaders/URP/Unlit_WF_URP_Gem_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_Gem_Transparent.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader | 2 +- .../URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_Opaque.shader | 2 +- .../Unlit_WF_URP_UnToon_Mobile_OutlineOnly_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader | 2 +- .../URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader | 2 +- .../URP/Unlit_WF_URP_UnToon_Mobile_TransparentOverlay.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader | 2 +- Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader | 2 +- Shaders/URP/Unlit_WF_URP_Water_Surface_Opaque.shader | 2 +- Shaders/URP/Unlit_WF_URP_Water_Surface_TransCutout.shader | 2 +- Shaders/URP/Unlit_WF_URP_Water_Surface_Transparent.shader | 2 +- Shaders/Unlit_WF_DebugView.shader | 2 +- Shaders/Unlit_WF_FakeFur_FurOnly_Mix.shader | 2 +- Shaders/Unlit_WF_FakeFur_FurOnly_TransCutout.shader | 2 +- Shaders/Unlit_WF_FakeFur_FurOnly_Transparent.shader | 2 +- Shaders/Unlit_WF_FakeFur_Mix.shader | 2 +- Shaders/Unlit_WF_FakeFur_TransCutout.shader | 2 +- Shaders/Unlit_WF_FakeFur_Transparent.shader | 2 +- Shaders/Unlit_WF_Gem_Opaque.shader | 2 +- Shaders/Unlit_WF_Gem_Transparent.shader | 2 +- Shaders/Unlit_WF_Grass_TransCutout.shader | 2 +- Shaders/Unlit_WF_Particle_Addition.shader | 2 +- Shaders/Unlit_WF_Particle_Multiply.shader | 2 +- Shaders/Unlit_WF_Particle_Opaque.shader | 2 +- Shaders/Unlit_WF_Particle_TransCutout.shader | 2 +- Shaders/Unlit_WF_Particle_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Addition.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_LameOnly_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader | 2 +- .../Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader | 2 +- Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader | 2 +- Shaders/Unlit_WF_UnToon_DepthOnly.shader | 2 +- Shaders/Unlit_WF_UnToon_Hidden.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Mobile_TransparentOverlay.shader | 2 +- Shaders/Unlit_WF_UnToon_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_OutlineOnly_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_OutlineOnly_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent_MaskOut.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader | 2 +- .../Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent_Mask.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader | 2 +- Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader | 2 +- Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader | 2 +- .../Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader | 2 +- Shaders/Unlit_WF_Water_Caustics_Addition.shader | 2 +- Shaders/Unlit_WF_Water_DepthFog_Fade.shader | 2 +- Shaders/Unlit_WF_Water_Lamp_Addition.shader | 2 +- Shaders/Unlit_WF_Water_Sun_Addition.shader | 2 +- Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Opaque.shader | 2 +- Shaders/Unlit_WF_Water_Surface_Custom_Mirror_TransCutout.shader | 2 +- Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Transparent.shader | 2 +- Shaders/Unlit_WF_Water_Surface_Opaque.shader | 2 +- Shaders/Unlit_WF_Water_Surface_TransCutout.shader | 2 +- Shaders/Unlit_WF_Water_Surface_Transparent.shader | 2 +- Shaders/Unlit_WF_Water_Surface_TransparentRefracted.shader | 2 +- version.json | 2 +- 110 files changed, 110 insertions(+), 110 deletions(-) diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_TransCutout.shader index fcf0272a..0a9140e9 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_TransCutout.shader @@ -126,7 +126,7 @@ Shader "UnlitWF_URP/WF_FakeFur_FurOnly_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_Transparent.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_Transparent.shader index 0e74771f..670cdec8 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_FurOnly_Transparent.shader @@ -123,7 +123,7 @@ Shader "UnlitWF_URP/WF_FakeFur_FurOnly_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader index 68872177..d338e0cb 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_TransCutout.shader @@ -182,7 +182,7 @@ Shader "UnlitWF_URP/WF_FakeFur_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader b/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader index ae42f4d1..f4e587dd 100644 --- a/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_FakeFur_Transparent.shader @@ -179,7 +179,7 @@ Shader "UnlitWF_URP/WF_FakeFur_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_Gem_Opaque.shader b/Shaders/URP/Unlit_WF_URP_Gem_Opaque.shader index 4228019f..f8d161f7 100644 --- a/Shaders/URP/Unlit_WF_URP_Gem_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_Gem_Opaque.shader @@ -76,7 +76,7 @@ Shader "UnlitWF_URP/WF_Gem_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_Gem_Transparent.shader b/Shaders/URP/Unlit_WF_URP_Gem_Transparent.shader index 3cb704a0..eef639a6 100644 --- a/Shaders/URP/Unlit_WF_URP_Gem_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_Gem_Transparent.shader @@ -91,7 +91,7 @@ Shader "UnlitWF_URP/WF_Gem_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader index 72d14052..36cd823b 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Opaque.shader @@ -194,7 +194,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_Opaque.shader index 863e0d4c..ec06ac87 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_Opaque.shader @@ -59,7 +59,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_OutlineOnly_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_TransCutout.shader index aacca59c..20d1bd8f 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_OutlineOnly_TransCutout.shader @@ -70,7 +70,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_OutlineOnly_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader index a9a9e212..1fc02a7f 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_Opaque.shader @@ -204,7 +204,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader index 1ac24d6a..cac18e08 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Outline_TransCutout.shader @@ -204,7 +204,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader index a81c056a..801adf0e 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransCutout.shader @@ -190,7 +190,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader index 7fc2509e..2544fb38 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_Transparent.shader @@ -198,7 +198,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransparentOverlay.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransparentOverlay.shader index 0a73a73a..275d246b 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransparentOverlay.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Mobile_TransparentOverlay.shader @@ -79,7 +79,7 @@ Shader "UnlitWF_URP/UnToon_Mobile/WF_UnToon_Mobile_TransparentOverlay" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader index 845c5d8a..ccdf8f19 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Opaque.shader @@ -334,7 +334,7 @@ Shader "UnlitWF_URP/WF_UnToon_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_Opaque.shader index c1fca492..ce06d804 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_Opaque.shader @@ -61,7 +61,7 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_OutlineOnly_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_TransCutout.shader index 4520578c..cd1f4d0d 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_OutlineOnly_TransCutout.shader @@ -72,7 +72,7 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_OutlineOnly_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader index 16848ab6..c534cc09 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_Opaque.shader @@ -350,7 +350,7 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader index f569b58c..dddd0d29 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Outline_TransCutout.shader @@ -361,7 +361,7 @@ Shader "UnlitWF_URP/UnToon_Outline/WF_UnToon_Outline_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader index d0ff8d76..3291688e 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_TransCutout.shader @@ -345,7 +345,7 @@ Shader "UnlitWF_URP/WF_UnToon_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader index ff6bb279..e394ac58 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent.shader @@ -357,7 +357,7 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader index c6dcdae0..a572e6d6 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_Mask.shader @@ -360,7 +360,7 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_Mask" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader index d6dafe07..1e774cd6 100644 --- a/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader +++ b/Shaders/URP/Unlit_WF_URP_UnToon_Transparent_MaskOut.shader @@ -360,7 +360,7 @@ Shader "UnlitWF_URP/WF_UnToon_Transparent_MaskOut" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 } SubShader { diff --git a/Shaders/URP/Unlit_WF_URP_Water_Surface_Opaque.shader b/Shaders/URP/Unlit_WF_URP_Water_Surface_Opaque.shader index d32f23b6..014bf5cb 100644 --- a/Shaders/URP/Unlit_WF_URP_Water_Surface_Opaque.shader +++ b/Shaders/URP/Unlit_WF_URP_Water_Surface_Opaque.shader @@ -110,7 +110,7 @@ Shader "UnlitWF_URP/WF_Water_Surface_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_Water_Surface_TransCutout.shader b/Shaders/URP/Unlit_WF_URP_Water_Surface_TransCutout.shader index e46f0b12..07875ffd 100644 --- a/Shaders/URP/Unlit_WF_URP_Water_Surface_TransCutout.shader +++ b/Shaders/URP/Unlit_WF_URP_Water_Surface_TransCutout.shader @@ -119,7 +119,7 @@ Shader "UnlitWF_URP/WF_Water_Surface_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/URP/Unlit_WF_URP_Water_Surface_Transparent.shader b/Shaders/URP/Unlit_WF_URP_Water_Surface_Transparent.shader index 4ad5ac79..8456619f 100644 --- a/Shaders/URP/Unlit_WF_URP_Water_Surface_Transparent.shader +++ b/Shaders/URP/Unlit_WF_URP_Water_Surface_Transparent.shader @@ -123,7 +123,7 @@ Shader "UnlitWF_URP/WF_Water_Surface_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_DebugView.shader b/Shaders/Unlit_WF_DebugView.shader index fedd95a0..8d1d1b17 100644 --- a/Shaders/Unlit_WF_DebugView.shader +++ b/Shaders/Unlit_WF_DebugView.shader @@ -59,7 +59,7 @@ Shader "UnlitWF/Debug/WF_DebugView" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_FurOnly_Mix.shader b/Shaders/Unlit_WF_FakeFur_FurOnly_Mix.shader index 567bc5c2..915dcbc9 100644 --- a/Shaders/Unlit_WF_FakeFur_FurOnly_Mix.shader +++ b/Shaders/Unlit_WF_FakeFur_FurOnly_Mix.shader @@ -155,7 +155,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Mix" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _VRCFallback ("Hidden", Float) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_FurOnly_TransCutout.shader b/Shaders/Unlit_WF_FakeFur_FurOnly_TransCutout.shader index 9635c400..0a204ea1 100644 --- a/Shaders/Unlit_WF_FakeFur_FurOnly_TransCutout.shader +++ b/Shaders/Unlit_WF_FakeFur_FurOnly_TransCutout.shader @@ -151,7 +151,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _VRCFallback ("Hidden", Float) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_FurOnly_Transparent.shader b/Shaders/Unlit_WF_FakeFur_FurOnly_Transparent.shader index a260c008..24ddaf9a 100644 --- a/Shaders/Unlit_WF_FakeFur_FurOnly_Transparent.shader +++ b/Shaders/Unlit_WF_FakeFur_FurOnly_Transparent.shader @@ -148,7 +148,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _VRCFallback ("Hidden", Float) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_Mix.shader b/Shaders/Unlit_WF_FakeFur_Mix.shader index 0515162f..095e5b20 100644 --- a/Shaders/Unlit_WF_FakeFur_Mix.shader +++ b/Shaders/Unlit_WF_FakeFur_Mix.shader @@ -207,7 +207,7 @@ Shader "UnlitWF/WF_FakeFur_Mix" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_TransCutout.shader b/Shaders/Unlit_WF_FakeFur_TransCutout.shader index b44472c8..c74fcd30 100644 --- a/Shaders/Unlit_WF_FakeFur_TransCutout.shader +++ b/Shaders/Unlit_WF_FakeFur_TransCutout.shader @@ -203,7 +203,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_FakeFur_Transparent.shader b/Shaders/Unlit_WF_FakeFur_Transparent.shader index dd597754..bacc5275 100644 --- a/Shaders/Unlit_WF_FakeFur_Transparent.shader +++ b/Shaders/Unlit_WF_FakeFur_Transparent.shader @@ -200,7 +200,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_Gem_Opaque.shader b/Shaders/Unlit_WF_Gem_Opaque.shader index d511cb00..7aed8a86 100644 --- a/Shaders/Unlit_WF_Gem_Opaque.shader +++ b/Shaders/Unlit_WF_Gem_Opaque.shader @@ -125,7 +125,7 @@ Shader "UnlitWF/WF_Gem_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_Gem_Transparent.shader b/Shaders/Unlit_WF_Gem_Transparent.shader index 8bfcc524..e4e92d78 100644 --- a/Shaders/Unlit_WF_Gem_Transparent.shader +++ b/Shaders/Unlit_WF_Gem_Transparent.shader @@ -156,7 +156,7 @@ Shader "UnlitWF/WF_Gem_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_Grass_TransCutout.shader b/Shaders/Unlit_WF_Grass_TransCutout.shader index 89d3fd8e..43705afb 100644 --- a/Shaders/Unlit_WF_Grass_TransCutout.shader +++ b/Shaders/Unlit_WF_Grass_TransCutout.shader @@ -76,7 +76,7 @@ Shader "UnlitWF/WF_Grass_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Particle_Addition.shader b/Shaders/Unlit_WF_Particle_Addition.shader index 32067578..20407da2 100644 --- a/Shaders/Unlit_WF_Particle_Addition.shader +++ b/Shaders/Unlit_WF_Particle_Addition.shader @@ -71,7 +71,7 @@ Shader "UnlitWF/WF_Particle_Addition" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Particle_Multiply.shader b/Shaders/Unlit_WF_Particle_Multiply.shader index f2946500..666fcf4c 100644 --- a/Shaders/Unlit_WF_Particle_Multiply.shader +++ b/Shaders/Unlit_WF_Particle_Multiply.shader @@ -71,7 +71,7 @@ Shader "UnlitWF/WF_Particle_Multiply" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Particle_Opaque.shader b/Shaders/Unlit_WF_Particle_Opaque.shader index c9aa86e0..8eabf971 100644 --- a/Shaders/Unlit_WF_Particle_Opaque.shader +++ b/Shaders/Unlit_WF_Particle_Opaque.shader @@ -79,7 +79,7 @@ Shader "UnlitWF/WF_Particle_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Particle_TransCutout.shader b/Shaders/Unlit_WF_Particle_TransCutout.shader index 3e4005e5..e2604cc4 100644 --- a/Shaders/Unlit_WF_Particle_TransCutout.shader +++ b/Shaders/Unlit_WF_Particle_TransCutout.shader @@ -90,7 +90,7 @@ Shader "UnlitWF/WF_Particle_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Particle_Transparent.shader b/Shaders/Unlit_WF_Particle_Transparent.shader index 146630bd..5e5097db 100644 --- a/Shaders/Unlit_WF_Particle_Transparent.shader +++ b/Shaders/Unlit_WF_Particle_Transparent.shader @@ -96,7 +96,7 @@ Shader "UnlitWF/WF_Particle_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Addition.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Addition.shader index b664e987..2d91c741 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Addition.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Addition.shader @@ -158,7 +158,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Addition" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _Category ("BRP|UnToon|Custom/ClearCoat|Addition", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader index 69c369a6..25632b17 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader @@ -368,7 +368,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader index cbe6fddb..ca981899 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader @@ -379,7 +379,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader index d8c09014..e219991c 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader @@ -389,7 +389,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader b/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader index 85a5b5d8..574a90a7 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader @@ -353,7 +353,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostOpaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader b/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader index 4076530b..e4ec036a 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader @@ -368,7 +368,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostTransparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_LameOnly_Transparent.shader b/Shaders/Unlit_WF_UnToon_Custom_LameOnly_Transparent.shader index f4b791cc..f1ef19e2 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_LameOnly_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_LameOnly_Transparent.shader @@ -70,7 +70,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_LameOnly_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _Category ("BRP|UnToon|Custom/LameOnly|Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader index 6681661a..098ca30c 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader @@ -365,7 +365,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_MirrorControl_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader index 4bba692f..5a877c0b 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader @@ -366,7 +366,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_OffsetOutline_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader index b605ed07..9e4e633e 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader @@ -431,7 +431,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader index 6b04f527..a7ed3c7d 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_TransCutout.shader @@ -442,7 +442,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader index e43011c9..3cf97a22 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_Opaque.shader @@ -440,7 +440,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Outline/WF_UnToon_Outline_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader index 1efb1195..2655bf64 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Tess_PowerCap_TransCutout.shader @@ -451,7 +451,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Tess_PowerCap_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/WF_UnToon_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader b/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader index a08409b6..3d3e5d1b 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Transparent_FrostedGlass.shader @@ -345,7 +345,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_FrostedGlass" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader index 98a119e5..f76460cd 100644 --- a/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader +++ b/Shaders/Unlit_WF_UnToon_Custom_Transparent_Refracted.shader @@ -390,7 +390,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_Transparent_Refracted" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_DepthOnly.shader b/Shaders/Unlit_WF_UnToon_DepthOnly.shader index 7f560fba..3620bf80 100644 --- a/Shaders/Unlit_WF_UnToon_DepthOnly.shader +++ b/Shaders/Unlit_WF_UnToon_DepthOnly.shader @@ -36,7 +36,7 @@ Shader "UnlitWF/WF_UnToon_DepthOnly" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Hidden.shader b/Shaders/Unlit_WF_UnToon_Hidden.shader index f3803820..eb16a87e 100644 --- a/Shaders/Unlit_WF_UnToon_Hidden.shader +++ b/Shaders/Unlit_WF_UnToon_Hidden.shader @@ -19,7 +19,7 @@ Shader "Hidden/UnlitWF/WF_UnToon_Hidden" { Properties { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader b/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader index 8fb19a4d..aa90de12 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Opaque.shader @@ -209,7 +209,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_Opaque.shader b/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_Opaque.shader index 85f07041..0ffd2140 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_Opaque.shader @@ -59,7 +59,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_OutlineOnly_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_TransCutout.shader index 48854906..7c6216cf 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_OutlineOnly_TransCutout.shader @@ -70,7 +70,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_OutlineOnly_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader index 3d760152..0ce7f6f6 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Outline_Opaque.shader @@ -223,7 +223,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader index a0f1af75..6fabb332 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Outline_TransCutout.shader @@ -219,7 +219,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader index 03ac47c7..ec0b989b 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_TransCutout.shader @@ -205,7 +205,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader b/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader index 4b2e45ab..d0a6e758 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_Transparent.shader @@ -212,7 +212,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Mobile_TransparentOverlay.shader b/Shaders/Unlit_WF_UnToon_Mobile_TransparentOverlay.shader index edc8812e..0b57ffc9 100644 --- a/Shaders/Unlit_WF_UnToon_Mobile_TransparentOverlay.shader +++ b/Shaders/Unlit_WF_UnToon_Mobile_TransparentOverlay.shader @@ -81,7 +81,7 @@ Shader "UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransparentOverlay" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Opaque.shader b/Shaders/Unlit_WF_UnToon_Opaque.shader index 89ad86c2..1887a222 100644 --- a/Shaders/Unlit_WF_UnToon_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Opaque.shader @@ -372,7 +372,7 @@ Shader "UnlitWF/WF_UnToon_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_OutlineOnly_Opaque.shader b/Shaders/Unlit_WF_UnToon_OutlineOnly_Opaque.shader index 666925c8..9155274b 100644 --- a/Shaders/Unlit_WF_UnToon_OutlineOnly_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_OutlineOnly_Opaque.shader @@ -84,7 +84,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_OutlineOnly_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_OutlineOnly_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_OutlineOnly_TransCutout.shader b/Shaders/Unlit_WF_UnToon_OutlineOnly_TransCutout.shader index 7eee8b51..9150d317 100644 --- a/Shaders/Unlit_WF_UnToon_OutlineOnly_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_OutlineOnly_TransCutout.shader @@ -95,7 +95,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_OutlineOnly_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_OutlineOnly_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent.shader b/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent.shader index d0d08b3a..926ba4ef 100644 --- a/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent.shader @@ -94,7 +94,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_OutlineOnly_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _VRCFallback ("Hidden", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent_MaskOut.shader index fc6a913c..54139b11 100644 --- a/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_OutlineOnly_Transparent_MaskOut.shader @@ -98,7 +98,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_OutlineOnly_Transparent_MaskOut" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _VRCFallback ("Hidden", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader b/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader index c34f00a4..0aa0acd2 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Opaque.shader @@ -399,7 +399,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader index 850fbbc1..f0288189 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_TransCutout.shader @@ -410,7 +410,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader index 65c9df82..d450dd4a 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent.shader @@ -424,7 +424,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader index 4e220e8e..1dfc01a7 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent3Pass.shader @@ -427,7 +427,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent3Pass" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader index 6b72c0ff..fbaad32f 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut.shader @@ -427,7 +427,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader index 1ecf0a08..715ca2d5 100644 --- a/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_Outline_Transparent_MaskOut_Blend.shader @@ -428,7 +428,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut_Blend" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader index 5f1c8ea9..1109c661 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Opaque.shader @@ -415,7 +415,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader b/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader index ff9f5031..a90abe3b 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_TransCutout.shader @@ -426,7 +426,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader index 9082feae..3ee0c10f 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent.shader @@ -450,7 +450,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader index 9fd3c712..0f072169 100644 --- a/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_PowerCap_Transparent3Pass.shader @@ -451,7 +451,7 @@ Shader "UnlitWF/UnToon_PowerCap/WF_UnToon_PowerCap_Transparent3Pass" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader b/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader index d24a31d2..5cd3ed8d 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Opaque.shader @@ -408,7 +408,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Outline/WF_UnToon_Outline_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader b/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader index bfedf298..68c4f579 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_TransCutout.shader @@ -419,7 +419,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Outline/WF_UnToon_Outline_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader b/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader index 2129b6a9..fdb02c3f 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Transparent.shader @@ -419,7 +419,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader index 91d0a9b1..b2e3720a 100644 --- a/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Tess_Transparent3Pass.shader @@ -436,7 +436,7 @@ Shader "UnlitWF/UnToon_Tessellation/WF_UnToon_Tess_Transparent3Pass" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent3Pass", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TransCutout.shader b/Shaders/Unlit_WF_UnToon_TransCutout.shader index a1cca4ab..eb9e3288 100644 --- a/Shaders/Unlit_WF_UnToon_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_TransCutout.shader @@ -383,7 +383,7 @@ Shader "UnlitWF/WF_UnToon_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent.shader b/Shaders/Unlit_WF_UnToon_Transparent.shader index 1f867794..0293c344 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent.shader @@ -397,7 +397,7 @@ Shader "UnlitWF/WF_UnToon_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader index f2537ce3..905642b8 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader @@ -398,7 +398,7 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader b/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader index 55721031..f012be10 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader @@ -400,7 +400,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Mask" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader index b6b70b46..bcfdf285 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader @@ -400,7 +400,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader index 999c7bf7..bb21cd6c 100644 --- a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader @@ -401,7 +401,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut_Blend" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _ClearBgSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader b/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader index 0b25cb57..833d5c73 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Opaque.shader @@ -302,7 +302,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader b/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader index 369e0181..0ccbc773 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_TransCutout.shader @@ -313,7 +313,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader index adda6a98..5cce37dc 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent.shader @@ -323,7 +323,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader index 4d3b5c90..e3381f05 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent3Pass.shader @@ -326,7 +326,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent3Pass" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader index 442900ef..df8aefbf 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_Mask.shader @@ -310,7 +310,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_Mask" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader index 7a8b2d5e..71fb58c5 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut.shader @@ -326,7 +326,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader index dc472db2..4405cb40 100644 --- a/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader +++ b/Shaders/Unlit_WF_UnToon_TriShade_Transparent_MaskOut_Blend.shader @@ -327,7 +327,7 @@ Shader "UnlitWF/UnToon_TriShade/WF_UnToon_TriShade_Transparent_MaskOut_Blend" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Caustics_Addition.shader b/Shaders/Unlit_WF_Water_Caustics_Addition.shader index 3389eea5..06022cfe 100644 --- a/Shaders/Unlit_WF_Water_Caustics_Addition.shader +++ b/Shaders/Unlit_WF_Water_Caustics_Addition.shader @@ -65,7 +65,7 @@ Shader "UnlitWF/WF_Water_Caustics_Addition" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_DepthFog_Fade.shader b/Shaders/Unlit_WF_Water_DepthFog_Fade.shader index 76dc588d..64063a0b 100644 --- a/Shaders/Unlit_WF_Water_DepthFog_Fade.shader +++ b/Shaders/Unlit_WF_Water_DepthFog_Fade.shader @@ -29,7 +29,7 @@ Shader "UnlitWF/WF_Water_DepthFog_Fade" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Lamp_Addition.shader b/Shaders/Unlit_WF_Water_Lamp_Addition.shader index c66a2ab1..3f76d9ea 100644 --- a/Shaders/Unlit_WF_Water_Lamp_Addition.shader +++ b/Shaders/Unlit_WF_Water_Lamp_Addition.shader @@ -76,7 +76,7 @@ Shader "UnlitWF/WF_Water_Lamp_Addition" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Sun_Addition.shader b/Shaders/Unlit_WF_Water_Sun_Addition.shader index c2c57206..fbba9a80 100644 --- a/Shaders/Unlit_WF_Water_Sun_Addition.shader +++ b/Shaders/Unlit_WF_Water_Sun_Addition.shader @@ -72,7 +72,7 @@ Shader "UnlitWF/WF_Water_Sun_Addition" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Opaque.shader b/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Opaque.shader index 87ee4861..9b33acff 100644 --- a/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Opaque.shader +++ b/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Opaque.shader @@ -111,7 +111,7 @@ Shader "UnlitWF/WF_Water_Surface_Custom_Mirror_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_TransCutout.shader b/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_TransCutout.shader index 83e71595..6547821c 100644 --- a/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_TransCutout.shader +++ b/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_TransCutout.shader @@ -120,7 +120,7 @@ Shader "UnlitWF/WF_Water_Surface_Custom_Mirror_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Transparent.shader b/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Transparent.shader index 2eba381f..6d999f06 100644 --- a/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Transparent.shader +++ b/Shaders/Unlit_WF_Water_Surface_Custom_Mirror_Transparent.shader @@ -124,7 +124,7 @@ Shader "UnlitWF/WF_Water_Surface_Custom_Mirror_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Surface_Opaque.shader b/Shaders/Unlit_WF_Water_Surface_Opaque.shader index 4ee91f57..e5f8ba56 100644 --- a/Shaders/Unlit_WF_Water_Surface_Opaque.shader +++ b/Shaders/Unlit_WF_Water_Surface_Opaque.shader @@ -110,7 +110,7 @@ Shader "UnlitWF/WF_Water_Surface_Opaque" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Surface_TransCutout.shader b/Shaders/Unlit_WF_Water_Surface_TransCutout.shader index 38cac69a..a859ae35 100644 --- a/Shaders/Unlit_WF_Water_Surface_TransCutout.shader +++ b/Shaders/Unlit_WF_Water_Surface_TransCutout.shader @@ -119,7 +119,7 @@ Shader "UnlitWF/WF_Water_Surface_TransCutout" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Surface_Transparent.shader b/Shaders/Unlit_WF_Water_Surface_Transparent.shader index e7163382..d6e26129 100644 --- a/Shaders/Unlit_WF_Water_Surface_Transparent.shader +++ b/Shaders/Unlit_WF_Water_Surface_Transparent.shader @@ -123,7 +123,7 @@ Shader "UnlitWF/WF_Water_Surface_Transparent" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _QuestSupported ("True", Float) = 0 diff --git a/Shaders/Unlit_WF_Water_Surface_TransparentRefracted.shader b/Shaders/Unlit_WF_Water_Surface_TransparentRefracted.shader index 1ec6c2a1..622e9583 100644 --- a/Shaders/Unlit_WF_Water_Surface_TransparentRefracted.shader +++ b/Shaders/Unlit_WF_Water_Surface_TransparentRefracted.shader @@ -130,7 +130,7 @@ Shader "UnlitWF/WF_Water_Surface_Transparent_Refracted" { [HideInInspector] [WF_FixFloat(0.0)] - _CurrentVersion ("2024/01/28 (1.9.0)", Float) = 0 + _CurrentVersion ("2024/02/12 (1.10.0)", Float) = 0 [HideInInspector] [WF_FixFloat(0.0)] _FallBack ("UnlitWF/WF_Water_Surface_Transparent", Float) = 0 diff --git a/version.json b/version.json index e925adf0..af507036 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{ "latestVersion": "2024/01/28 (1.9.0)", "downloadPage": "/releases/tag/UnlitWF_Shader_20240128" } \ No newline at end of file +{ "latestVersion": "2024/02/12 (1.10.0)", "downloadPage": "/releases/tag/UnlitWF_Shader_20240212" } \ No newline at end of file From a668037485009e4f6f28a6f91897e07f245f1a6c Mon Sep 17 00:00:00 2001 From: whiteflare Date: Sun, 11 Feb 2024 18:07:16 +0900 Subject: [PATCH 13/13] =?UTF-8?q?FakeFur=E3=81=A7DFD=E3=81=8C=E4=BD=BF?= =?UTF-8?q?=E3=81=88=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shaders/WF_FakeFur.cginc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Shaders/WF_FakeFur.cginc b/Shaders/WF_FakeFur.cginc index c15f5acf..485d976d 100644 --- a/Shaders/WF_FakeFur.cginc +++ b/Shaders/WF_FakeFur.cginc @@ -82,6 +82,7 @@ half3 ws_light_dir; half angle_light_camera; half3 light_color; + uint facing; #ifdef _V2F_HAS_SHADOWPOWER half shadow_power; #endif @@ -92,6 +93,7 @@ d.color = half4(1, 1, 1, 1); d.uv1 = i.uv; + d.facing = 1; // furは常にfacing=1 d.uv_main = i.uv; d.ws_vertex = i.ws_vertex; d.light_color = i.light_color;