From f120c4f9ff4d1e7e3a9de17ca5c4eeb695e7ac53 Mon Sep 17 00:00:00 2001 From: "DESKTOP-S4BOTN2\\user" Date: Sat, 10 May 2025 23:24:42 +0900 Subject: [PATCH] =?UTF-8?q?Modify:=20=EB=A6=B4=ED=88=B0=201.7.3=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=EC=9C=BC=EB=A1=9C=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/External/lilToon.meta | 2 +- Assets/External/lilToon/CHANGELOG.md | 4 +- Assets/External/lilToon/CHANGELOG_JP.md | 4 +- .../BRP/Default.lilblock | 22 -- .../BRP/DefaultFur.lilblock | 11 - .../BRP/DefaultFurTwoPass.lilblock | 11 - .../BRP/DefaultGem.lilblock | 11 - .../BRP/DefaultLite.lilblock | 22 -- .../BRP/DefaultLiteTwoSide.lilblock | 22 -- .../BRP/DefaultMulti.lilblock | 11 - .../BRP/DefaultMultiFur.lilblock | 11 - .../BRP/DefaultMultiGem.lilblock | 11 - .../BRP/DefaultMultiOutline.lilblock | 11 - .../BRP/DefaultMultiRefraction.lilblock | 11 - .../BRP/DefaultRefraction.lilblock | 11 - .../BRP/DefaultRefractionBlur.lilblock | 11 - .../BRP/DefaultTessellation.lilblock | 22 -- .../BRP/DefaultTessellationTwoSide.lilblock | 22 -- .../BRP/DefaultTwoSide.lilblock | 22 -- .../Properties/DefaultAll.lilblock | 3 - .../Properties/DefaultFurCutout.lilblock | 3 - .../Properties/DefaultFurTransparent.lilblock | 3 - Assets/External/lilToon/Editor/CurrentRP.txt | 4 +- .../lilToon/Editor/Resources/lang.txt | 4 +- .../External/lilToon/Editor/lilConstants.cs | 4 +- .../lilToon/Editor/lilLanguageManager.cs | 4 +- .../lilToon/Editor/lilMaterialProperty.cs | 10 +- .../lilToon/Editor/lilMaterialUtils.cs | 68 ++---- .../Editor/lilShaderContainerImporter.cs | 6 - .../lilToon/Editor/lilShaderManager.cs | 22 +- Assets/External/lilToon/Editor/lilStartup.cs | 25 +- .../lilToon/Editor/lilToon.Editor.asmdef | 5 - .../External/lilToon/Editor/lilToonSetting.cs | 217 +++++++++--------- .../External/Editor/ChilloutVRModule.cs | 15 +- .../lilToon/External/Editor/VRChatModule.cs | 78 +++++-- Assets/External/lilToon/LICENSE | 2 +- Assets/External/lilToon/README.md | 4 +- Assets/External/lilToon/README_JP.md | 4 +- .../Shader/Includes/lil_common_frag.hlsl | 64 ++---- .../Includes/lil_common_frag_alpha.hlsl | 13 +- .../lil_common_functions_thirdparty.hlsl | 75 ------ .../Shader/Includes/lil_common_input.hlsl | 5 +- .../Includes/lil_common_input_base.hlsl | 3 - .../Shader/Includes/lil_common_input_opt.hlsl | 3 - .../Shader/Includes/lil_common_macro.hlsl | 11 +- .../Shader/Includes/lil_common_vert.hlsl | 28 +-- .../Shader/Includes/lil_common_vert_fur.hlsl | 34 ++- .../lil_common_vert_fur_thirdparty.hlsl | 14 +- .../Includes/lil_pass_forward_fakeshadow.hlsl | 4 +- .../Shader/Includes/lil_pass_forward_fur.hlsl | 39 ++-- .../Includes/lil_pass_forward_normal.hlsl | 88 +++---- .../Includes/lil_pass_shadowcaster.hlsl | 2 +- Assets/External/lilToon/Shader/lts.shader | 2 +- .../External/lilToon/Shader/lts_cutout.shader | 2 +- .../lilToon/Shader/lts_cutout_o.shader | 2 +- .../lilToon/Shader/lts_cutout_oo.shader | 2 +- .../lilToon/Shader/lts_fakeshadow.shader | 2 +- Assets/External/lilToon/Shader/lts_fur.shader | 5 +- .../lilToon/Shader/lts_fur_cutout.shader | 5 +- .../lilToon/Shader/lts_fur_two.shader | 5 +- .../lilToon/Shader/lts_furonly.shader | 5 +- .../lilToon/Shader/lts_furonly_cutout.shader | 5 +- .../lilToon/Shader/lts_furonly_two.shader | 5 +- Assets/External/lilToon/Shader/lts_gem.shader | 2 +- Assets/External/lilToon/Shader/lts_o.shader | 2 +- .../lilToon/Shader/lts_onetrans.shader | 2 +- .../lilToon/Shader/lts_onetrans_o.shader | 2 +- Assets/External/lilToon/Shader/lts_oo.shader | 2 +- .../lilToon/Shader/lts_overlay.shader | 2 +- .../lilToon/Shader/lts_overlay_one.shader | 2 +- Assets/External/lilToon/Shader/lts_ref.shader | 2 +- .../lilToon/Shader/lts_ref_blur.shader | 2 +- .../External/lilToon/Shader/lts_tess.shader | 2 +- .../lilToon/Shader/lts_tess_cutout.shader | 2 +- .../lilToon/Shader/lts_tess_cutout_o.shader | 2 +- .../External/lilToon/Shader/lts_tess_o.shader | 2 +- .../lilToon/Shader/lts_tess_onetrans.shader | 2 +- .../lilToon/Shader/lts_tess_onetrans_o.shader | 2 +- .../lilToon/Shader/lts_tess_trans.shader | 2 +- .../lilToon/Shader/lts_tess_trans_o.shader | 2 +- .../lilToon/Shader/lts_tess_twotrans.shader | 2 +- .../lilToon/Shader/lts_tess_twotrans_o.shader | 2 +- .../External/lilToon/Shader/lts_trans.shader | 2 +- .../lilToon/Shader/lts_trans_o.shader | 2 +- .../lilToon/Shader/lts_trans_oo.shader | 2 +- .../lilToon/Shader/lts_twotrans.shader | 2 +- .../lilToon/Shader/lts_twotrans_o.shader | 2 +- Assets/External/lilToon/Shader/ltsl.shader | 2 +- .../lilToon/Shader/ltsl_cutout.shader | 2 +- .../lilToon/Shader/ltsl_cutout_o.shader | 2 +- Assets/External/lilToon/Shader/ltsl_o.shader | 2 +- .../lilToon/Shader/ltsl_onetrans.shader | 2 +- .../lilToon/Shader/ltsl_onetrans_o.shader | 2 +- .../lilToon/Shader/ltsl_overlay.shader | 2 +- .../lilToon/Shader/ltsl_overlay_one.shader | 2 +- .../External/lilToon/Shader/ltsl_trans.shader | 2 +- .../lilToon/Shader/ltsl_trans_o.shader | 2 +- .../lilToon/Shader/ltsl_twotrans.shader | 2 +- .../lilToon/Shader/ltsl_twotrans_o.shader | 2 +- .../External/lilToon/Shader/ltsmulti.shader | 2 +- .../lilToon/Shader/ltsmulti_fur.shader | 5 +- .../lilToon/Shader/ltsmulti_gem.shader | 2 +- .../External/lilToon/Shader/ltsmulti_o.shader | 2 +- .../lilToon/Shader/ltsmulti_ref.shader | 2 +- .../lilToon/Shader/ltspass_cutout.shader | 2 +- .../lilToon/Shader/ltspass_lite_cutout.shader | 2 +- .../lilToon/Shader/ltspass_lite_opaque.shader | 2 +- .../Shader/ltspass_lite_transparent.shader | 2 +- .../lilToon/Shader/ltspass_opaque.shader | 2 +- .../lilToon/Shader/ltspass_proponly.shader | 5 +- .../lilToon/Shader/ltspass_tess_cutout.shader | 2 +- .../lilToon/Shader/ltspass_tess_opaque.shader | 2 +- .../Shader/ltspass_tess_transparent.shader | 2 +- .../lilToon/Shader/ltspass_transparent.shader | 2 +- .../External/lilToon/Third Party Notices.md | 4 +- Assets/External/lilToon/package.json | 4 +- 116 files changed, 424 insertions(+), 848 deletions(-) diff --git a/Assets/External/lilToon.meta b/Assets/External/lilToon.meta index a390b9a3..c9e85e26 100644 --- a/Assets/External/lilToon.meta +++ b/Assets/External/lilToon.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64d5c1392c9bac842ad516cef3d16abe +guid: 05d1d116436047941ad97d1b9064ee05 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/External/lilToon/CHANGELOG.md b/Assets/External/lilToon/CHANGELOG.md index b40f748f..523f49f3 100644 --- a/Assets/External/lilToon/CHANGELOG.md +++ b/Assets/External/lilToon/CHANGELOG.md @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5adc1607ce152012b2cd80642fdff01d954fcc6f45112d93d58bc9daecbc72c7 -size 21961 +oid sha256:c7bd00c4cb3dbb0d54540f09a7dc81b192cb47d2d4e6a9f823f14ddb8875c81d +size 20907 diff --git a/Assets/External/lilToon/CHANGELOG_JP.md b/Assets/External/lilToon/CHANGELOG_JP.md index 3aafc018..c1487695 100644 --- a/Assets/External/lilToon/CHANGELOG_JP.md +++ b/Assets/External/lilToon/CHANGELOG_JP.md @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6da53157f876ac5a1d33bded6db56d5e9eeceb6eb71aff3c3029a1c2f4e6a109 -size 28966 +oid sha256:6b38c0169277c63465d828958a5a148e3928bb25ddc851ef3c9a364a31453639 +size 27393 diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/Default.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/Default.lilblock index fece2d0e..9a7c1bb0 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/Default.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/Default.lilblock @@ -217,17 +217,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] @@ -257,17 +246,6 @@ { Name "SHADOW_CASTER_OUTLINE" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFur.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFur.lilblock index 7ebfee4a..521c8737 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFur.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFur.lilblock @@ -218,17 +218,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFurTwoPass.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFurTwoPass.lilblock index 3f6bbde0..a895a172 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFurTwoPass.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultFurTwoPass.lilblock @@ -316,17 +316,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultGem.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultGem.lilblock index 84046e7f..2252e851 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultGem.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultGem.lilblock @@ -111,17 +111,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLite.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLite.lilblock index 975d54a8..4b1c2475 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLite.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLite.lilblock @@ -217,17 +217,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] @@ -257,17 +246,6 @@ { Name "SHADOW_CASTER_OUTLINE" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLiteTwoSide.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLiteTwoSide.lilblock index 4c681410..23cab4fe 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLiteTwoSide.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultLiteTwoSide.lilblock @@ -265,17 +265,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] @@ -305,17 +294,6 @@ { Name "SHADOW_CASTER_OUTLINE" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock index 58c2c273..45b0f66e 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock @@ -220,17 +220,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock index e27fd8f5..82a2c5c9 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock @@ -337,17 +337,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiGem.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiGem.lilblock index 20b0c6d4..ab9d4dde 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiGem.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiGem.lilblock @@ -148,17 +148,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock index 9f9350fa..70d8d4f8 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock @@ -353,17 +353,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock index 21edde6c..4a6fe913 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock @@ -213,17 +213,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefraction.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefraction.lilblock index 0ba1bcb6..4e24b828 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefraction.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefraction.lilblock @@ -123,17 +123,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefractionBlur.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefractionBlur.lilblock index 18432c26..cee10504 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefractionBlur.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultRefractionBlur.lilblock @@ -168,17 +168,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellation.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellation.lilblock index 7003ca30..b73a28de 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellation.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellation.lilblock @@ -232,17 +232,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] @@ -272,17 +261,6 @@ { Name "SHADOW_CASTER_OUTLINE" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellationTwoSide.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellationTwoSide.lilblock index d66405b9..f78ea94a 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellationTwoSide.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTessellationTwoSide.lilblock @@ -285,17 +285,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] @@ -325,17 +314,6 @@ { Name "SHADOW_CASTER_OUTLINE" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTwoSide.lilblock b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTwoSide.lilblock index 7b928096..36e519b0 100644 --- a/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTwoSide.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/BRP/DefaultTwoSide.lilblock @@ -266,17 +266,6 @@ { Name "SHADOW_CASTER" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] @@ -306,17 +295,6 @@ { Name "SHADOW_CASTER_OUTLINE" Tags {"LightMode" = "ShadowCaster"} - - Stencil - { - Ref [_StencilRef] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - Comp [_StencilComp] - Pass [_StencilPass] - Fail [_StencilFail] - ZFail [_StencilZFail] - } Offset 1, 1 Cull [_Cull] diff --git a/Assets/External/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock b/Assets/External/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock index 5ba12288..f66bc464 100644 --- a/Assets/External/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock @@ -690,9 +690,6 @@ _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("Cutout Length", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurCutout.lilblock b/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurCutout.lilblock index d53df74c..21b9caaf 100644 --- a/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurCutout.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurCutout.lilblock @@ -46,9 +46,6 @@ _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurTransparent.lilblock b/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurTransparent.lilblock index 07ab6372..5217da04 100644 --- a/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurTransparent.lilblock +++ b/Assets/External/lilToon/CustomShaderResources/Properties/DefaultFurTransparent.lilblock @@ -46,9 +46,6 @@ _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Editor/CurrentRP.txt b/Assets/External/lilToon/Editor/CurrentRP.txt index 6ecfea71..1a50f0ff 100644 --- a/Assets/External/lilToon/Editor/CurrentRP.txt +++ b/Assets/External/lilToon/Editor/CurrentRP.txt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:239e4707167426baf32fb877c5dbc6d9f4bce53354eef80a16e04cdec2c8c377 -size 19 +oid sha256:ca731f7df0fcb32566120029b937a471ab064d1b891eec53c57a4673c9561ed9 +size 17 diff --git a/Assets/External/lilToon/Editor/Resources/lang.txt b/Assets/External/lilToon/Editor/Resources/lang.txt index 4ce1e09e..94dd84a2 100644 --- a/Assets/External/lilToon/Editor/Resources/lang.txt +++ b/Assets/External/lilToon/Editor/Resources/lang.txt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e94ce9f73d2723081a3097496b6d42382da070bebf051bcd99d3f4fa5913227c -size 63094 +oid sha256:7fb074c26f249d03c28db38d78d6f42828137dfcb7773d2882913aeb99d207b1 +size 63563 diff --git a/Assets/External/lilToon/Editor/lilConstants.cs b/Assets/External/lilToon/Editor/lilConstants.cs index d720f571..361049a2 100644 --- a/Assets/External/lilToon/Editor/lilConstants.cs +++ b/Assets/External/lilToon/Editor/lilConstants.cs @@ -6,8 +6,8 @@ namespace lilToon { public class lilConstants { - public const string currentVersionName = "1.9.0"; - public const int currentVersionValue = 45; + public const string currentVersionName = "1.7.3"; + public const int currentVersionValue = 43; internal const string boothURL = "https://lilxyzw.booth.pm/"; internal const string githubURL = "https://github.com/lilxyzw/lilToon"; diff --git a/Assets/External/lilToon/Editor/lilLanguageManager.cs b/Assets/External/lilToon/Editor/lilLanguageManager.cs index b381d882..040b4a44 100644 --- a/Assets/External/lilToon/Editor/lilLanguageManager.cs +++ b/Assets/External/lilToon/Editor/lilLanguageManager.cs @@ -157,7 +157,7 @@ namespace lilToon loc["sGlitterParams2"] = BuildParams(GetLoc("sBlinkSpeed"), GetLoc("sAngleLimit"), GetLoc("sRimLightDirection"), GetLoc("sColorRandomness")); loc["sOutlineVertexColorUsages"] = BuildParams(GetLoc("sVertexColor"), GetLoc("sNone"), GetLoc("sVertexR2Width"), GetLoc("sVertexRGBA2Normal")); loc["sShadowColorTypes"] = BuildParams(GetLoc("sColorType"), GetLoc("sColorTypeNormal"), GetLoc("sColorTypeLUT")); - loc["sShadowMaskTypes"] = BuildParams(GetLoc("sMaskType"), GetLoc("sStrength"), GetLoc("sFlat"), "SDF"); + loc["sShadowMaskTypes"] = BuildParams(GetLoc("sMaskType"), GetLoc("sStrength"), GetLoc("sFlat")); loc["sHSVGs"] = BuildParams(GetLoc("sHue"), GetLoc("sSaturation"), GetLoc("sValue"), GetLoc("sGamma")); loc["sScrollRotates"] = BuildParams(GetLoc("sAngle"), GetLoc("sUVAnimation"), GetLoc("sScroll"), GetLoc("sRotate")); loc["sDecalAnimations"] = BuildParams(GetLoc("sAnimation"), GetLoc("sXFrames"), GetLoc("sYFrames"), GetLoc("sFrames"), GetLoc("sFPS")); @@ -190,7 +190,7 @@ namespace lilToon sBlendModeList = new[]{GetLoc("sBlendModeNormal"), GetLoc("sBlendModeAdd"), GetLoc("sBlendModeScreen"), GetLoc("sBlendModeMul")}; sOutlineVertexColorUsages = BuildParams(GetLoc("sVertexColor"), GetLoc("sNone"), GetLoc("sVertexR2Width"), GetLoc("sVertexRGBA2Normal")); sShadowColorTypes = BuildParams(GetLoc("sColorType"), GetLoc("sColorTypeNormal"), GetLoc("sColorTypeLUT")); - sShadowMaskTypes = BuildParams(GetLoc("sMaskType"), GetLoc("sStrength"), GetLoc("sFlat"), "SDF"); + sShadowMaskTypes = BuildParams(GetLoc("sMaskType"), GetLoc("sStrength"), GetLoc("sFlat")); colorRGBAContent = new GUIContent(GetLoc("sColor"), GetLoc("sTextureRGBA")); colorAlphaRGBAContent = new GUIContent(GetLoc("sColorAlpha"), GetLoc("sTextureRGBA")); maskBlendContent = new GUIContent(GetLoc("sMask"), GetLoc("sBlendR")); diff --git a/Assets/External/lilToon/Editor/lilMaterialProperty.cs b/Assets/External/lilToon/Editor/lilMaterialProperty.cs index a77dc267..8e2597b7 100644 --- a/Assets/External/lilToon/Editor/lilMaterialProperty.cs +++ b/Assets/External/lilToon/Editor/lilMaterialProperty.cs @@ -9,7 +9,7 @@ namespace lilToon internal class lilMaterialProperty { public MaterialProperty p; - public HashSet blocks; + public List blocks; public string propertyName; public bool isTexture; @@ -94,7 +94,7 @@ namespace lilToon public lilMaterialProperty() { p = null; - blocks = new HashSet(); + blocks = new List(); isTexture = false; propertyName = null; } @@ -102,7 +102,7 @@ namespace lilToon public lilMaterialProperty(string name, params PropertyBlock[] inBrocks) { p = null; - blocks = inBrocks.ToHashSet(); + blocks = inBrocks.ToList(); isTexture = false; propertyName = name; } @@ -110,7 +110,7 @@ namespace lilToon public lilMaterialProperty(string name, bool isTex, params PropertyBlock[] inBrocks) { p = null; - blocks = inBrocks.ToHashSet(); + blocks = inBrocks.ToList(); isTexture = isTex; propertyName = name; } @@ -126,4 +126,4 @@ namespace lilToon } } } -#endif +#endif \ No newline at end of file diff --git a/Assets/External/lilToon/Editor/lilMaterialUtils.cs b/Assets/External/lilToon/Editor/lilMaterialUtils.cs index 63e3e4cd..06ab27e0 100644 --- a/Assets/External/lilToon/Editor/lilMaterialUtils.cs +++ b/Assets/External/lilToon/Editor/lilMaterialUtils.cs @@ -17,7 +17,6 @@ namespace lilToon { internal static void SetupMaterialWithRenderingMode(Material material, RenderingMode renderingMode, TransparentMode transparentMode, bool isoutl, bool islite, bool istess, bool ismulti) { - Undo.RecordObject(material, null); int renderQueue = GetTrueRenderQueue(material); RenderingMode rend = renderingMode; lilRenderPipeline RP = lilRenderPipelineReader.GetRP(); @@ -538,54 +537,49 @@ namespace lilToon else material.DisableKeyword(keyword); } - public static void RemoveUnusedTexture(Material material, params string[] animatedProps) + public static void RemoveUnusedTexture(Material material) { if(!material.shader.name.Contains("lilToon")) return; - RemoveUnusedTexture(material, material.shader.name.Contains("Lite"), animatedProps); + RemoveUnusedTexture(material, material.shader.name.Contains("Lite")); } - public static void RemoveUnusedTexture(Material material, bool islite, params string[] animatedProps) + public static void RemoveUnusedTexture(Material material, bool islite) { RemoveUnusedProperties(material); - RemoveUnusedTextureOnly(material, islite, animatedProps); - } - - public static void RemoveUnusedTextureOnly(Material material, bool islite, params string[] animatedProps) - { if(islite) { - if(IsPropZero(material, "_UseShadow", animatedProps)) + if(material.GetFloat("_UseShadow") == 0.0f) { material.SetTexture("_ShadowColorTex", null); material.SetTexture("_Shadow2ndColorTex", null); } - if(IsPropZero(material, "_UseEmission", animatedProps)) + if(material.GetFloat("_UseEmission") == 0.0f) { material.SetTexture("_EmissionMap", null); } - if(IsPropZero(material, "_UseMatCap", animatedProps)) + if(material.GetFloat("_UseMatCap") == 0.0f) { material.SetTexture("_MatCapTex", null); } } else { - if(IsPropZero(material, "_MainGradationStrength", animatedProps)) material.SetTexture("_MainGradationTex", null); - if(IsPropZero(material, "_UseMain2ndTex", animatedProps)) + if(material.GetFloat("_MainGradationStrength") == 0.0f) material.SetTexture("_MainGradationTex", null); + if(material.GetFloat("_UseMain2ndTex") == 0.0f) { material.SetTexture("_Main2ndTex", null); material.SetTexture("_Main2ndBlendMask", null); material.SetTexture("_Main2ndDissolveMask", null); material.SetTexture("_Main2ndDissolveNoiseMask", null); } - if(IsPropZero(material, "_UseMain3rdTex", animatedProps)) + if(material.GetFloat("_UseMain3rdTex") == 0.0f) { material.SetTexture("_Main3rdTex", null); material.SetTexture("_Main3rdBlendMask", null); material.SetTexture("_Main3rdDissolveMask", null); material.SetTexture("_Main3rdDissolveNoiseMask", null); } - if(IsPropZero(material, "_UseShadow", animatedProps)) + if(material.GetFloat("_UseShadow") == 0.0f) { material.SetTexture("_ShadowBlurMask", null); material.SetTexture("_ShadowBorderMask", null); @@ -594,52 +588,50 @@ namespace lilToon material.SetTexture("_Shadow2ndColorTex", null); material.SetTexture("_Shadow3rdColorTex", null); } - if(IsPropZero(material, "_UseRimShade", animatedProps)) + if(material.GetFloat("_UseRimShade") == 0.0f) { material.SetTexture("_RimShadeMask", null); } - if(IsPropZero(material, "_UseEmission", animatedProps)) + if(material.GetFloat("_UseEmission") == 0.0f) { material.SetTexture("_EmissionMap", null); material.SetTexture("_EmissionBlendMask", null); material.SetTexture("_EmissionGradTex", null); } - if(IsPropZero(material, "_UseEmission2nd", animatedProps)) + if(material.GetFloat("_UseEmission2nd") == 0.0f) { material.SetTexture("_Emission2ndMap", null); material.SetTexture("_Emission2ndBlendMask", null); material.SetTexture("_Emission2ndGradTex", null); } - if(IsPropZero(material, "_UseBumpMap", animatedProps)) material.SetTexture("_BumpMap", null); - if(IsPropZero(material, "_UseBump2ndMap", animatedProps)) + if(material.GetFloat("_UseBumpMap") == 0.0f) material.SetTexture("_BumpMap", null); + if(material.GetFloat("_UseBump2ndMap") == 0.0f) { material.SetTexture("_Bump2ndMap", null); material.SetTexture("_Bump2ndScaleMask", null); } - if(IsPropZero(material, "_UseAnisotropy", animatedProps)) + if(material.GetFloat("_UseAnisotropy") == 0.0f) { material.SetTexture("_AnisotropyTangentMap", null); material.SetTexture("_AnisotropyScaleMask", null); material.SetTexture("_AnisotropyShiftNoiseMask", null); } - if(IsPropZero(material, "_UseReflection", animatedProps)) + if(material.GetFloat("_UseReflection") == 0.0f) { material.SetTexture("_SmoothnessTex", null); material.SetTexture("_MetallicGlossMap", null); material.SetTexture("_ReflectionColorTex", null); material.SetTexture("_ReflectionCubeTex", null); } - if(IsPropZero(material, "_UseMatCap", animatedProps)) + if(material.GetFloat("_UseMatCap") == 0.0f) { material.SetTexture("_MatCapTex", null); material.SetTexture("_MatCapBlendMask", null); - material.SetTexture("_MatCapBumpMap", null); } - if(IsPropZero(material, "_UseMatCap2nd", animatedProps)) + if(material.GetFloat("_UseMatCap2nd") == 0.0f) { material.SetTexture("_MatCap2ndTex", null); material.SetTexture("_MatCap2ndBlendMask", null); - material.SetTexture("_MatCap2ndBumpMap", null); } if(!material.shader.name.Contains("Outline")) { @@ -647,26 +639,14 @@ namespace lilToon material.SetTexture("_OutlineWidthMask", null); material.SetTexture("_OutlineVectorTex", null); } - if(!material.shader.name.Contains("Fur")) - { - material.SetTexture("_FurVectorTex", null); - material.SetTexture("_FurLengthMask", null); - material.SetTexture("_FurNoiseMask", null); - material.SetTexture("_FurMask", null); - } - if(IsPropZero(material, "_UseRim", animatedProps)) material.SetTexture("_RimColorTex", null); - if(IsPropZero(material, "_UseGlitter", animatedProps)) material.SetTexture("_GlitterColorTex", null); - if(IsPropZero(material, "_UseParallax", animatedProps)) material.SetTexture("_ParallaxMap", null); - if(IsPropZero(material, "_UseAudioLink", animatedProps) || material.GetFloat("_AudioLinkUVMode") != 3.0f || animatedProps.Contains("_AudioLinkUVMode")) material.SetTexture("_AudioLinkMask", null); - if(IsPropZero(material, "_UseAudioLink", animatedProps) || IsPropZero(material, "_AudioLinkAsLocal", animatedProps)) material.SetTexture("_AudioLinkLocalMap", null); + if(material.GetFloat("_UseRim") == 0.0f) material.SetTexture("_RimColorTex", null); + if(material.GetFloat("_UseGlitter") == 0.0f) material.SetTexture("_GlitterColorTex", null); + if(material.GetFloat("_UseParallax") == 0.0f) material.SetTexture("_ParallaxMap", null); + if(material.GetFloat("_UseAudioLink") == 0.0f || material.GetFloat("_AudioLinkUVMode") != 3.0f) material.SetTexture("_AudioLinkMask", null); + if(material.GetFloat("_UseAudioLink") == 0.0f || material.GetFloat("_AudioLinkAsLocal") == 0.0f) material.SetTexture("_AudioLinkLocalMap", null); } } - private static bool IsPropZero(Material material, string name, string[] animatedProps) - { - return !material.HasProperty(name) || material.GetFloat(name) == 0.0f && !animatedProps.Contains(name); - } - public static void RemoveShaderKeywords(Material material) { foreach(var keyword in material.shaderKeywords) diff --git a/Assets/External/lilToon/Editor/lilShaderContainerImporter.cs b/Assets/External/lilToon/Editor/lilShaderContainerImporter.cs index d042bddd..9ceaad22 100644 --- a/Assets/External/lilToon/Editor/lilShaderContainerImporter.cs +++ b/Assets/External/lilToon/Editor/lilShaderContainerImporter.cs @@ -829,9 +829,6 @@ namespace lilToon } subShaderTags = line.Substring(first, second - first); - #if LILTOON_LTCGI - subShaderTags += " \"LTCGI\"=\"ALWAYS\""; - #endif } private static string ReadTextFile(string path) @@ -1221,9 +1218,6 @@ namespace lilToon "#pragma multi_compile_fwdbase", "#pragma multi_compile_vertex _ FOG_LINEAR FOG_EXP FOG_EXP2", "#pragma multi_compile_instancing", - #if LILTOON_LTCGI - "#define LIL_FEATURE_LTCGI", - #endif "#define LIL_PASS_FORWARD"); } } diff --git a/Assets/External/lilToon/Editor/lilShaderManager.cs b/Assets/External/lilToon/Editor/lilShaderManager.cs index bf98f5ec..24120df1 100644 --- a/Assets/External/lilToon/Editor/lilShaderManager.cs +++ b/Assets/External/lilToon/Editor/lilShaderManager.cs @@ -18,8 +18,8 @@ namespace lilToon public static Shader ltstto = Shader.Find("Hidden/lilToonTwoPassTransparentOutline"); public static Shader ltsoo = Shader.Find("_lil/[Optional] lilToonOutlineOnly"); - public static Shader ltscoo = Shader.Find("_lil/[Optional] lilToonOutlineOnlyCutout"); - public static Shader ltstoo = Shader.Find("_lil/[Optional] lilToonOutlineOnlyTransparent"); + public static Shader ltscoo = Shader.Find("_lil/[Optional] lilToonCutoutOutlineOnly"); + public static Shader ltstoo = Shader.Find("_lil/[Optional] lilToonTransparentOutlineOnly"); public static Shader ltstess = Shader.Find("Hidden/lilToonTessellation"); public static Shader ltstessc = Shader.Find("Hidden/lilToonTessellationCutout"); @@ -50,13 +50,13 @@ namespace lilToon public static Shader ltsfur = Shader.Find("Hidden/lilToonFur"); public static Shader ltsfurc = Shader.Find("Hidden/lilToonFurCutout"); public static Shader ltsfurtwo = Shader.Find("Hidden/lilToonFurTwoPass"); - public static Shader ltsfuro = Shader.Find("_lil/[Optional] lilToonFurOnlyTransparent"); + public static Shader ltsfuro = Shader.Find("_lil/[Optional] lilToonFurOnly"); public static Shader ltsfuroc = Shader.Find("_lil/[Optional] lilToonFurOnlyCutout"); public static Shader ltsfurotwo = Shader.Find("_lil/[Optional] lilToonFurOnlyTwoPass"); public static Shader ltsgem = Shader.Find("Hidden/lilToonGem"); - public static Shader ltsfs = Shader.Find("_lil/[Optional] lilToonFakeShadow"); + public static Shader ltsfs = Shader.Find("_lil/lilToonFakeShadow"); public static Shader ltsover = Shader.Find("_lil/[Optional] lilToonOverlay"); public static Shader ltsoover = Shader.Find("_lil/[Optional] lilToonOverlayOnePass"); @@ -93,8 +93,8 @@ namespace lilToon ltstto = Shader.Find("Hidden/lilToonTwoPassTransparentOutline"); ltsoo = Shader.Find("_lil/[Optional] lilToonOutlineOnly"); - ltscoo = Shader.Find("_lil/[Optional] lilToonOutlineOnlyCutout"); - ltstoo = Shader.Find("_lil/[Optional] lilToonOutlineOnlyTransparent"); + ltscoo = Shader.Find("_lil/[Optional] lilToonCutoutOutlineOnly"); + ltstoo = Shader.Find("_lil/[Optional] lilToonTransparentOutlineOnly"); ltstess = Shader.Find("Hidden/lilToonTessellation"); ltstessc = Shader.Find("Hidden/lilToonTessellationCutout"); @@ -125,18 +125,10 @@ namespace lilToon ltsfur = Shader.Find("Hidden/lilToonFur"); ltsfurc = Shader.Find("Hidden/lilToonFurCutout"); ltsfurtwo = Shader.Find("Hidden/lilToonFurTwoPass"); - ltsfuro = Shader.Find("_lil/[Optional] lilToonFurOnlyTransparent"); - ltsfuroc = Shader.Find("_lil/[Optional] lilToonFurOnlyCutout"); - ltsfurotwo = Shader.Find("_lil/[Optional] lilToonFurOnlyTwoPass"); ltsgem = Shader.Find("Hidden/lilToonGem"); - ltsfs = Shader.Find("_lil/[Optional] lilToonFakeShadow"); - - ltsover = Shader.Find("_lil/[Optional] lilToonOverlay"); - ltsoover = Shader.Find("_lil/[Optional] lilToonOverlayOnePass"); - ltslover = Shader.Find("_lil/[Optional] lilToonLiteOverlay"); - ltsloover = Shader.Find("_lil/[Optional] lilToonLiteOverlayOnePass"); + ltsfs = Shader.Find("_lil/lilToonFakeShadow"); ltsbaker = Shader.Find("Hidden/ltsother_baker"); ltspo = Shader.Find("Hidden/ltspass_opaque"); diff --git a/Assets/External/lilToon/Editor/lilStartup.cs b/Assets/External/lilToon/Editor/lilStartup.cs index 43fb8777..45d72471 100644 --- a/Assets/External/lilToon/Editor/lilStartup.cs +++ b/Assets/External/lilToon/Editor/lilStartup.cs @@ -24,8 +24,6 @@ namespace lilToon AssetDatabase.importPackageStarted -= PackageVersionChecker; AssetDatabase.importPackageStarted += PackageVersionChecker; - EditorApplication.playModeStateChanged -= PlayModeStateChanged; - EditorApplication.playModeStateChanged += PlayModeStateChanged; //------------------------------------------------------------------------------------------------------------------------------ // Create files @@ -81,22 +79,14 @@ namespace lilToon var srRP = new StreamReader(currentRPPath); string shaderRP = srRP.ReadLine(); string shaderAPI = srRP.ReadLine(); - string shaderLTCGI = srRP.ReadLine(); srRP.Close(); bool shouldRewrite = false; string projectRP = lilRenderPipelineReader.GetRP().ToString(); string projectAPI = SystemInfo.graphicsDeviceType.ToString(); - #if LILTOON_LTCGI - string projectLTCGI = "LTCGI"; - #else - string projectLTCGI = ""; - #endif var swRP = new StreamWriter(currentRPPath,false); swRP.WriteLine(projectRP); swRP.WriteLine(projectAPI); - swRP.WriteLine(projectLTCGI); - swRP.Close(); if(shaderRP != projectRP) { @@ -110,12 +100,7 @@ namespace lilToon shouldRewrite = true; } - if(shaderLTCGI != projectLTCGI) - { - Debug.Log("[lilToon] Switch LTCGI"); - shouldRewrite = true; - } - + swRP.Close(); if(shouldRewrite) { if(shaderSetting.isDebugOptimize) @@ -184,14 +169,6 @@ namespace lilToon } } - private static void PlayModeStateChanged(PlayModeStateChange playModeStateChange) - { - if(playModeStateChange == PlayModeStateChange.EnteredEditMode) - { - lilToonSetting.SetShaderSettingAfterBuild(); - } - } - private static IEnumerator GetLatestVersionInfo() { using(UnityWebRequest webRequest = UnityWebRequest.Get(lilConstants.versionInfoURL)) diff --git a/Assets/External/lilToon/Editor/lilToon.Editor.asmdef b/Assets/External/lilToon/Editor/lilToon.Editor.asmdef index a445f391..0bc0fa82 100644 --- a/Assets/External/lilToon/Editor/lilToon.Editor.asmdef +++ b/Assets/External/lilToon/Editor/lilToon.Editor.asmdef @@ -18,11 +18,6 @@ "name": "com.vrchat.base", "expression": "", "define": "LILTOON_VRCSDK3" - }, - { - "name": "at.pimaker.ltcgi", - "expression": "1.4", - "define": "LILTOON_LTCGI" } ] } diff --git a/Assets/External/lilToon/Editor/lilToonSetting.cs b/Assets/External/lilToon/Editor/lilToonSetting.cs index daf8496c..6065b612 100644 --- a/Assets/External/lilToon/Editor/lilToonSetting.cs +++ b/Assets/External/lilToon/Editor/lilToonSetting.cs @@ -14,7 +14,6 @@ using System.Linq; using System.Text; using UnityEditor; using UnityEngine; -using Object = UnityEngine.Object; #if UNITY_2022_1_OR_NEWER || (UNITY_2023_1_OR_NEWER && !UNITY_2023_2_OR_NEWER) using System.Text.RegularExpressions; #endif @@ -134,7 +133,6 @@ public class lilToonSetting : ScriptableObject public bool isLocked = false; public bool isDebugOptimize = false; public bool isOptimizeInTestBuild = false; - public bool isOptimizeInNDMF = false; public bool isMigrateInStartUp = true; public float defaultAsUnlit = 0.0f; @@ -157,8 +155,6 @@ public class lilToonSetting : ScriptableObject public lilToonPreset presetHair; public lilToonPreset presetCloth; - private static HashSet logs = new HashSet(); - // This is not a shader setting, but the version number is stored here for material migration. public int previousVersion = 0; @@ -511,8 +507,7 @@ public class lilToonSetting : ScriptableObject if(shaderPath.Contains(".lilcontainer")) continue; string baseShaderPath = baseShaderFolderPath + Path.AltDirectorySeparatorChar + Path.GetFileNameWithoutExtension(shaderPath) + ".lilinternal"; - if(!File.Exists(baseShaderPath)) continue; - File.WriteAllText(shaderPath, lilShaderContainer.UnpackContainer(baseShaderPath, null, doOptimize)); + if(File.Exists(baseShaderPath)) File.WriteAllText(shaderPath, lilShaderContainer.UnpackContainer(baseShaderPath, null, doOptimize)); } foreach(var shaderPath in shaderPathes) { @@ -697,81 +692,79 @@ public class lilToonSetting : ScriptableObject return shaderSettingString; } - internal static void WalkAllSceneReferencedAssets(Action callback, bool loadBuildScene) + internal static void WalkAllSceneReferencedAssets(Action callback) { - Debug.Log("WalkAllSceneReferencedAssets"); + var toVisit = new Queue(); + var visited = new HashSet(); - var toVisit = new Queue(); - var visited = new HashSet(); - - if(loadBuildScene) + foreach (var root in UnityEngine.SceneManagement.SceneManager.GetActiveScene().GetRootGameObjects()) { - var startScenePath = UnityEngine.SceneManagement.SceneManager.GetActiveScene().path; - for(int i = -1; i < UnityEngine.SceneManagement.SceneManager.sceneCountInBuildSettings; i++) - { - if(i >= 0) UnityEditor.SceneManagement.EditorSceneManager.OpenScene(UnityEngine.SceneManagement.SceneUtility.GetScenePathByBuildIndex(i)); - WalkAllSceneReferencedAssets(callback, toVisit, visited); - } - UnityEditor.SceneManagement.EditorSceneManager.OpenScene(startScenePath); + toVisit.Enqueue(root.transform); + visited.Add(root.transform); } - else - { - WalkAllSceneReferencedAssets(callback, toVisit, visited); - } - } - - private static void WalkAllSceneReferencedAssets(Action callback, Queue toVisit, HashSet visited) - { - void Add(Object o) - { - if(!o || visited.Contains(o)) return; - toVisit.Enqueue(o); - visited.Add(o); - } - - foreach(var root in UnityEngine.SceneManagement.SceneManager.GetActiveScene().GetRootGameObjects()) - Add(root.transform); // use unity reflection to walk all properties in all objects referenced from the scene - while(toVisit.Count > 0) + while (toVisit.Count > 0) { var next = toVisit.Dequeue(); - if(next == null) continue; - + if (next == null) continue; + callback.Invoke(next); - if( - next is Mesh || - next is Texture || - next is Shader || - next is TextAsset || - next.GetType() == typeof(Object) - ) continue; - - if(next is Transform) + if (next is Transform) { - var t = next as Transform; - foreach(Transform child in t) Add(child); + var t = (Transform)next; + foreach (Transform child in t) + { + if (!visited.Contains(child)) + { + toVisit.Enqueue(child); + visited.Add(child); + } + } - foreach(var c in t.GetComponents(typeof(Component))) - if(!(c is Transform)) Add(c); + foreach (var c in t.GetComponents(typeof(Component))) + { + if (!(c is Transform) && !visited.Contains(c)) + { + toVisit.Enqueue(c); + visited.Add(c); + } + } } else - using(var so = new SerializedObject(next)) - using(var prop = so.GetIterator()) { + var so = new SerializedObject(next); + var prop = so.GetIterator(); + bool enterChildren = true; - while(prop.Next(enterChildren)) + while (prop.Next(enterChildren)) { - enterChildren = prop.propertyType != SerializedPropertyType.String; - if(prop.propertyType == SerializedPropertyType.ObjectReference) - Add(prop.objectReferenceValue); + enterChildren = true; + + switch (prop.propertyType) + { + case SerializedPropertyType.String: + enterChildren = false; + break; + case SerializedPropertyType.ObjectReference: + { + var obj = prop.objectReferenceValue; + if (obj != null && !visited.Contains(obj)) + { + toVisit.Enqueue(obj); + visited.Add(obj); + } + + break; + } + } } } } } - - internal static void ApplyShaderSettingOptimized(bool loadBuildScene = true, List shaders = null) + + internal static void ApplyShaderSettingOptimized(List shaders = null) { lilToonSetting shaderSetting = null; InitializeShaderSetting(ref shaderSetting); @@ -786,7 +779,7 @@ public class lilToonSetting : ScriptableObject { SetupShaderSettingFromAnimationClip((AnimationClip)obj, ref shaderSetting); } - }, loadBuildScene); + }); // Apply ApplyShaderSetting(shaderSetting, "[lilToon] PreprocessBuild", shaders); @@ -854,7 +847,6 @@ public class lilToonSetting : ScriptableObject #endif try { - logs.Clear(); #if UNITY_2022_1_OR_NEWER var materialParents = new HashSet(); foreach(var m in materials) @@ -890,7 +882,6 @@ public class lilToonSetting : ScriptableObject // Apply ApplyShaderSetting(shaderSetting, "[lilToon] PreprocessBuild", shaders, true); AssetDatabase.Refresh(); - Debug.Log(string.Join(Environment.NewLine, logs)); } catch(Exception e) { @@ -903,14 +894,14 @@ public class lilToonSetting : ScriptableObject #if UNITY_2022_1_OR_NEWER private static void GetMaterialParents(HashSet parents, Material material) { - if(!material || !material.parent) return; var p = material.parent; + if(p == null) return; parents.Add(p); GetMaterialParents(parents, p); } #endif - internal static void SetShaderSettingBeforeBuild(bool loadBuildScene = true) + internal static void SetShaderSettingBeforeBuild() { #if !LILTOON_DISABLE_OPTIMIZATION #if UNITY_2022_1_OR_NEWER || (UNITY_2023_1_OR_NEWER && !UNITY_2023_2_OR_NEWER) @@ -919,11 +910,9 @@ public class lilToonSetting : ScriptableObject try { if(!ShouldOptimization()) return; - logs.Clear(); var shaders = GetShaderListFromProject(); lilEditorParameters.instance.modifiedShaders = string.Join(",", shaders.Select(s => s.name).Distinct().ToArray()); - ApplyShaderSettingOptimized(loadBuildScene, shaders); - Debug.Log(string.Join(Environment.NewLine, logs)); + ApplyShaderSettingOptimized(shaders); } catch(Exception e) { @@ -972,17 +961,17 @@ public class lilToonSetting : ScriptableObject if(!shaderSetting.LIL_FEATURE_ANIMATE_MAIN_UV && material.HasProperty("_MainTex_ScrollRotate") && material.GetVector("_MainTex_ScrollRotate") != lilConstants.defaultScrollRotate) { - logs.Add("[lilToon] LIL_FEATURE_ANIMATE_MAIN_UV : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_ANIMATE_MAIN_UV : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_ANIMATE_MAIN_UV = true; } if(!shaderSetting.LIL_FEATURE_SHADOW && material.HasProperty("_UseShadow") && material.GetFloat("_UseShadow") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_SHADOW : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_SHADOW : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_SHADOW = true; } if(!shaderSetting.LIL_FEATURE_RIMSHADE && material.HasProperty("_UseRimShade") && material.GetFloat("_UseRimShade") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_RIMSHADE : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_RIMSHADE : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_RIMSHADE = true; } if(!shaderSetting.LIL_FEATURE_RECEIVE_SHADOW && material.HasProperty("_UseShadow") && material.GetFloat("_UseShadow") != 0.0f && ( @@ -991,22 +980,22 @@ public class lilToonSetting : ScriptableObject (material.HasProperty("_Shadow3rdReceive") && material.GetFloat("_Shadow3rdReceive") > 0.0f)) ) { - logs.Add("[lilToon] LIL_FEATURE_RECEIVE_SHADOW : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_RECEIVE_SHADOW : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_RECEIVE_SHADOW = true; } if(!shaderSetting.LIL_FEATURE_DISTANCE_FADE && material.HasProperty("_DistanceFade") && material.GetVector("_DistanceFade").z != lilConstants.defaultDistanceFadeParams.z) { - logs.Add("[lilToon] LIL_FEATURE_DISTANCE_FADE : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_DISTANCE_FADE : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_DISTANCE_FADE = true; } if(!shaderSetting.LIL_FEATURE_SHADOW_3RD && material.HasProperty("_Shadow3rdColor") && material.GetColor("_Shadow3rdColor").a != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_SHADOW_3RD : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_SHADOW_3RD : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_SHADOW_3RD = true; } if(!shaderSetting.LIL_FEATURE_SHADOW_LUT && material.HasProperty("_ShadowColorType") && material.GetFloat("_ShadowColorType") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_SHADOW_LUT : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_SHADOW_LUT : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_SHADOW_LUT = true; } @@ -1014,8 +1003,8 @@ public class lilToonSetting : ScriptableObject { if(!shaderSetting.LIL_FEATURE_FUR_COLLISION && material.HasProperty("_FurTouchStrength") && material.GetFloat("_FurTouchStrength") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_FUR_COLLISION : " + AssetDatabase.GetAssetPath(material)); - logs.Add("[lilToon] LIL_OPTIMIZE_USE_VERTEXLIGHT : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_FUR_COLLISION : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_OPTIMIZE_USE_VERTEXLIGHT : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_FUR_COLLISION = true; shaderSetting.LIL_OPTIMIZE_USE_VERTEXLIGHT = true; } @@ -1023,22 +1012,22 @@ public class lilToonSetting : ScriptableObject if(!shaderSetting.LIL_FEATURE_MAIN_TONE_CORRECTION && material.HasProperty("_MainTexHSVG") && material.GetVector("_MainTexHSVG") != lilConstants.defaultHSVG) { - logs.Add("[lilToon] LIL_FEATURE_MAIN_TONE_CORRECTION : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_MAIN_TONE_CORRECTION : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_MAIN_TONE_CORRECTION = true; } if(!shaderSetting.LIL_FEATURE_MAIN_GRADATION_MAP && material.HasProperty("_MainGradationStrength") && material.GetFloat("_MainGradationStrength") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_MAIN_GRADATION_MAP : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_MAIN_GRADATION_MAP : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_MAIN_GRADATION_MAP = true; } if(!shaderSetting.LIL_FEATURE_MAIN2ND && material.HasProperty("_UseMain2ndTex") && material.GetFloat("_UseMain2ndTex") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_MAIN2ND : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_MAIN2ND : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_MAIN2ND = true; } if(!shaderSetting.LIL_FEATURE_MAIN3RD && material.HasProperty("_UseMain3rdTex") && material.GetFloat("_UseMain3rdTex") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_MAIN3RD : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_MAIN3RD : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_MAIN3RD = true; } if(!shaderSetting.LIL_FEATURE_DECAL && ( @@ -1046,7 +1035,7 @@ public class lilToonSetting : ScriptableObject (material.HasProperty("_Main3rdTexIsDecal") && material.GetFloat("_Main3rdTexIsDecal") != 0.0f)) ) { - logs.Add("[lilToon] LIL_FEATURE_DECAL : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_DECAL : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_DECAL = true; } if(!shaderSetting.LIL_FEATURE_ANIMATE_DECAL && ( @@ -1054,7 +1043,7 @@ public class lilToonSetting : ScriptableObject (material.HasProperty("_Main3rdTexDecalAnimation") && material.GetVector("_Main3rdTexDecalAnimation") != lilConstants.defaultDecalAnim)) ) { - logs.Add("[lilToon] LIL_FEATURE_ANIMATE_DECAL : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_ANIMATE_DECAL : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_ANIMATE_DECAL = true; } if(!shaderSetting.LIL_FEATURE_LAYER_DISSOLVE && ( @@ -1062,22 +1051,22 @@ public class lilToonSetting : ScriptableObject (material.HasProperty("_Main3rdDissolveParams") && material.GetVector("_Main3rdDissolveParams").x != lilConstants.defaultDissolveParams.x)) ) { - logs.Add("[lilToon] LIL_FEATURE_LAYER_DISSOLVE : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_LAYER_DISSOLVE : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_LAYER_DISSOLVE = true; } if(!shaderSetting.LIL_FEATURE_ALPHAMASK && material.HasProperty("_AlphaMaskMode") && material.GetFloat("_AlphaMaskMode") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_ALPHAMASK : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_ALPHAMASK : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_ALPHAMASK = true; } if(!shaderSetting.LIL_FEATURE_EMISSION_1ST && material.HasProperty("_UseEmission") && material.GetFloat("_UseEmission") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_EMISSION_1ST : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_EMISSION_1ST : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_EMISSION_1ST = true; } if(!shaderSetting.LIL_FEATURE_EMISSION_2ND && material.HasProperty("_UseEmission2nd") && material.GetFloat("_UseEmission2nd") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_EMISSION_2ND : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_EMISSION_2ND : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_EMISSION_2ND = true; } if(!shaderSetting.LIL_FEATURE_ANIMATE_EMISSION_UV && ( @@ -1085,7 +1074,7 @@ public class lilToonSetting : ScriptableObject (material.HasProperty("_Emission2ndMap_ScrollRotate") && material.GetVector("_Emission2ndMap_ScrollRotate") != lilConstants.defaultScrollRotate)) ) { - logs.Add("[lilToon] LIL_FEATURE_ANIMATE_EMISSION_UV : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_ANIMATE_EMISSION_UV : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_ANIMATE_EMISSION_UV = true; } if(!shaderSetting.LIL_FEATURE_ANIMATE_EMISSION_MASK_UV && ( @@ -1093,7 +1082,7 @@ public class lilToonSetting : ScriptableObject (material.HasProperty("_Emission2ndBlendMask_ScrollRotate") && material.GetVector("_Emission2ndBlendMask_ScrollRotate") != lilConstants.defaultScrollRotate)) ) { - logs.Add("[lilToon] LIL_FEATURE_ANIMATE_EMISSION_MASK_UV : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_ANIMATE_EMISSION_MASK_UV : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_ANIMATE_EMISSION_MASK_UV = true; } if(!shaderSetting.LIL_FEATURE_EMISSION_GRADATION && ( @@ -1101,92 +1090,92 @@ public class lilToonSetting : ScriptableObject (material.HasProperty("_Emission2ndUseGrad") && material.GetFloat("_Emission2ndUseGrad") != 0.0f)) ) { - logs.Add("[lilToon] LIL_FEATURE_EMISSION_GRADATION : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_EMISSION_GRADATION : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_EMISSION_GRADATION = true; } if(!shaderSetting.LIL_FEATURE_NORMAL_1ST && material.HasProperty("_UseBumpMap") && material.GetFloat("_UseBumpMap") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_NORMAL_1ST : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_NORMAL_1ST : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_NORMAL_1ST = true; } if(!shaderSetting.LIL_FEATURE_NORMAL_2ND && material.HasProperty("_UseBump2ndMap") && material.GetFloat("_UseBump2ndMap") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_NORMAL_2ND : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_NORMAL_2ND : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_NORMAL_2ND = true; } if(!shaderSetting.LIL_FEATURE_ANISOTROPY && material.HasProperty("_UseAnisotropy") && material.GetFloat("_UseAnisotropy") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_ANISOTROPY : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_ANISOTROPY : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_ANISOTROPY = true; } if(!shaderSetting.LIL_FEATURE_REFLECTION && material.HasProperty("_UseReflection") && material.GetFloat("_UseReflection") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_REFLECTION : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_REFLECTION : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_REFLECTION = true; } if(!shaderSetting.LIL_FEATURE_MATCAP && material.HasProperty("_UseMatCap") && material.GetFloat("_UseMatCap") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_MATCAP : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_MATCAP : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_MATCAP = true; } if(!shaderSetting.LIL_FEATURE_MATCAP_2ND && material.HasProperty("_UseMatCap2nd") && material.GetFloat("_UseMatCap2nd") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_MATCAP_2ND : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_MATCAP_2ND : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_MATCAP_2ND = true; } if(!shaderSetting.LIL_FEATURE_RIMLIGHT && material.HasProperty("_UseRim") && material.GetFloat("_UseRim") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_RIMLIGHT : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_RIMLIGHT : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_RIMLIGHT = true; } if(!shaderSetting.LIL_FEATURE_RIMLIGHT_DIRECTION && material.HasProperty("_RimDirStrength") && material.GetFloat("_RimDirStrength") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_RIMLIGHT_DIRECTION : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_RIMLIGHT_DIRECTION : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_RIMLIGHT_DIRECTION = true; } if(!shaderSetting.LIL_FEATURE_GLITTER && material.HasProperty("_UseGlitter") && material.GetFloat("_UseGlitter") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_GLITTER : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_GLITTER : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_GLITTER = true; } if(!shaderSetting.LIL_FEATURE_BACKLIGHT && material.HasProperty("_UseBacklight") && material.GetFloat("_UseBacklight") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_BACKLIGHT : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_BACKLIGHT : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_BACKLIGHT = true; } if(!shaderSetting.LIL_FEATURE_PARALLAX && material.HasProperty("_UseParallax") && material.GetFloat("_UseParallax") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_PARALLAX : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_PARALLAX : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_PARALLAX = true; if(!shaderSetting.LIL_FEATURE_POM && material.HasProperty("_UsePOM") && material.GetFloat("_UsePOM") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_POM : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_POM : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_POM = true; } } if(!shaderSetting.LIL_FEATURE_AUDIOLINK && material.HasProperty("_UseAudioLink") && material.GetFloat("_UseAudioLink") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_AUDIOLINK : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_AUDIOLINK : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_AUDIOLINK = true; } if(!shaderSetting.LIL_FEATURE_AUDIOLINK_VERTEX && material.HasProperty("_AudioLink2Vertex") && material.GetFloat("_AudioLink2Vertex") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_AUDIOLINK_VERTEX : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_AUDIOLINK_VERTEX : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_AUDIOLINK_VERTEX = true; } if(!shaderSetting.LIL_FEATURE_AUDIOLINK_LOCAL && material.HasProperty("_AudioLinkAsLocal") && material.GetFloat("_AudioLinkAsLocal") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_AUDIOLINK_LOCAL : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_AUDIOLINK_LOCAL : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_AUDIOLINK_LOCAL = true; } if(!shaderSetting.LIL_FEATURE_DISSOLVE && material.HasProperty("_DissolveParams") && material.GetVector("_DissolveParams").x != lilConstants.defaultDissolveParams.x) { - logs.Add("[lilToon] LIL_FEATURE_DISSOLVE : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_DISSOLVE : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_DISSOLVE = true; } if(!shaderSetting.LIL_FEATURE_DITHER && material.HasProperty("_UseDither") && material.GetFloat("_UseDither") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_DITHER : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_DITHER : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_DITHER = true; } if(!shaderSetting.LIL_FEATURE_IDMASK && ( @@ -1210,12 +1199,12 @@ public class lilToonSetting : ScriptableObject material.HasProperty("_IDMaskCompile") && material.GetFloat("_IDMaskCompile") != 0.0f )) { - logs.Add("[lilToon] LIL_FEATURE_IDMASK : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_IDMASK : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_IDMASK = true; } if(!shaderSetting.LIL_FEATURE_UDIMDISCARD && material.HasProperty("_UDIMDiscardCompile") && material.GetFloat("_UDIMDiscardCompile") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_UDIMDISCARD : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_UDIMDISCARD : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_UDIMDISCARD = true; } @@ -1224,24 +1213,24 @@ public class lilToonSetting : ScriptableObject { if(!shaderSetting.LIL_FEATURE_ANIMATE_OUTLINE_UV && material.HasProperty("_OutlineTex_ScrollRotate") && material.GetVector("_OutlineTex_ScrollRotate") != lilConstants.defaultScrollRotate) { - logs.Add("[lilToon] LIL_FEATURE_ANIMATE_OUTLINE_UV : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_ANIMATE_OUTLINE_UV : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_ANIMATE_OUTLINE_UV = true; } if(!shaderSetting.LIL_FEATURE_OUTLINE_TONE_CORRECTION && material.HasProperty("_OutlineTexHSVG") && material.GetVector("_OutlineTexHSVG") != lilConstants.defaultHSVG) { - logs.Add("[lilToon] LIL_FEATURE_OUTLINE_TONE_CORRECTION : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_OUTLINE_TONE_CORRECTION : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_OUTLINE_TONE_CORRECTION = true; } if(!shaderSetting.LIL_FEATURE_OUTLINE_RECEIVE_SHADOW && material.HasProperty("_OutlineLitShadowReceive") && material.GetFloat("_OutlineLitShadowReceive") != 0.0f) { - logs.Add("[lilToon] LIL_FEATURE_OUTLINE_RECEIVE_SHADOW : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_FEATURE_OUTLINE_RECEIVE_SHADOW : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_FEATURE_OUTLINE_RECEIVE_SHADOW = true; } } if(!shaderSetting.LIL_OPTIMIZE_USE_VERTEXLIGHT && material.HasProperty("_VertexLightStrength") && material.GetFloat("_VertexLightStrength") != 0.0f) { - logs.Add("[lilToon] LIL_OPTIMIZE_USE_VERTEXLIGHT : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] LIL_OPTIMIZE_USE_VERTEXLIGHT : " + AssetDatabase.GetAssetPath(material)); shaderSetting.LIL_OPTIMIZE_USE_VERTEXLIGHT = true; } @@ -1474,7 +1463,7 @@ public class lilToonSetting : ScriptableObject private static void CheckTexture(ref bool LIL_FEATURE_Tex, string propname, Material material) { if(LIL_FEATURE_Tex || !material.HasProperty(propname) || material.GetTexture(propname) == null) return; - logs.Add("[lilToon] " + propname + " : " + AssetDatabase.GetAssetPath(material)); + Debug.Log("[lilToon] " + propname + " : " + AssetDatabase.GetAssetPath(material)); LIL_FEATURE_Tex = true; } diff --git a/Assets/External/lilToon/External/Editor/ChilloutVRModule.cs b/Assets/External/lilToon/External/Editor/ChilloutVRModule.cs index 8f59e0e2..4e88087d 100644 --- a/Assets/External/lilToon/External/Editor/ChilloutVRModule.cs +++ b/Assets/External/lilToon/External/Editor/ChilloutVRModule.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Reflection; using UnityEngine.Events; -using System.Linq; namespace lilToon.External { @@ -57,7 +56,7 @@ namespace lilToon.External var materials = new List(); foreach(var renderer in gameObject.GetComponentsInChildren(true)) { - materials.AddRange(renderer.sharedMaterials.Where(m => m)); + materials.AddRange(renderer.sharedMaterials); } return materials.ToArray(); } @@ -68,7 +67,7 @@ namespace lilToon.External foreach(var animator in gameObject.GetComponentsInChildren(true)) { - if(animator.runtimeAnimatorController) clips.AddRange(animator.runtimeAnimatorController.animationClips); + if(animator.runtimeAnimatorController != null) clips.AddRange(animator.runtimeAnimatorController.animationClips); } try @@ -78,9 +77,9 @@ namespace lilToon.External foreach(var descriptor in gameObject.GetComponentsInChildren(type,true)) { var overrides = (AnimatorOverrideController)overridesField.GetValue(descriptor); - if(overrides) + if(overrides != null) { - clips.AddRange(overrides.animationClips.Where(clip => clip)); + clips.AddRange(overrides.animationClips); } } } @@ -129,7 +128,7 @@ namespace lilToon.External foreach(var descriptor in Selection.activeGameObject.GetComponentsInChildren(type,true)) { var overrides = (AnimatorOverrideController)overridesField.GetValue(descriptor); - if(overrides) + if(overrides != null) { clips.AddRange(overrides.animationClips); } @@ -161,7 +160,7 @@ namespace lilToon.External try { var type = Assembly.Load("Assembly-CSharp").GetType("ABI.CCK.Components.CVRAvatar"); - return Selection.activeGameObject.GetComponent(type); + return Selection.activeGameObject.GetComponent(type) != null; } catch(Exception e) { @@ -171,4 +170,4 @@ namespace lilToon.External } } } -#endif +#endif \ No newline at end of file diff --git a/Assets/External/lilToon/External/Editor/VRChatModule.cs b/Assets/External/lilToon/External/Editor/VRChatModule.cs index e8317cb9..3ffa5ec2 100644 --- a/Assets/External/lilToon/External/Editor/VRChatModule.cs +++ b/Assets/External/lilToon/External/Editor/VRChatModule.cs @@ -6,11 +6,12 @@ #endif #endif #if UNITY_EDITOR && (LILTOON_VRCSDK3_AVATARS || LILTOON_VRCSDK3_WORLDS || VRC_SDK_VRCSDK2) +using UnityEditor; +using UnityEngine; using System; using System.Collections.Generic; using System.Linq; -using UnityEditor; -using UnityEngine; +using System.Reflection; using VRC.SDKBase.Editor.BuildPipeline; namespace lilToon.External @@ -31,9 +32,9 @@ namespace lilToon.External } else { - lilToonSetting.SetShaderSettingBeforeBuild(false); - EditorApplication.delayCall -= lilToonSetting.SetShaderSettingAfterBuild; - EditorApplication.delayCall += lilToonSetting.SetShaderSettingAfterBuild; + SetShaderSettingBeforeBuild(); + EditorApplication.delayCall -= SetShaderSettingAfterBuild; + EditorApplication.delayCall += SetShaderSettingAfterBuild; } } catch(Exception e) @@ -48,15 +49,9 @@ namespace lilToon.External { try { - lilToonSetting shaderSetting = null; - lilToonSetting.InitializeShaderSetting(ref shaderSetting); - var caller = new System.Diagnostics.StackFrame(2, false); - var callerMethod = caller.GetMethod(); - if(!shaderSetting.isOptimizeInNDMF && callerMethod.DeclaringType.FullName == "nadena.dev.ndmf.ApplyOnPlay") return true; - var materials = GetMaterialsFromGameObject(avatarGameObject); var clips = GetAnimationClipsFromGameObject(avatarGameObject); - lilToonSetting.SetShaderSettingBeforeBuild(materials, clips); + SetShaderSettingBeforeBuild(materials, clips); lilMaterialUtils.SetupMultiMaterial(materials, clips); } catch(Exception e) @@ -69,7 +64,7 @@ namespace lilToon.External public void OnPostprocessAvatar() { - lilToonSetting.SetShaderSettingAfterBuild(); + SetShaderSettingAfterBuild(); } private static Material[] GetMaterialsFromGameObject(GameObject gameObject) @@ -79,8 +74,7 @@ namespace lilToon.External { materials.AddRange(renderer.sharedMaterials); } - // sharedMaterials may a Material[null] on Unity 2022.3.22f1 if there is no material on a renderer. - return materials.Where(m => m != null).ToArray(); + return materials.ToArray(); } private static AnimationClip[] GetAnimationClipsFromGameObject(GameObject gameObject) @@ -130,6 +124,45 @@ namespace lilToon.External return clips.ToArray(); } + private static void SetShaderSettingBeforeBuild(Material[] materials, AnimationClip[] clips) + { + Type type = typeof(lilToonSetting); + var methods = type.GetMethods(BindingFlags.Static | BindingFlags.NonPublic); + foreach(var method in methods) + { + var methodParams = method.GetParameters(); + if(method.Name != "SetShaderSettingBeforeBuild" || methodParams.Length != 2 || methodParams[0].ParameterType != typeof(Material[])) continue; + method.Invoke(null, new object[]{materials,clips}); + break; + } + } + + private static void SetShaderSettingBeforeBuild() + { + Type type = typeof(lilToonSetting); + var methods = type.GetMethods(BindingFlags.Static | BindingFlags.NonPublic); + foreach(var method in methods) + { + var methodParams = method.GetParameters(); + if(method.Name != "SetShaderSettingBeforeBuild" || methodParams.Length != 0) continue; + method.Invoke(null, null); + break; + } + } + + private static void SetShaderSettingAfterBuild() + { + Type type = typeof(lilToonSetting); + var methods = type.GetMethods(BindingFlags.Static | BindingFlags.NonPublic); + foreach(var method in methods) + { + var methodParams = method.GetParameters(); + if(method.Name != "SetShaderSettingAfterBuild" || methodParams.Length != 0) continue; + method.Invoke(null, null); + break; + } + } + // Debug #if LILTOON_VRCSDK3_AVATARS || VRC_SDK_VRCSDK2 [MenuItem("GameObject/lilToon/[Debug] Generate bug report (VRChat Avatar)", false, 23)] @@ -171,8 +204,19 @@ namespace lilToon.External } #endif - lilToonEditorUtils.GenerateBugReport(null, clips, "# VRChat Avatar Debug"); - EditorUtility.DisplayDialog("[Debug] Generate bug report (VRChat Avatar)","Failed to generate bug report.","OK"); + Type type = typeof(lilToonEditorUtils); + var methods = type.GetMethods(BindingFlags.Static | BindingFlags.NonPublic); + foreach(var method in methods) + { + var methodParams = method.GetParameters(); + if(method.Name != "GenerateBugReport" || methodParams.Length != 3) continue; + method.Invoke(null, new object[]{null, clips, "# VRChat Avatar Debug"}); + return; + } + #pragma warning disable 0162 + if(lilConstants.currentVersionValue < 31) EditorUtility.DisplayDialog("[Debug] Generate bug report (VRChat Avatar)","This version does not support bug reports. Prease import lilToon 1.3.5 or newer.","OK"); + else EditorUtility.DisplayDialog("[Debug] Generate bug report (VRChat Avatar)","Failed to generate bug report.","OK"); + #pragma warning restore 0162 } [MenuItem("GameObject/lilToon/[Debug] Generate bug report (VRChat Avatar)", true, 23)] diff --git a/Assets/External/lilToon/LICENSE b/Assets/External/lilToon/LICENSE index a3893bb5..adb6fbb4 100644 --- a/Assets/External/lilToon/LICENSE +++ b/Assets/External/lilToon/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-present lilxyzw +Copyright (c) 2020-2024 lilxyzw Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Assets/External/lilToon/README.md b/Assets/External/lilToon/README.md index 1d73e7cb..cfa5d46e 100644 --- a/Assets/External/lilToon/README.md +++ b/Assets/External/lilToon/README.md @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:347c3befde7dcc7d4ea6e9181236175a7680795466659a5a1e7dca985b68846d -size 6542 +oid sha256:0cbbae627a68a2607bc076eab76f9d70ea317993f84397bea57a7e19c78d0f47 +size 6657 diff --git a/Assets/External/lilToon/README_JP.md b/Assets/External/lilToon/README_JP.md index e122d1de..b24948d4 100644 --- a/Assets/External/lilToon/README_JP.md +++ b/Assets/External/lilToon/README_JP.md @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b113509a0dc57faec7e619f844d7ccdb1feb30c366332ef5e24626f32b01fc7 -size 8244 +oid sha256:52d4d70564133e544d9556ac524081f28c7c702fee369fdab7864bb0fe5ee43a +size 8360 diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_frag.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_frag.hlsl index c0742806..165a9685 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_frag.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_frag.hlsl @@ -931,43 +931,13 @@ #endif #endif - float4 shadowStrengthMask = 1; - #if defined(LIL_FEATURE_ShadowStrengthMask) - #if defined(_ShadowStrengthMaskLOD) - shadowStrengthMask = LIL_SAMPLE_2D(_ShadowStrengthMask, lil_sampler_linear_repeat, fd.uvMain); - if(_ShadowStrengthMaskLOD) shadowStrengthMask = LIL_SAMPLE_2D_GRAD(_ShadowStrengthMask, lil_sampler_linear_repeat, fd.uvMain, max(fd.ddxMain, _ShadowStrengthMaskLOD), max(fd.ddyMain, _ShadowStrengthMaskLOD)); - #else - shadowStrengthMask = LIL_SAMPLE_2D_GRAD(_ShadowStrengthMask, lil_sampler_linear_repeat, fd.uvMain, max(fd.ddxMain, _ShadowStrengthMaskLOD), max(fd.ddyMain, _ShadowStrengthMaskLOD)); - #endif - #endif - // Shade - float aastrencth = _AAStrength; float4 lns = 1.0; lns.x = saturate(dot(fd.L,N1)*0.5+0.5); lns.y = saturate(dot(fd.L,N2)*0.5+0.5); #if defined(LIL_FEATURE_SHADOW_3RD) lns.z = saturate(dot(fd.L,N3)*0.5+0.5); #endif - if(_ShadowMaskType == 2) - { - float3 faceR = mul((float3x3)LIL_MATRIX_M, float3(-1.0,0.0,0.0)); - float LdotR = dot(fd.L.xz, faceR.xz); - float sdf = LdotR < 0 ? shadowStrengthMask.g : shadowStrengthMask.r; - - float3 faceF = mul((float3x3)LIL_MATRIX_M, float3(0.0,0.0,1.0)).xyz; - faceF.y *= _ShadowFlatBlur; - faceF = dot(faceF,faceF) == 0 ? 0 : normalize(faceF); - float3 faceL = fd.L.xyz; - faceL.y *= _ShadowFlatBlur; - faceL = dot(faceL,faceL) == 0 ? 0 : normalize(faceL); - - float lnSDF = dot(faceL,faceF); - lns = lerp(saturate(lnSDF * 0.5 + sdf * 0.5 + 0.25), lns, shadowStrengthMask.b); - aastrencth = 0; - - shadowStrengthMask.r = shadowStrengthMask.a; - } // Shadow #if (defined(LIL_USE_SHADOW) || defined(LIL_LIGHTMODE_SHADOWMASK)) && defined(LIL_FEATURE_RECEIVE_SHADOW) @@ -1015,21 +985,21 @@ lns.xyz = _ShadowPostAO ? lns.xyz : lns.xyz * shadowBorderMask.rgb; lns.w = lns.x; - lns.x = lilTooningNoSaturateScale(aastrencth, lns.x, _ShadowBorder, shadowBlur); - lns.y = lilTooningNoSaturateScale(aastrencth, lns.y, _Shadow2ndBorder, shadow2ndBlur); - lns.w = lilTooningNoSaturateScale(aastrencth, lns.w, _ShadowBorder, shadowBlur, _ShadowBorderRange); + lns.x = lilTooningNoSaturateScale(_AAStrength, lns.x, _ShadowBorder, shadowBlur); + lns.y = lilTooningNoSaturateScale(_AAStrength, lns.y, _Shadow2ndBorder, shadow2ndBlur); + lns.w = lilTooningNoSaturateScale(_AAStrength, lns.w, _ShadowBorder, shadowBlur, _ShadowBorderRange); #if defined(LIL_FEATURE_SHADOW_3RD) - lns.z = lilTooningNoSaturateScale(aastrencth, lns.z, _Shadow3rdBorder, shadow3rdBlur); + lns.z = lilTooningNoSaturateScale(_AAStrength, lns.z, _Shadow3rdBorder, shadow3rdBlur); #endif lns = _ShadowPostAO ? lns * shadowBorderMask.rgbr : lns; lns = saturate(lns); #else lns.w = lns.x; - lns.x = lilTooningScale(aastrencth, lns.x, _ShadowBorder, shadowBlur); - lns.y = lilTooningScale(aastrencth, lns.y, _Shadow2ndBorder, shadow2ndBlur); - lns.w = lilTooningScale(aastrencth, lns.w, _ShadowBorder, shadowBlur, _ShadowBorderRange); + lns.x = lilTooningScale(_AAStrength, lns.x, _ShadowBorder, shadowBlur); + lns.y = lilTooningScale(_AAStrength, lns.y, _Shadow2ndBorder, shadow2ndBlur); + lns.w = lilTooningScale(_AAStrength, lns.w, _ShadowBorder, shadowBlur, _ShadowBorderRange); #if defined(LIL_FEATURE_SHADOW_3RD) - lns.z = lilTooningScale(aastrencth, lns.z, _Shadow3rdBorder, shadow3rdBlur); + lns.z = lilTooningScale(_AAStrength, lns.z, _Shadow3rdBorder, shadow3rdBlur); #endif #endif @@ -1044,23 +1014,33 @@ // Copy fd.shadowmix = lns.x; + // Strength float shadowStrength = _ShadowStrength; #ifdef LIL_COLORSPACE_GAMMA shadowStrength = lilSRGBToLinear(shadowStrength); #endif - if(_ShadowMaskType == 1) + float shadowStrengthMask = 1; + #if defined(LIL_FEATURE_ShadowStrengthMask) + #if defined(_ShadowStrengthMaskLOD) + shadowStrengthMask = LIL_SAMPLE_2D(_ShadowStrengthMask, lil_sampler_linear_repeat, fd.uvMain).r; + if(_ShadowStrengthMaskLOD) shadowStrengthMask = LIL_SAMPLE_2D_GRAD(_ShadowStrengthMask, lil_sampler_linear_repeat, fd.uvMain, max(fd.ddxMain, _ShadowStrengthMaskLOD), max(fd.ddyMain, _ShadowStrengthMaskLOD)).r; + #else + shadowStrengthMask = LIL_SAMPLE_2D_GRAD(_ShadowStrengthMask, lil_sampler_linear_repeat, fd.uvMain, max(fd.ddxMain, _ShadowStrengthMaskLOD), max(fd.ddyMain, _ShadowStrengthMaskLOD)).r; + #endif + #endif + if(_ShadowMaskType) { float3 flatN = normalize(mul((float3x3)LIL_MATRIX_M, float3(0.0,0.25,1.0)));//normalize(LIL_MATRIX_M._m02_m12_m22); float lnFlat = saturate((dot(flatN, fd.L) + _ShadowFlatBorder) / _ShadowFlatBlur); #if (defined(LIL_USE_SHADOW) || defined(LIL_LIGHTMODE_SHADOWMASK)) && defined(LIL_FEATURE_RECEIVE_SHADOW) lnFlat *= lerp(1.0, calculatedShadow, _ShadowReceive); #endif - lns = lerp(lnFlat, lns, shadowStrengthMask.r); + lns = lerp(lnFlat, lns, shadowStrengthMask); } else { - shadowStrength *= shadowStrengthMask.r; + shadowStrength *= shadowStrengthMask; } lns.x = lerp(1.0, lns.x, shadowStrength); @@ -2075,4 +2055,4 @@ #if !defined(OVERRIDE_OUTPUT) #define OVERRIDE_OUTPUT \ return fd.col; -#endif +#endif \ No newline at end of file diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_frag_alpha.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_frag_alpha.hlsl index dd907abb..8836c0ff 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_frag_alpha.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_frag_alpha.hlsl @@ -2,13 +2,6 @@ // Alpha in PS // This is included in the subpass fragment shader #define LIL_ALPHA_PS - -//------------------------------------------------------------------------------------------------------------------------------ -// UDIM Discard -#if defined(LIL_FEATURE_UDIMDISCARD) - OVERRIDE_UDIMDISCARD -#endif - #if LIL_RENDER > 0 #if defined(LIL_V2F_POSITION_WS) LIL_GET_POSITION_WS_DATA(input,fd); @@ -22,6 +15,12 @@ OVERRIDE_ANIMATE_MAIN_UV #endif + //------------------------------------------------------------------------------------------------------------------------------ + // UDIM Discard + #if defined(LIL_FEATURE_UDIMDISCARD) + OVERRIDE_UDIMDISCARD + #endif + //------------------------------------------------------------------------------------------------------------------------------ // Main Color #if defined(LIL_OUTLINE) diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_functions_thirdparty.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_functions_thirdparty.hlsl index 1f5378a3..f9606af7 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_functions_thirdparty.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_functions_thirdparty.hlsl @@ -106,81 +106,6 @@ bool lilCheckAudioLink() #endif } -//------------------------------------------------------------------------------------------------------------------------------ -// LTCGI -// https://github.com/PiMaker/ltcgi -#if defined(LIL_FEATURE_LTCGI) -float3 NearestPointOnLine(float3 p, float3 pos1, float3 pos2) -{ - float3 v = pos2 - pos1; - float3 w = p - pos1; - float c1 = dot(w, v); - float c2 = dot(v, v); - float b = c1 / c2; - float3 pb = pos1 + b * v; - if(c1 <= 0.0) return pos1; - if(c2 <= c1) return pos2; - return pb; -} - -float3 NearestPointOnQuad(float3 p, float3 v[4]) -{ - float3 v1 = NearestPointOnLine(p, v[0], v[1]); - float3 v2 = NearestPointOnLine(p, v[2], v[3]); - return NearestPointOnLine(p, v1, v2); -} - -#define Sample(smp,uv) SampleLevel(smp,uv,0) -#include "Packages/at.pimaker.ltcgi/Shaders/LTCGI_structs.cginc" -struct lil_ltcgi_struct -{ - float3 diff; - float3 spec; - float3 L; - float3 N; - float3 V; -}; -float lilLTCGIAttenuation(inout lil_ltcgi_struct ltcgi, in ltcgi_output output) -{ - float3 C = (output.input.Lw[1] + output.input.Lw[0] + output.input.Lw[3] + output.input.Lw[0]) * 0.25; - float3 P = NearestPointOnQuad(float3(0,0,0), output.input.Lw); - float3 N = normalize(cross(output.input.Lw[1]-output.input.Lw[0], output.input.Lw[3]-output.input.Lw[0])); - float3 L = normalize(lerp(P, C, 0.3)); - float dist = lerp(length(P), length(C), 0.3) + 1; - float rim = saturate(1 - abs(dot(ltcgi.N,ltcgi.V)) * 2 + dot(ltcgi.N,L)); - float atten = abs(dot(N, normalize(P))) / (pow(dist, 3)); - atten *= lerp(rim, 1, saturate(dot(ltcgi.V,L) * 0.5 + 0.5)); - atten = saturate(atten); - ltcgi.L += atten * dot(output.color,0.333333) * L; - return atten; -} -void callback_diffuse(inout lil_ltcgi_struct ltcgi, in ltcgi_output output) { - float atten = lilLTCGIAttenuation(ltcgi, output); - ltcgi.diff += atten * output.color * 2; - //ltcgi.diff += output.intensity * output.color; -} -void callback_specular(inout lil_ltcgi_struct ltcgi, in ltcgi_output output) { - float atten = lilLTCGIAttenuation(ltcgi, output); - ltcgi.spec += atten * output.color; - //ltcgi.spec += output.intensity * output.color; -} -#define LTCGI_V2_CUSTOM_INPUT lil_ltcgi_struct -#define LTCGI_V2_DIFFUSE_CALLBACK callback_diffuse -#define LTCGI_V2_SPECULAR_CALLBACK callback_specular -#include "Packages/at.pimaker.ltcgi/Shaders/LTCGI.cginc" - -void lilLTCGI(inout lilLightData o, float3 positionWS, float3 N, float3 V, float2 uv1) -{ - lil_ltcgi_struct ltcgi = (lil_ltcgi_struct)0; - ltcgi.N = N; - ltcgi.V = V; - LTCGI_Contribution(ltcgi, positionWS, N, V, 1, uv1); - o.lightColor += ltcgi.diff + ltcgi.spec; - //o.lightDirection = normalize(o.lightDirection * dot(o.lightColor+0.001,0.333333) + ltcgi.L); -} -#undef Sample -#endif - //------------------------------------------------------------------------------------------------------------------------------ // GTAvaCrypt // https://github.com/rygo6/GTAvaCrypt/blob/master/LICENSE diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_input.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_input.hlsl index 3a9fe7d5..5ebb4e12 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_input.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_input.hlsl @@ -373,7 +373,6 @@ CBUFFER_START(UnityPerMaterial) #if defined(LIL_FUR) float4 _FurNoiseMask_ST; float4 _FurVector; - float4 _FurRimColor; #endif #if defined(LIL_REFRACTION) || defined(LIL_GEM) float4 _RefractionColor; @@ -626,8 +625,6 @@ CBUFFER_START(UnityPerMaterial) float _FurRootOffset; float _FurRandomize; float _FurTouchStrength; - float _FurRimFresnelPower; - float _FurRimAntiLight; #endif #if defined(LIL_REFRACTION) || defined(LIL_GEM) float _RefractionStrength; @@ -899,7 +896,7 @@ SAMPLER(sampler_AudioLinkMask); SAMPLER(sampler_OutlineTex); // AudioLink -#if defined(LIL_FEATURE_AUDIOLINK) && !defined(AUDIOLINK_CGINC_INCLUDED) +#if defined(LIL_FEATURE_AUDIOLINK) TEXTURE2D_FLOAT(_AudioTexture); float4 _AudioTexture_TexelSize; #endif diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_input_base.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_input_base.hlsl index 70aa7776..91c6a100 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_input_base.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_input_base.hlsl @@ -259,7 +259,6 @@ float4 _MainTex_ST; #if defined(LIL_FUR) float4 _FurNoiseMask_ST; float4 _FurVector; - float4 _FurRimColor; #endif // Refraction @@ -542,8 +541,6 @@ float _lilShadowCasterBias; float _FurRootOffset; float _FurRandomize; float _FurCutoutLength; - float _FurRimFresnelPower; - float _FurRimAntiLight; #if defined(LIL_FEATURE_FUR_COLLISION) float _FurTouchStrength; #endif diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_input_opt.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_input_opt.hlsl index 70aa7776..91c6a100 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_input_opt.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_input_opt.hlsl @@ -259,7 +259,6 @@ float4 _MainTex_ST; #if defined(LIL_FUR) float4 _FurNoiseMask_ST; float4 _FurVector; - float4 _FurRimColor; #endif // Refraction @@ -542,8 +541,6 @@ float _lilShadowCasterBias; float _FurRootOffset; float _FurRandomize; float _FurCutoutLength; - float _FurRimFresnelPower; - float _FurRimAntiLight; #if defined(LIL_FEATURE_FUR_COLLISION) float _FurTouchStrength; #endif diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_macro.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_macro.hlsl index 58ebba77..ba6b9345 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_macro.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_macro.hlsl @@ -191,7 +191,7 @@ #endif // normalOS (vertex input) -#if defined(LIL_SHOULD_TANGENT) || defined(LIL_FEATURE_SHADOW) || defined(LIL_FEATURE_RIMSHADE) || defined(LIL_FEATURE_REFLECTION) || defined(LIL_FEATURE_MATCAP) || defined(LIL_FEATURE_MATCAP_2ND) || defined(LIL_FEATURE_RIMLIGHT) || defined(LIL_FEATURE_GLITTER) || defined(LIL_FEATURE_BACKLIGHT) || defined(LIL_FEATURE_DISTANCE_FADE) || defined(LIL_FEATURE_AUDIOLINK) || defined(LIL_FEATURE_LTCGI) || defined(LIL_REFRACTION) || (defined(LIL_USE_LIGHTMAP) && defined(LIL_LIGHTMODE_SUBTRACTIVE)) || defined(LIL_HDRP) +#if defined(LIL_SHOULD_TANGENT) || defined(LIL_FEATURE_SHADOW) || defined(LIL_FEATURE_RIMSHADE) || defined(LIL_FEATURE_REFLECTION) || defined(LIL_FEATURE_MATCAP) || defined(LIL_FEATURE_MATCAP_2ND) || defined(LIL_FEATURE_RIMLIGHT) || defined(LIL_FEATURE_GLITTER) || defined(LIL_FEATURE_BACKLIGHT) || defined(LIL_FEATURE_DISTANCE_FADE) || defined(LIL_FEATURE_AUDIOLINK) || defined(LIL_REFRACTION) || (defined(LIL_USE_LIGHTMAP) && defined(LIL_LIGHTMODE_SUBTRACTIVE)) || defined(LIL_HDRP) #define LIL_SHOULD_NORMAL #endif @@ -201,7 +201,7 @@ #endif // positionWS -#if defined(SHADOWS_SCREEN) || defined(LIL_PASS_FORWARDADD) || defined(LIL_FEATURE_MAIN2ND) || defined(LIL_FEATURE_MAIN3RD) || defined(LIL_FEATURE_ANISOTROPY) || defined(LIL_FEATURE_RECEIVE_SHADOW) || defined(LIL_FEATURE_RIMSHADE) || defined(LIL_FEATURE_REFLECTION) || defined(LIL_FEATURE_MATCAP) || defined(LIL_FEATURE_MATCAP_2ND) || defined(LIL_FEATURE_RIMLIGHT) || defined(LIL_FEATURE_GLITTER) || defined(LIL_FEATURE_BACKLIGHT) || defined(LIL_FEATURE_EMISSION_1ST) || defined(LIL_FEATURE_EMISSION_2ND) || defined(LIL_FEATURE_PARALLAX) || defined(LIL_FEATURE_DISTANCE_FADE) || defined(LIL_FEATURE_LTCGI) || defined(LIL_REFRACTION) || !defined(LIL_BRP) || defined(LIL_USE_LPPV) +#if defined(SHADOWS_SCREEN) || defined(LIL_PASS_FORWARDADD) || defined(LIL_FEATURE_MAIN2ND) || defined(LIL_FEATURE_MAIN3RD) || defined(LIL_FEATURE_ANISOTROPY) || defined(LIL_FEATURE_RECEIVE_SHADOW) || defined(LIL_FEATURE_RIMSHADE) || defined(LIL_FEATURE_REFLECTION) || defined(LIL_FEATURE_MATCAP) || defined(LIL_FEATURE_MATCAP_2ND) || defined(LIL_FEATURE_RIMLIGHT) || defined(LIL_FEATURE_GLITTER) || defined(LIL_FEATURE_BACKLIGHT) || defined(LIL_FEATURE_EMISSION_1ST) || defined(LIL_FEATURE_EMISSION_2ND) || defined(LIL_FEATURE_PARALLAX) || defined(LIL_FEATURE_DISTANCE_FADE) || defined(LIL_REFRACTION) || !defined(LIL_BRP) || defined(LIL_USE_LPPV) #define LIL_SHOULD_POSITION_WS #endif @@ -2085,12 +2085,6 @@ struct lilLightData #define LIL_CORRECT_LIGHTCOLOR_PS(lightColor) #endif -#if defined(LIL_FEATURE_LTCGI) - #define LIL_APPLY_LTCGI(o) lilLTCGI(o, vertexInput.positionWS, normalize(vertexNormalInput.normalWS), normalize(lilHeadDirection(lilToAbsolutePositionWS(vertexInput.positionWS))), input.uv1); -#else - #define LIL_APPLY_LTCGI(o) -#endif - #if defined(LIL_PASS_FORWARDADD) #define LIL_CALC_MAINLIGHT(i,o) #elif defined(LIL_HDRP) @@ -2117,7 +2111,6 @@ struct lilLightData o.lightDirection = lightDatas.lightDirection; \ o.lightColor = lightDatas.directLight; \ o.indLightColor = lightDatas.indirectLight; \ - LIL_APPLY_LTCGI(o) \ LIL_APPLY_ADDITIONALLIGHT_TO_MAIN(i,o); \ LIL_CORRECT_LIGHTCOLOR_VS(o.lightColor) #else diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_vert.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_vert.hlsl index 172a1342..118f38ec 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_vert.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_vert.hlsl @@ -244,7 +244,7 @@ LIL_V2F_TYPE vert(appdata input) } #endif #endif - + //------------------------------------------------------------------------------------------------------------------------------ // Fog & Lighting lilFragData fd = lilInitFragData(); @@ -286,13 +286,13 @@ LIL_V2F_TYPE vert(appdata input) #if defined(LIL_V2F_POSITION_CS) && defined(LIL_FEATURE_CLIPPING_CANCELLER) && !defined(LIL_LITE) && !defined(LIL_PASS_SHADOWCASTER_INCLUDED) && !defined(LIL_PASS_META_INCLUDED) #if defined(UNITY_REVERSED_Z) // DirectX - if(LIL_V2F_OUT_BASE.positionCS.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT_BASE.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(LIL_V2F_OUT_BASE.positionCS.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT_BASE.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { LIL_V2F_OUT_BASE.positionCS.z = LIL_V2F_OUT_BASE.positionCS.z * 0.0001 + LIL_V2F_OUT_BASE.positionCS.w * 0.999; } #else // OpenGL - if(LIL_V2F_OUT_BASE.positionCS.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT_BASE.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(LIL_V2F_OUT_BASE.positionCS.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT_BASE.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { LIL_V2F_OUT_BASE.positionCS.z = LIL_V2F_OUT_BASE.positionCS.z * 0.0001 - LIL_V2F_OUT_BASE.positionCS.w * 0.999; } @@ -315,13 +315,13 @@ LIL_V2F_TYPE vert(appdata input) #if defined(LIL_FEATURE_CLIPPING_CANCELLER) && !defined(LIL_LITE) && !defined(LIL_PASS_SHADOWCASTER_INCLUDED) && !defined(LIL_PASS_META_INCLUDED) #if defined(UNITY_REVERSED_Z) // DirectX - if(LIL_V2F_OUT.positionCSOL.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT.positionCSOL.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(LIL_V2F_OUT.positionCSOL.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT.positionCSOL.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { LIL_V2F_OUT.positionCSOL.z = LIL_V2F_OUT.positionCSOL.z * 0.0001 + LIL_V2F_OUT.positionCSOL.w * 0.999; } #else // OpenGL - if(LIL_V2F_OUT.positionCSOL.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT.positionCSOL.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(LIL_V2F_OUT.positionCSOL.w < _ProjectionParams.y * 1.01 && LIL_V2F_OUT.positionCSOL.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { LIL_V2F_OUT.positionCSOL.z = LIL_V2F_OUT.positionCSOL.z * 0.0001 - LIL_V2F_OUT.positionCSOL.w * 0.999; } @@ -415,15 +415,15 @@ LIL_V2F_TYPE vert(appdata input) //------------------------------------------------------------------------------------------------------------------------------ // UDIM Discard #if defined(LIL_FEATURE_UDIMDISCARD) && !defined(LIL_LITE) - if(_UDIMDiscardMode == 0 && _UDIMDiscardCompile == 1 && LIL_CHECK_UDIMDISCARD(input)) // Discard Vertices instead of just pixels - { - #if defined(LIL_V2F_POSITION_CS) || defined(LIL_V2F_SHADOW_CASTER_OUTPUT) - LIL_V2F_OUT_BASE.positionCS = 0.0/0.0; - #endif - #if defined(LIL_ONEPASS_OUTLINE) - LIL_V2F_OUT.positionCSOL = 0.0/0.0; - #endif - } + if(_UDIMDiscardMode == 0 && _UDIMDiscardCompile == 1 && LIL_CHECK_UDIMDISCARD(input)) // Discard Vertices instead of just pixels + { + #if defined(LIL_V2F_POSITION_CS) + LIL_V2F_OUT_BASE.positionCS = 0.0/0.0; + #endif + #if defined(LIL_ONEPASS_OUTLINE) + LIL_V2F_OUT.positionCSOL = 0.0/0.0; + #endif + } #endif #if defined(LIL_V2F_POSITION_OS) diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur.hlsl index 35a652fc..4ad89e8c 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur.hlsl @@ -123,18 +123,6 @@ v2g vert(appdata input) LIL_CUSTOM_VERT_COPY - //------------------------------------------------------------------------------------------------------------------------------ - // UDIM Discard - #if defined(LIL_FEATURE_UDIMDISCARD) && !defined(LIL_LITE) - if(_UDIMDiscardMode == 0 && _UDIMDiscardCompile == 1 && LIL_CHECK_UDIMDISCARD(input)) // Discard Vertices instead of just pixels - { - #if defined(LIL_V2F_POSITION_CS) - output.positionWS = 0.0/0.0; - #endif - return output; - } - #endif - //------------------------------------------------------------------------------------------------------------------------------ // Fog & Lighting lilFragData fd = lilInitFragData(); @@ -237,6 +225,17 @@ v2g vert(appdata input) #endif #endif + //------------------------------------------------------------------------------------------------------------------------------ + // UDIM Discard + #if defined(LIL_FEATURE_UDIMDISCARD) && !defined(LIL_LITE) + if(_UDIMDiscardMode == 0 && _UDIMDiscardCompile == 1 && LIL_CHECK_UDIMDISCARD(input)) // Discard Vertices instead of just pixels + { + #if defined(LIL_V2F_POSITION_CS) + output.positionWS = 0.0/0.0; + #endif + } + #endif + return output; } @@ -274,9 +273,6 @@ void AppendFur(inout TriangleStream outStream, inout v2f output, v2g input[ #if defined(LIL_V2F_NORMAL_WS) output.normalWS = lilLerp3(input[0].normalWS, input[1].normalWS, input[2].normalWS, factor); #endif - #if defined(LIL_V2F_LIGHTCOLOR) && defined(LIL_FEATURE_LTCGI) && defined(LIL_PASS_FORWARD) - output.lightColor = lilLerp3(input[0].lightColor, input[1].lightColor, input[2].lightColor, factor); - #endif #if defined(LIL_V2F_VERTEXLIGHT_FOG) && !(!defined(LIL_USE_ADDITIONALLIGHT_VS) && defined(LIL_HDRP)) output.vlf = lilLerp3(input[0].vlf, input[1].vlf, input[2].vlf, factor); #endif @@ -300,13 +296,13 @@ void AppendFur(inout TriangleStream outStream, inout v2f output, v2g input[ // Clipping Canceller #if defined(UNITY_REVERSED_Z) // DirectX - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 + output.positionCS.w * 0.999; } #else // OpenGL - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 - output.positionCS.w * 0.999; } @@ -344,13 +340,13 @@ void AppendFur(inout TriangleStream outStream, inout v2f output, v2g input[ // Clipping Canceller #if defined(UNITY_REVERSED_Z) // DirectX - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 + output.positionCS.w * 0.999; } #else // OpenGL - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 - output.positionCS.w * 0.999; } diff --git a/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur_thirdparty.hlsl b/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur_thirdparty.hlsl index 5049951f..cfaa5fd4 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur_thirdparty.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_common_vert_fur_thirdparty.hlsl @@ -28,9 +28,6 @@ #if defined(LIL_V2G_NORMAL_WS) float3 ndc = (input[0].normalWS +input[1].normalWS +input[2].normalWS) *0.333333333333; #endif -#if defined(LIL_V2F_LIGHTCOLOR) && defined(LIL_FEATURE_LTCGI) && defined(LIL_PASS_FORWARD) - float3 lcc = (input[0].lightColor +input[1].lightColor +input[2].lightColor) * 0.333333333333; -#endif #if defined(LIL_V2G_VERTEXLIGHT_FOG) && !(!defined(LIL_USE_ADDITIONALLIGHT_VS) && defined(LIL_HDRP)) LIL_VERTEXLIGHT_FOG_TYPE vlfc = (input[0].vlf + input[1].vlf + input[2].vlf) * 0.333333333333; #endif @@ -68,9 +65,6 @@ for(uint fl = 0; fl < _FurLayerNum; fl++) #if defined(LIL_V2F_NORMAL_WS) output.normalWS = lerp(input[ii2].normalWS,ndc,lpmix); #endif - #if defined(LIL_V2F_LIGHTCOLOR) && defined(LIL_FEATURE_LTCGI) && defined(LIL_PASS_FORWARD) - output.lightColor = lerp(input[ii2].lightColor,lcc,lpmix); - #endif #if defined(LIL_V2F_VERTEXLIGHT_FOG) && !(!defined(LIL_USE_ADDITIONALLIGHT_VS) && defined(LIL_HDRP)) output.vlf = lerp(input[ii2].vlf,vlfc,lpmix); #endif @@ -106,13 +100,13 @@ for(uint fl = 0; fl < _FurLayerNum; fl++) // Clipping Canceller #if defined(UNITY_REVERSED_Z) // DirectX - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 + output.positionCS.w * 0.999; } #else // OpenGL - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 - output.positionCS.w * 0.999; } @@ -149,13 +143,13 @@ for(uint fl = 0; fl < _FurLayerNum; fl++) // Clipping Canceller #if defined(UNITY_REVERSED_Z) // DirectX - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 + output.positionCS.w * 0.999; } #else // OpenGL - if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING && !LIL_IS_MIRROR) + if(output.positionCS.w < _ProjectionParams.y * 1.01 && output.positionCS.w > 0 && _ProjectionParams.y < LIL_NEARCLIP_THRESHOLD LIL_MULTI_SHOULD_CLIPPING) { output.positionCS.z = output.positionCS.z * 0.0001 - output.positionCS.w * 0.999; } diff --git a/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fakeshadow.hlsl b/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fakeshadow.hlsl index f0e8b124..16181b81 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fakeshadow.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fakeshadow.hlsl @@ -53,9 +53,9 @@ v2f vert(appdata input) #else float3 lightDirection = normalize(lilGetLightDirection() + length(_FakeShadowVector.xyz) * normalize(mul((float3x3)LIL_MATRIX_M, _FakeShadowVector.xyz))); #endif - float4 lightShift = mul(LIL_MATRIX_VP, float4(lightDirection * _FakeShadowVector.w, 0)); + float2 lightShift = mul((float3x3)LIL_MATRIX_VP, lightDirection * _FakeShadowVector.w).xy; output.positionCS = vertexInput.positionCS; - output.positionCS -= lightShift; + output.positionCS.xy -= lightShift.xy; output.uv0 = input.uv0 * _MainTex_ST.xy + _MainTex_ST.zw; LIL_TRANSFER_FOG(vertexInput, output); diff --git a/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl b/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl index 9ede1a05..83607b9a 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl @@ -17,7 +17,9 @@ // v2g #define LIL_V2G_TEXCOORD0 #define LIL_V2G_POSITION_WS -#define LIL_V2G_NORMAL_WS +#if defined(LIL_V2G_FORCE_NORMAL_WS) || defined(LIL_SHOULD_NORMAL) + #define LIL_V2G_NORMAL_WS +#endif #if !defined(LIL_PASS_FORWARDADD) #define LIL_V2G_LIGHTCOLOR #define LIL_V2G_LIGHTDIRECTION @@ -31,10 +33,15 @@ // g2f #define LIL_V2F_POSITION_CS -#define LIL_V2F_POSITION_WS #define LIL_V2F_TEXCOORD0 -#define LIL_V2F_NORMAL_WS +#if defined(LIL_V2F_FORCE_POSITION_WS) || defined(LIL_PASS_FORWARDADD) || defined(LIL_FEATURE_DISTANCE_FADE) || !defined(LIL_BRP) || defined(LIL_USE_LPPV) + #define LIL_V2F_POSITION_WS +#endif + +#if defined(LIL_V2F_FORCE_NORMAL_WS) || defined(LIL_SHOULD_NORMAL) + #define LIL_V2F_NORMAL_WS +#endif #if !defined(LIL_PASS_FORWARDADD) #define LIL_V2F_LIGHTCOLOR #define LIL_V2F_LIGHTDIRECTION @@ -51,7 +58,9 @@ struct v2g float3 positionWS : TEXCOORD1; float3 furVector : TEXCOORD2; uint vertexID : TEXCOORD3; - float3 normalWS : TEXCOORD4; + #if defined(LIL_V2G_NORMAL_WS) + float3 normalWS : TEXCOORD4; + #endif LIL_LIGHTCOLOR_COORDS(5) LIL_LIGHTDIRECTION_COORDS(6) LIL_INDLIGHTCOLOR_COORDS(7) @@ -65,8 +74,12 @@ struct v2f { float4 positionCS : SV_POSITION; float2 uv0 : TEXCOORD0; - float3 positionWS : TEXCOORD1; - LIL_VECTOR_INTERPOLATION float3 normalWS : TEXCOORD2; + #if defined(LIL_V2F_POSITION_WS) + float3 positionWS : TEXCOORD1; + #endif + #if defined(LIL_V2F_NORMAL_WS) + LIL_VECTOR_INTERPOLATION float3 normalWS : TEXCOORD2; + #endif float furLayer : TEXCOORD3; LIL_LIGHTCOLOR_COORDS(4) LIL_LIGHTDIRECTION_COORDS(5) @@ -142,14 +155,12 @@ float4 frag(v2f input) : SV_Target clip(fd.col.a - _Cutoff); #endif - fd.origN = normalize(input.normalWS); - fd.N = normalize(input.normalWS); - BEFORE_SHADOW #ifndef LIL_PASS_FORWARDADD //------------------------------------------------------------------------------------------------------------------------------ // Lighting #if defined(LIL_FEATURE_SHADOW) + fd.N = normalize(input.normalWS); fd.ln = dot(fd.L, fd.N); OVERRIDE_SHADOW fd.col.rgb += fd.albedo * fd.addLightColor; @@ -159,6 +170,7 @@ float4 frag(v2f input) : SV_Target #endif #else #if defined(LIL_FEATURE_SHADOW) && defined(LIL_OPTIMIZE_APPLY_SHADOW_FA) + fd.N = normalize(input.normalWS); fd.ln = dot(fd.L, fd.N); OVERRIDE_SHADOW #else @@ -170,15 +182,6 @@ float4 frag(v2f input) : SV_Target #endif #endif - //------------------------------------------------------------------------------------------------------------------------------ - // Rim Shade - BEFORE_RIMSHADE - #if defined(LIL_FEATURE_RIMSHADE) - OVERRIDE_RIMSHADE - #endif - - fd.col.rgb += input.furLayer * pow((1-abs(dot(normalize(fd.N), fd.V))), _FurRimFresnelPower) * lerp(1,lilGray(fd.invLighting), _FurRimAntiLight) * _FurRimColor.rgb * fd.lightColor; - //------------------------------------------------------------------------------------------------------------------------------ // Distance Fade BEFORE_DISTANCE_FADE diff --git a/Assets/External/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl b/Assets/External/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl index ad637340..562b0b36 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl @@ -258,50 +258,6 @@ float4 frag(v2f input LIL_VFACE(facing)) : SV_Target BEFORE_MAIN OVERRIDE_MAIN - //------------------------------------------------------------------------------------------------------------------------------ - // Normal - #if defined(LIL_V2F_NORMAL_WS) - #if defined(LIL_FEATURE_NORMAL_1ST) || defined(LIL_FEATURE_NORMAL_2ND) - float3 normalmap = float3(0.0,0.0,1.0); - - // 1st - BEFORE_NORMAL_1ST - #if defined(LIL_FEATURE_NORMAL_1ST) - OVERRIDE_NORMAL_1ST - #endif - - // 2nd - BEFORE_NORMAL_2ND - #if defined(LIL_FEATURE_NORMAL_2ND) - OVERRIDE_NORMAL_2ND - #endif - - fd.N = normalize(mul(normalmap, fd.TBN)); - fd.N = fd.facing < (_FlipNormal-1.0) ? -fd.N : fd.N; - #else - fd.N = normalize(input.normalWS); - fd.N = fd.facing < (_FlipNormal-1.0) ? -fd.N : fd.N; - #endif - fd.ln = dot(fd.L, fd.N); - #if defined(LIL_V2F_POSITION_WS) - fd.nv = saturate(dot(fd.N, fd.V)); - fd.nvabs = abs(dot(fd.N, fd.V)); - fd.uvRim = float2(fd.nvabs,fd.nvabs); - #endif - fd.origN = normalize(input.normalWS); - fd.uvMat = mul(fd.cameraMatrix, fd.N).xy * 0.5 + 0.5; - #endif - fd.reflectionN = fd.N; - fd.matcapN = fd.N; - fd.matcap2ndN = fd.N; - - //------------------------------------------------------------------------------------------------------------------------------ - // AudioLink - BEFORE_AUDIOLINK - #if defined(LIL_FEATURE_AUDIOLINK) - OVERRIDE_AUDIOLINK - #endif - //------------------------------------------------------------------------------------------------------------------------------ // Layer Color #if defined(LIL_V2F_TANGENT_WS) @@ -398,6 +354,43 @@ float4 frag(v2f input LIL_VFACE(facing)) : SV_Target fd.col.rgb *= 1.0-furAO; #endif + //------------------------------------------------------------------------------------------------------------------------------ + // Normal + #if defined(LIL_V2F_NORMAL_WS) + #if defined(LIL_FEATURE_NORMAL_1ST) || defined(LIL_FEATURE_NORMAL_2ND) + float3 normalmap = float3(0.0,0.0,1.0); + + // 1st + BEFORE_NORMAL_1ST + #if defined(LIL_FEATURE_NORMAL_1ST) + OVERRIDE_NORMAL_1ST + #endif + + // 2nd + BEFORE_NORMAL_2ND + #if defined(LIL_FEATURE_NORMAL_2ND) + OVERRIDE_NORMAL_2ND + #endif + + fd.N = normalize(mul(normalmap, fd.TBN)); + fd.N = fd.facing < (_FlipNormal-1.0) ? -fd.N : fd.N; + #else + fd.N = normalize(input.normalWS); + fd.N = fd.facing < (_FlipNormal-1.0) ? -fd.N : fd.N; + #endif + fd.ln = dot(fd.L, fd.N); + #if defined(LIL_V2F_POSITION_WS) + fd.nv = saturate(dot(fd.N, fd.V)); + fd.nvabs = abs(dot(fd.N, fd.V)); + fd.uvRim = float2(fd.nvabs,fd.nvabs); + #endif + fd.origN = normalize(input.normalWS); + fd.uvMat = mul(fd.cameraMatrix, fd.N).xy * 0.5 + 0.5; + #endif + fd.reflectionN = fd.N; + fd.matcapN = fd.N; + fd.matcap2ndN = fd.N; + //------------------------------------------------------------------------------------------------------------------------------ // Anisotropy BEFORE_ANISOTROPY @@ -405,6 +398,13 @@ float4 frag(v2f input LIL_VFACE(facing)) : SV_Target OVERRIDE_ANISOTROPY #endif + //------------------------------------------------------------------------------------------------------------------------------ + // AudioLink + BEFORE_AUDIOLINK + #if defined(LIL_FEATURE_AUDIOLINK) + OVERRIDE_AUDIOLINK + #endif + //------------------------------------------------------------------------------------------------------------------------------ // Copy fd.albedo = fd.col.rgb; diff --git a/Assets/External/lilToon/Shader/Includes/lil_pass_shadowcaster.hlsl b/Assets/External/lilToon/Shader/Includes/lil_pass_shadowcaster.hlsl index e1c55c4c..ef29f9bf 100644 --- a/Assets/External/lilToon/Shader/Includes/lil_pass_shadowcaster.hlsl +++ b/Assets/External/lilToon/Shader/Includes/lil_pass_shadowcaster.hlsl @@ -10,7 +10,7 @@ #define LIL_CUSTOM_V2F_MEMBER(id0,id1,id2,id3,id4,id5,id6,id7) #endif -#if defined(LIL_V2F_FORCE_TEXCOORD0) || (LIL_RENDER > 0) || defined(LIL_FEATURE_UDIMDISCARD) +#if defined(LIL_V2F_FORCE_TEXCOORD0) || (LIL_RENDER > 0) #if defined(LIL_FUR) #define LIL_V2F_TEXCOORD0 #else diff --git a/Assets/External/lilToon/Shader/lts.shader b/Assets/External/lilToon/Shader/lts.shader index 0fe63a13..ad7195d9 100644 --- a/Assets/External/lilToon/Shader/lts.shader +++ b/Assets/External/lilToon/Shader/lts.shader @@ -602,7 +602,7 @@ Shader "lilToon" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_cutout.shader b/Assets/External/lilToon/Shader/lts_cutout.shader index 2b5ae5a3..1cdc2653 100644 --- a/Assets/External/lilToon/Shader/lts_cutout.shader +++ b/Assets/External/lilToon/Shader/lts_cutout.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonCutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_cutout_o.shader b/Assets/External/lilToon/Shader/lts_cutout_o.shader index b97c4fb4..4212791d 100644 --- a/Assets/External/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/External/lilToon/Shader/lts_cutout_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonCutoutOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_cutout_oo.shader b/Assets/External/lilToon/Shader/lts_cutout_oo.shader index 1df0bf70..42a22212 100644 --- a/Assets/External/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/External/lilToon/Shader/lts_cutout_oo.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_fakeshadow.shader b/Assets/External/lilToon/Shader/lts_fakeshadow.shader index 53065d12..25e68812 100644 --- a/Assets/External/lilToon/Shader/lts_fakeshadow.shader +++ b/Assets/External/lilToon/Shader/lts_fakeshadow.shader @@ -85,7 +85,7 @@ Shader "_lil/[Optional] lilToonFakeShadow" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 } SubShader diff --git a/Assets/External/lilToon/Shader/lts_fur.shader b/Assets/External/lilToon/Shader/lts_fur.shader index c678cfc0..800743be 100644 --- a/Assets/External/lilToon/Shader/lts_fur.shader +++ b/Assets/External/lilToon/Shader/lts_fur.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonFur" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -652,9 +652,6 @@ Shader "Hidden/lilToonFur" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/lts_fur_cutout.shader b/Assets/External/lilToon/Shader/lts_fur_cutout.shader index b94b6703..5b5e6423 100644 --- a/Assets/External/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/External/lilToon/Shader/lts_fur_cutout.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonFurCutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -652,9 +652,6 @@ Shader "Hidden/lilToonFurCutout" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/lts_fur_two.shader b/Assets/External/lilToon/Shader/lts_fur_two.shader index 8c2cc853..ecce2550 100644 --- a/Assets/External/lilToon/Shader/lts_fur_two.shader +++ b/Assets/External/lilToon/Shader/lts_fur_two.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonFurTwoPass" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -652,9 +652,6 @@ Shader "Hidden/lilToonFurTwoPass" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/lts_furonly.shader b/Assets/External/lilToon/Shader/lts_furonly.shader index 79375079..642f2139 100644 --- a/Assets/External/lilToon/Shader/lts_furonly.shader +++ b/Assets/External/lilToon/Shader/lts_furonly.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -652,9 +652,6 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/lts_furonly_cutout.shader b/Assets/External/lilToon/Shader/lts_furonly_cutout.shader index 26780a3e..fbac12e8 100644 --- a/Assets/External/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/External/lilToon/Shader/lts_furonly_cutout.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -652,9 +652,6 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/lts_furonly_two.shader b/Assets/External/lilToon/Shader/lts_furonly_two.shader index 5e5b2092..816d13e1 100644 --- a/Assets/External/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/External/lilToon/Shader/lts_furonly_two.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -652,9 +652,6 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/lts_gem.shader b/Assets/External/lilToon/Shader/lts_gem.shader index d8448552..758a7568 100644 --- a/Assets/External/lilToon/Shader/lts_gem.shader +++ b/Assets/External/lilToon/Shader/lts_gem.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonGem" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_o.shader b/Assets/External/lilToon/Shader/lts_o.shader index b19c4dc2..293dba82 100644 --- a/Assets/External/lilToon/Shader/lts_o.shader +++ b/Assets/External/lilToon/Shader/lts_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_onetrans.shader b/Assets/External/lilToon/Shader/lts_onetrans.shader index c4a69a7f..f7f098c7 100644 --- a/Assets/External/lilToon/Shader/lts_onetrans.shader +++ b/Assets/External/lilToon/Shader/lts_onetrans.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonOnePassTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_onetrans_o.shader b/Assets/External/lilToon/Shader/lts_onetrans_o.shader index 50ff10be..8c0ce566 100644 --- a/Assets/External/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/External/lilToon/Shader/lts_onetrans_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonOnePassTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_oo.shader b/Assets/External/lilToon/Shader/lts_oo.shader index a846f37f..85ebf557 100644 --- a/Assets/External/lilToon/Shader/lts_oo.shader +++ b/Assets/External/lilToon/Shader/lts_oo.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonOutlineOnly" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_overlay.shader b/Assets/External/lilToon/Shader/lts_overlay.shader index 8d8d8c62..0e3f4384 100644 --- a/Assets/External/lilToon/Shader/lts_overlay.shader +++ b/Assets/External/lilToon/Shader/lts_overlay.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonOverlay" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_overlay_one.shader b/Assets/External/lilToon/Shader/lts_overlay_one.shader index 223eb579..8684afaa 100644 --- a/Assets/External/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/External/lilToon/Shader/lts_overlay_one.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonOverlayOnePass" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_ref.shader b/Assets/External/lilToon/Shader/lts_ref.shader index 0556390c..6236fb6b 100644 --- a/Assets/External/lilToon/Shader/lts_ref.shader +++ b/Assets/External/lilToon/Shader/lts_ref.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonRefraction" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_ref_blur.shader b/Assets/External/lilToon/Shader/lts_ref_blur.shader index d8061f1d..2fa72d52 100644 --- a/Assets/External/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/External/lilToon/Shader/lts_ref_blur.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonRefractionBlur" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess.shader b/Assets/External/lilToon/Shader/lts_tess.shader index b37a918d..fdcd5967 100644 --- a/Assets/External/lilToon/Shader/lts_tess.shader +++ b/Assets/External/lilToon/Shader/lts_tess.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellation" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_cutout.shader b/Assets/External/lilToon/Shader/lts_tess_cutout.shader index c9a5555c..6b493725 100644 --- a/Assets/External/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/External/lilToon/Shader/lts_tess_cutout.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationCutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/External/lilToon/Shader/lts_tess_cutout_o.shader index a858e83c..4308b18e 100644 --- a/Assets/External/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/External/lilToon/Shader/lts_tess_cutout_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationCutoutOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_o.shader b/Assets/External/lilToon/Shader/lts_tess_o.shader index a2314380..ae49c19e 100644 --- a/Assets/External/lilToon/Shader/lts_tess_o.shader +++ b/Assets/External/lilToon/Shader/lts_tess_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_onetrans.shader b/Assets/External/lilToon/Shader/lts_tess_onetrans.shader index e9fe7b34..74790178 100644 --- a/Assets/External/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/External/lilToon/Shader/lts_tess_onetrans.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationOnePassTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/External/lilToon/Shader/lts_tess_onetrans_o.shader index 6d233af4..71b15d0d 100644 --- a/Assets/External/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/External/lilToon/Shader/lts_tess_onetrans_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_trans.shader b/Assets/External/lilToon/Shader/lts_tess_trans.shader index 957e90af..6bd3c023 100644 --- a/Assets/External/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/External/lilToon/Shader/lts_tess_trans.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_trans_o.shader b/Assets/External/lilToon/Shader/lts_tess_trans_o.shader index 3a3d7927..45b4b88f 100644 --- a/Assets/External/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/External/lilToon/Shader/lts_tess_trans_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_twotrans.shader b/Assets/External/lilToon/Shader/lts_tess_twotrans.shader index eb4a0204..a58105a7 100644 --- a/Assets/External/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/External/lilToon/Shader/lts_tess_twotrans.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/External/lilToon/Shader/lts_tess_twotrans_o.shader index bd7a917a..74a86f34 100644 --- a/Assets/External/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/External/lilToon/Shader/lts_tess_twotrans_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTessellationTwoPassTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_trans.shader b/Assets/External/lilToon/Shader/lts_trans.shader index 5cffd9df..e73334c3 100644 --- a/Assets/External/lilToon/Shader/lts_trans.shader +++ b/Assets/External/lilToon/Shader/lts_trans.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_trans_o.shader b/Assets/External/lilToon/Shader/lts_trans_o.shader index 7fa507e9..7aaec6b2 100644 --- a/Assets/External/lilToon/Shader/lts_trans_o.shader +++ b/Assets/External/lilToon/Shader/lts_trans_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_trans_oo.shader b/Assets/External/lilToon/Shader/lts_trans_oo.shader index 84274610..53f2d9ce 100644 --- a/Assets/External/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/External/lilToon/Shader/lts_trans_oo.shader @@ -602,7 +602,7 @@ Shader "_lil/[Optional] lilToonOutlineOnlyTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_twotrans.shader b/Assets/External/lilToon/Shader/lts_twotrans.shader index aa4d7f3a..d3c90bb5 100644 --- a/Assets/External/lilToon/Shader/lts_twotrans.shader +++ b/Assets/External/lilToon/Shader/lts_twotrans.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTwoPassTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/lts_twotrans_o.shader b/Assets/External/lilToon/Shader/lts_twotrans_o.shader index 2c8bfb73..8a1f524f 100644 --- a/Assets/External/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/External/lilToon/Shader/lts_twotrans_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonTwoPassTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl.shader b/Assets/External/lilToon/Shader/ltsl.shader index 38e9ab22..c50a3bfb 100644 --- a/Assets/External/lilToon/Shader/ltsl.shader +++ b/Assets/External/lilToon/Shader/ltsl.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLite" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_cutout.shader b/Assets/External/lilToon/Shader/ltsl_cutout.shader index 2682a0b5..07914e5a 100644 --- a/Assets/External/lilToon/Shader/ltsl_cutout.shader +++ b/Assets/External/lilToon/Shader/ltsl_cutout.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteCutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_cutout_o.shader b/Assets/External/lilToon/Shader/ltsl_cutout_o.shader index abe13a1e..fc85201e 100644 --- a/Assets/External/lilToon/Shader/ltsl_cutout_o.shader +++ b/Assets/External/lilToon/Shader/ltsl_cutout_o.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteCutoutOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_o.shader b/Assets/External/lilToon/Shader/ltsl_o.shader index 9da3e583..2b500aa8 100644 --- a/Assets/External/lilToon/Shader/ltsl_o.shader +++ b/Assets/External/lilToon/Shader/ltsl_o.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_onetrans.shader b/Assets/External/lilToon/Shader/ltsl_onetrans.shader index 7a6cdab1..ad4c5f40 100644 --- a/Assets/External/lilToon/Shader/ltsl_onetrans.shader +++ b/Assets/External/lilToon/Shader/ltsl_onetrans.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteOnePassTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_onetrans_o.shader b/Assets/External/lilToon/Shader/ltsl_onetrans_o.shader index 347c3ab2..14e512f4 100644 --- a/Assets/External/lilToon/Shader/ltsl_onetrans_o.shader +++ b/Assets/External/lilToon/Shader/ltsl_onetrans_o.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteOnePassTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_overlay.shader b/Assets/External/lilToon/Shader/ltsl_overlay.shader index e224f217..2d16a4a6 100644 --- a/Assets/External/lilToon/Shader/ltsl_overlay.shader +++ b/Assets/External/lilToon/Shader/ltsl_overlay.shader @@ -87,7 +87,7 @@ Shader "_lil/[Optional] lilToonLiteOverlay" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_overlay_one.shader b/Assets/External/lilToon/Shader/ltsl_overlay_one.shader index 30aa6fa6..960bc3dd 100644 --- a/Assets/External/lilToon/Shader/ltsl_overlay_one.shader +++ b/Assets/External/lilToon/Shader/ltsl_overlay_one.shader @@ -87,7 +87,7 @@ Shader "_lil/[Optional] lilToonLiteOverlayOnePass" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_trans.shader b/Assets/External/lilToon/Shader/ltsl_trans.shader index 875b3b42..96743947 100644 --- a/Assets/External/lilToon/Shader/ltsl_trans.shader +++ b/Assets/External/lilToon/Shader/ltsl_trans.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_trans_o.shader b/Assets/External/lilToon/Shader/ltsl_trans_o.shader index 822b0ac0..bf25681a 100644 --- a/Assets/External/lilToon/Shader/ltsl_trans_o.shader +++ b/Assets/External/lilToon/Shader/ltsl_trans_o.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_twotrans.shader b/Assets/External/lilToon/Shader/ltsl_twotrans.shader index ab10d7d1..f4253a3d 100644 --- a/Assets/External/lilToon/Shader/ltsl_twotrans.shader +++ b/Assets/External/lilToon/Shader/ltsl_twotrans.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteTwoPassTransparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsl_twotrans_o.shader b/Assets/External/lilToon/Shader/ltsl_twotrans_o.shader index 25d50b7b..acc0633c 100644 --- a/Assets/External/lilToon/Shader/ltsl_twotrans_o.shader +++ b/Assets/External/lilToon/Shader/ltsl_twotrans_o.shader @@ -87,7 +87,7 @@ Shader "Hidden/lilToonLiteTwoPassTransparentOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsmulti.shader b/Assets/External/lilToon/Shader/ltsmulti.shader index 87d56892..162b03f1 100644 --- a/Assets/External/lilToon/Shader/ltsmulti.shader +++ b/Assets/External/lilToon/Shader/ltsmulti.shader @@ -602,7 +602,7 @@ Shader "_lil/lilToonMulti" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsmulti_fur.shader b/Assets/External/lilToon/Shader/ltsmulti_fur.shader index 984d6051..76026d83 100644 --- a/Assets/External/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/External/lilToon/Shader/ltsmulti_fur.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonMultiFur" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -652,9 +652,6 @@ Shader "Hidden/lilToonMultiFur" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("sLength+ (Cutout)", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/ltsmulti_gem.shader b/Assets/External/lilToon/Shader/ltsmulti_gem.shader index c6fa90ba..dfffcbed 100644 --- a/Assets/External/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/External/lilToon/Shader/ltsmulti_gem.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonMultiGem" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsmulti_o.shader b/Assets/External/lilToon/Shader/ltsmulti_o.shader index 23c860db..934f96ac 100644 --- a/Assets/External/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/External/lilToon/Shader/ltsmulti_o.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonMultiOutline" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltsmulti_ref.shader b/Assets/External/lilToon/Shader/ltsmulti_ref.shader index 5d8f9221..eb070307 100644 --- a/Assets/External/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/External/lilToon/Shader/ltsmulti_ref.shader @@ -602,7 +602,7 @@ Shader "Hidden/lilToonMultiRefraction" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_cutout.shader b/Assets/External/lilToon/Shader/ltspass_cutout.shader index a70b2fdc..958dde95 100644 --- a/Assets/External/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/External/lilToon/Shader/ltspass_cutout.shader @@ -602,7 +602,7 @@ Shader "Hidden/ltspass_cutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_lite_cutout.shader b/Assets/External/lilToon/Shader/ltspass_lite_cutout.shader index 221804bd..3984b9d2 100644 --- a/Assets/External/lilToon/Shader/ltspass_lite_cutout.shader +++ b/Assets/External/lilToon/Shader/ltspass_lite_cutout.shader @@ -87,7 +87,7 @@ Shader "Hidden/ltspass_lite_cutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_lite_opaque.shader b/Assets/External/lilToon/Shader/ltspass_lite_opaque.shader index 09180b30..ffcb105b 100644 --- a/Assets/External/lilToon/Shader/ltspass_lite_opaque.shader +++ b/Assets/External/lilToon/Shader/ltspass_lite_opaque.shader @@ -87,7 +87,7 @@ Shader "Hidden/ltspass_lite_opaque" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_lite_transparent.shader b/Assets/External/lilToon/Shader/ltspass_lite_transparent.shader index 2c79bb04..fcfcab9c 100644 --- a/Assets/External/lilToon/Shader/ltspass_lite_transparent.shader +++ b/Assets/External/lilToon/Shader/ltspass_lite_transparent.shader @@ -87,7 +87,7 @@ Shader "Hidden/ltspass_lite_transparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_opaque.shader b/Assets/External/lilToon/Shader/ltspass_opaque.shader index 31ece93a..1ac6c0cc 100644 --- a/Assets/External/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/External/lilToon/Shader/ltspass_opaque.shader @@ -602,7 +602,7 @@ Shader "Hidden/ltspass_opaque" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_proponly.shader b/Assets/External/lilToon/Shader/ltspass_proponly.shader index efacd251..0c908003 100644 --- a/Assets/External/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/External/lilToon/Shader/ltspass_proponly.shader @@ -597,7 +597,7 @@ Shader "Hidden/ltspass_proponly" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -693,9 +693,6 @@ Shader "Hidden/ltspass_proponly" _FurRootOffset ("sRootWidth", Range(-1,0)) = 0 _FurCutoutLength ("Cutout Length", Float) = 0.8 _FurTouchStrength ("sTouchStrength", Range(0, 1)) = 0 - _FurRimColor ("sColor", Color) = (0.0,0.0,0.0,1.0) - [PowerSlider(3.0)]_FurRimFresnelPower ("sFresnelPower", Range(0.01, 50)) = 3.0 - _FurRimAntiLight ("sAntiLight", Range(0, 1)) = 0.5 //---------------------------------------------------------------------------------------------------------------------- // Fur Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/External/lilToon/Shader/ltspass_tess_cutout.shader index 2eabd1d2..59326420 100644 --- a/Assets/External/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/External/lilToon/Shader/ltspass_tess_cutout.shader @@ -602,7 +602,7 @@ Shader "Hidden/ltspass_tess_cutout" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/External/lilToon/Shader/ltspass_tess_opaque.shader index 5004f6cc..f10bf103 100644 --- a/Assets/External/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/External/lilToon/Shader/ltspass_tess_opaque.shader @@ -602,7 +602,7 @@ Shader "Hidden/ltspass_tess_opaque" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/External/lilToon/Shader/ltspass_tess_transparent.shader index 5400fa81..efdcfe84 100644 --- a/Assets/External/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/External/lilToon/Shader/ltspass_tess_transparent.shader @@ -602,7 +602,7 @@ Shader "Hidden/ltspass_tess_transparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Shader/ltspass_transparent.shader b/Assets/External/lilToon/Shader/ltspass_transparent.shader index f4889dac..554e649d 100644 --- a/Assets/External/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/External/lilToon/Shader/ltspass_transparent.shader @@ -602,7 +602,7 @@ Shader "Hidden/ltspass_transparent" [HideInInspector] _BaseColor ("sColor", Color) = (1,1,1,1) [HideInInspector] _BaseMap ("Texture", 2D) = "white" {} [HideInInspector] _BaseColorMap ("Texture", 2D) = "white" {} - [HideInInspector] _lilToonVersion ("Version", Int) = 45 + [HideInInspector] _lilToonVersion ("Version", Int) = 43 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/External/lilToon/Third Party Notices.md b/Assets/External/lilToon/Third Party Notices.md index a341019a..a71c0fb0 100644 --- a/Assets/External/lilToon/Third Party Notices.md +++ b/Assets/External/lilToon/Third Party Notices.md @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce73439f12bd1e95d6413f49979b2cffa5b5dfbc9be5997fc73c60405e63a031 -size 8995 +oid sha256:912485cf758464a058f82b8ca993383d143ad3ee8257c1c7a64b009368f2953d +size 9186 diff --git a/Assets/External/lilToon/package.json b/Assets/External/lilToon/package.json index 2969fcef..e771b6b2 100644 --- a/Assets/External/lilToon/package.json +++ b/Assets/External/lilToon/package.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56d79ab77710c9a87f72df77c6464408fe634b2819969c0a7e22223ad9bfe7c7 -size 694 +oid sha256:67a10c51bad9857f79657d81a07244bb0d0c6299f8a452e7e8f4039132b01a31 +size 711