From 781d9f7b7e712d4b0418737d9cf720e823b74f5f Mon Sep 17 00:00:00 2001 From: bd_ Date: Sun, 10 Dec 2023 12:54:05 +0900 Subject: [PATCH 01/13] Add a material property to force enable the IDMask system The IDMask system is currently enabled by setting any of the mask bits to on; however, depending on how your animations are structured, you might want them all initially off. This change adds a dedicated material property which simply force-enables the IDMask feature. --- .../CustomShaderResources/Properties/Default.lilblock | 6 ++++++ .../CustomShaderResources/Properties/DefaultAll.lilblock | 1 + Assets/lilToon/Editor/lilInspector.cs | 3 +++ Assets/lilToon/Editor/lilToonSetting.cs | 3 ++- Assets/lilToon/Shader/lts.shader | 5 +++++ Assets/lilToon/Shader/lts_cutout.shader | 5 +++++ Assets/lilToon/Shader/lts_cutout_o.shader | 5 +++++ Assets/lilToon/Shader/lts_cutout_oo.shader | 5 +++++ Assets/lilToon/Shader/lts_fur.shader | 5 +++++ Assets/lilToon/Shader/lts_fur_cutout.shader | 5 +++++ Assets/lilToon/Shader/lts_fur_two.shader | 5 +++++ Assets/lilToon/Shader/lts_furonly.shader | 5 +++++ Assets/lilToon/Shader/lts_furonly_cutout.shader | 5 +++++ Assets/lilToon/Shader/lts_furonly_two.shader | 5 +++++ Assets/lilToon/Shader/lts_gem.shader | 5 +++++ Assets/lilToon/Shader/lts_o.shader | 5 +++++ Assets/lilToon/Shader/lts_onetrans.shader | 5 +++++ Assets/lilToon/Shader/lts_onetrans_o.shader | 5 +++++ Assets/lilToon/Shader/lts_oo.shader | 5 +++++ Assets/lilToon/Shader/lts_overlay.shader | 5 +++++ Assets/lilToon/Shader/lts_overlay_one.shader | 5 +++++ Assets/lilToon/Shader/lts_ref.shader | 5 +++++ Assets/lilToon/Shader/lts_ref_blur.shader | 5 +++++ Assets/lilToon/Shader/lts_tess.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_cutout.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_cutout_o.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_o.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_onetrans.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_onetrans_o.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_trans.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_trans_o.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_twotrans.shader | 5 +++++ Assets/lilToon/Shader/lts_tess_twotrans_o.shader | 5 +++++ Assets/lilToon/Shader/lts_trans.shader | 5 +++++ Assets/lilToon/Shader/lts_trans_o.shader | 5 +++++ Assets/lilToon/Shader/lts_trans_oo.shader | 5 +++++ Assets/lilToon/Shader/lts_twotrans.shader | 5 +++++ Assets/lilToon/Shader/lts_twotrans_o.shader | 5 +++++ Assets/lilToon/Shader/ltsmulti.shader | 5 +++++ Assets/lilToon/Shader/ltsmulti_fur.shader | 5 +++++ Assets/lilToon/Shader/ltsmulti_gem.shader | 5 +++++ Assets/lilToon/Shader/ltsmulti_o.shader | 5 +++++ Assets/lilToon/Shader/ltsmulti_ref.shader | 5 +++++ Assets/lilToon/Shader/ltspass_cutout.shader | 5 +++++ Assets/lilToon/Shader/ltspass_opaque.shader | 5 +++++ Assets/lilToon/Shader/ltspass_proponly.shader | 1 + Assets/lilToon/Shader/ltspass_tess_cutout.shader | 5 +++++ Assets/lilToon/Shader/ltspass_tess_opaque.shader | 5 +++++ Assets/lilToon/Shader/ltspass_tess_transparent.shader | 5 +++++ Assets/lilToon/Shader/ltspass_transparent.shader | 5 +++++ 50 files changed, 238 insertions(+), 1 deletion(-) diff --git a/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock b/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock index 5e5b7e15..422bc39a 100644 --- a/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock +++ b/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock @@ -441,6 +441,12 @@ //---------------------------------------------------------------------------------------------------------------------- // ID Mask + + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock b/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock index 18baae4b..f170c56c 100644 --- a/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock +++ b/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock @@ -441,6 +441,7 @@ //---------------------------------------------------------------------------------------------------------------------- // ID Mask + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Editor/lilInspector.cs b/Assets/lilToon/Editor/lilInspector.cs index c3b2ee31..e25e78f7 100644 --- a/Assets/lilToon/Editor/lilInspector.cs +++ b/Assets/lilToon/Editor/lilInspector.cs @@ -698,6 +698,7 @@ public struct PropertyBlockData private readonly lilMaterialProperty dissolveParams = new lilMaterialProperty("_DissolveParams", PropertyBlock.Dissolve); private readonly lilMaterialProperty dissolvePos = new lilMaterialProperty("_DissolvePos", PropertyBlock.Dissolve); + private readonly lilMaterialProperty idMaskCompile = new lilMaterialProperty("_IDMaskCompile", PropertyBlock.IDMask); private readonly lilMaterialProperty idMaskFrom = new lilMaterialProperty("_IDMaskFrom", PropertyBlock.IDMask); private readonly lilMaterialProperty idMask1 = new lilMaterialProperty("_IDMask1", PropertyBlock.IDMask); private readonly lilMaterialProperty idMask2 = new lilMaterialProperty("_IDMask2", PropertyBlock.IDMask); @@ -1306,6 +1307,7 @@ private lilMaterialProperty[] AllProperties() dissolveParams, dissolvePos, + idMaskCompile, idMaskFrom, idMaskIsBitmap, idMask1, @@ -3079,6 +3081,7 @@ private void DrawAdvancedGUI(Material material) EditorGUILayout.BeginVertical(boxInnerHalf); EditorGUILayout.HelpBox("It is recommended that these properties be set from scripts.", MessageType.Warning); EditorGUILayout.HelpBox("If you want to mask vertex ids 1000 to 1999, set:\r\n_IDMask1 = 1\r\n_IDMaskIndex1 = 1000\r\n_IDMaskIndex2 = 2000", MessageType.Info); + LocalizedProperty(idMaskCompile); LocalizedProperty(idMaskFrom); LocalizedProperty(idMaskIsBitmap); diff --git a/Assets/lilToon/Editor/lilToonSetting.cs b/Assets/lilToon/Editor/lilToonSetting.cs index 85c6d6de..4d930270 100644 --- a/Assets/lilToon/Editor/lilToonSetting.cs +++ b/Assets/lilToon/Editor/lilToonSetting.cs @@ -1119,7 +1119,8 @@ internal static void SetupShaderSettingFromMaterial(Material material, ref lilTo material.HasProperty("_IDMask6") && material.GetFloat("_IDMask6") != 0.0f || material.HasProperty("_IDMask7") && material.GetFloat("_IDMask7") != 0.0f || material.HasProperty("_IDMask8") && material.GetFloat("_IDMask8") != 0.0f || - material.HasProperty("_IDMaskIsBitmap") && material.GetFloat("_IDMaskIsBitmap") != 0.0f + material.HasProperty("_IDMaskIsBitmap") && material.GetFloat("_IDMaskIsBitmap") != 0.0f || + material.HasProperty("_IDMaskCompile") && material.GetFloat("_IDMaskCompile") != 0.0f )) { Debug.Log("[lilToon] LIL_FEATURE_IDMASK : " + AssetDatabase.GetAssetPath(material)); diff --git a/Assets/lilToon/Shader/lts.shader b/Assets/lilToon/Shader/lts.shader index 59665b67..b69d239a 100644 --- a/Assets/lilToon/Shader/lts.shader +++ b/Assets/lilToon/Shader/lts.shader @@ -445,6 +445,11 @@ Shader "lilToon" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_cutout.shader b/Assets/lilToon/Shader/lts_cutout.shader index 8200eb73..eb16b8c5 100644 --- a/Assets/lilToon/Shader/lts_cutout.shader +++ b/Assets/lilToon/Shader/lts_cutout.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonCutout" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_cutout_o.shader b/Assets/lilToon/Shader/lts_cutout_o.shader index e197738b..8b9dc22b 100644 --- a/Assets/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_cutout_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonCutoutOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_cutout_oo.shader b/Assets/lilToon/Shader/lts_cutout_oo.shader index 2acd8728..dac9406a 100644 --- a/Assets/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/lilToon/Shader/lts_cutout_oo.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_fur.shader b/Assets/lilToon/Shader/lts_fur.shader index 01f6f0ac..286a2ce3 100644 --- a/Assets/lilToon/Shader/lts_fur.shader +++ b/Assets/lilToon/Shader/lts_fur.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonFur" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_fur_cutout.shader b/Assets/lilToon/Shader/lts_fur_cutout.shader index 9f032e60..8c751a43 100644 --- a/Assets/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/lilToon/Shader/lts_fur_cutout.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonFurCutout" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_fur_two.shader b/Assets/lilToon/Shader/lts_fur_two.shader index af560d17..a4bfe760 100644 --- a/Assets/lilToon/Shader/lts_fur_two.shader +++ b/Assets/lilToon/Shader/lts_fur_two.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonFurTwoPass" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_furonly.shader b/Assets/lilToon/Shader/lts_furonly.shader index 27966f33..3a9607a3 100644 --- a/Assets/lilToon/Shader/lts_furonly.shader +++ b/Assets/lilToon/Shader/lts_furonly.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_furonly_cutout.shader b/Assets/lilToon/Shader/lts_furonly_cutout.shader index 65970b4d..069f407b 100644 --- a/Assets/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/lilToon/Shader/lts_furonly_cutout.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_furonly_two.shader b/Assets/lilToon/Shader/lts_furonly_two.shader index 4a0eac58..2a273720 100644 --- a/Assets/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/lilToon/Shader/lts_furonly_two.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_gem.shader b/Assets/lilToon/Shader/lts_gem.shader index 39aca3c6..beb759ee 100644 --- a/Assets/lilToon/Shader/lts_gem.shader +++ b/Assets/lilToon/Shader/lts_gem.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonGem" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_o.shader b/Assets/lilToon/Shader/lts_o.shader index 3785dd93..66c53513 100644 --- a/Assets/lilToon/Shader/lts_o.shader +++ b/Assets/lilToon/Shader/lts_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_onetrans.shader b/Assets/lilToon/Shader/lts_onetrans.shader index c7eafff6..19fcf536 100644 --- a/Assets/lilToon/Shader/lts_onetrans.shader +++ b/Assets/lilToon/Shader/lts_onetrans.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonOnePassTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_onetrans_o.shader b/Assets/lilToon/Shader/lts_onetrans_o.shader index 6188aa16..435d695a 100644 --- a/Assets/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_onetrans_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonOnePassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_oo.shader b/Assets/lilToon/Shader/lts_oo.shader index 4939966a..ef248952 100644 --- a/Assets/lilToon/Shader/lts_oo.shader +++ b/Assets/lilToon/Shader/lts_oo.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonOutlineOnly" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_overlay.shader b/Assets/lilToon/Shader/lts_overlay.shader index 81e83d70..45edde25 100644 --- a/Assets/lilToon/Shader/lts_overlay.shader +++ b/Assets/lilToon/Shader/lts_overlay.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonOverlay" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_overlay_one.shader b/Assets/lilToon/Shader/lts_overlay_one.shader index 060f4855..6d9bc71d 100644 --- a/Assets/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/lilToon/Shader/lts_overlay_one.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonOverlayOnePass" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_ref.shader b/Assets/lilToon/Shader/lts_ref.shader index 403e80f9..b7f81cbf 100644 --- a/Assets/lilToon/Shader/lts_ref.shader +++ b/Assets/lilToon/Shader/lts_ref.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonRefraction" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_ref_blur.shader b/Assets/lilToon/Shader/lts_ref_blur.shader index ebe6175a..1c816d36 100644 --- a/Assets/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/lilToon/Shader/lts_ref_blur.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonRefractionBlur" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess.shader b/Assets/lilToon/Shader/lts_tess.shader index f29f96f5..319600b7 100644 --- a/Assets/lilToon/Shader/lts_tess.shader +++ b/Assets/lilToon/Shader/lts_tess.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellation" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_cutout.shader b/Assets/lilToon/Shader/lts_tess_cutout.shader index 135a330d..e3d7e288 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationCutout" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/lilToon/Shader/lts_tess_cutout_o.shader index 18712fc3..92b1466c 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationCutoutOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_o.shader b/Assets/lilToon/Shader/lts_tess_o.shader index 7a9a84b9..374838c3 100644 --- a/Assets/lilToon/Shader/lts_tess_o.shader +++ b/Assets/lilToon/Shader/lts_tess_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_onetrans.shader b/Assets/lilToon/Shader/lts_tess_onetrans.shader index 02a8a9c6..344c86b1 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationOnePassTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader index 4c3db47b..edf17f7f 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_trans.shader b/Assets/lilToon/Shader/lts_tess_trans.shader index 9d55d30f..efdb3589 100644 --- a/Assets/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/lilToon/Shader/lts_tess_trans.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_trans_o.shader b/Assets/lilToon/Shader/lts_tess_trans_o.shader index 7d4f2e42..f5d5acb5 100644 --- a/Assets/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_trans_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_twotrans.shader b/Assets/lilToon/Shader/lts_tess_twotrans.shader index 6fe3c9eb..b372a8e9 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader index 675ba8b9..36525e9f 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTessellationTwoPassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_trans.shader b/Assets/lilToon/Shader/lts_trans.shader index 2d4d2b7b..aa1be4b6 100644 --- a/Assets/lilToon/Shader/lts_trans.shader +++ b/Assets/lilToon/Shader/lts_trans.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_trans_o.shader b/Assets/lilToon/Shader/lts_trans_o.shader index 1f4eefb4..13c33627 100644 --- a/Assets/lilToon/Shader/lts_trans_o.shader +++ b/Assets/lilToon/Shader/lts_trans_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_trans_oo.shader b/Assets/lilToon/Shader/lts_trans_oo.shader index f4d63f2d..8b766103 100644 --- a/Assets/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/lilToon/Shader/lts_trans_oo.shader @@ -445,6 +445,11 @@ Shader "_lil/[Optional] lilToonOutlineOnlyTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_twotrans.shader b/Assets/lilToon/Shader/lts_twotrans.shader index 944138b6..02445b8c 100644 --- a/Assets/lilToon/Shader/lts_twotrans.shader +++ b/Assets/lilToon/Shader/lts_twotrans.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTwoPassTransparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_twotrans_o.shader b/Assets/lilToon/Shader/lts_twotrans_o.shader index 7987e68b..0c7586f0 100644 --- a/Assets/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_twotrans_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonTwoPassTransparentOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltsmulti.shader b/Assets/lilToon/Shader/ltsmulti.shader index f8a1b42e..67cbabb4 100644 --- a/Assets/lilToon/Shader/ltsmulti.shader +++ b/Assets/lilToon/Shader/ltsmulti.shader @@ -445,6 +445,11 @@ Shader "_lil/lilToonMulti" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltsmulti_fur.shader b/Assets/lilToon/Shader/ltsmulti_fur.shader index 3a6f9560..c1e55c9b 100644 --- a/Assets/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/lilToon/Shader/ltsmulti_fur.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonMultiFur" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltsmulti_gem.shader b/Assets/lilToon/Shader/ltsmulti_gem.shader index 9c83bf70..5485c46c 100644 --- a/Assets/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/lilToon/Shader/ltsmulti_gem.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonMultiGem" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltsmulti_o.shader b/Assets/lilToon/Shader/ltsmulti_o.shader index e2ce75a3..b0720518 100644 --- a/Assets/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/lilToon/Shader/ltsmulti_o.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonMultiOutline" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltsmulti_ref.shader b/Assets/lilToon/Shader/ltsmulti_ref.shader index ff52a5ef..09289fa9 100644 --- a/Assets/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/lilToon/Shader/ltsmulti_ref.shader @@ -445,6 +445,11 @@ Shader "Hidden/lilToonMultiRefraction" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_cutout.shader b/Assets/lilToon/Shader/ltspass_cutout.shader index 3a309a5f..88caafb8 100644 --- a/Assets/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_cutout.shader @@ -445,6 +445,11 @@ Shader "Hidden/ltspass_cutout" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_opaque.shader b/Assets/lilToon/Shader/ltspass_opaque.shader index 73f5deca..ac76ed08 100644 --- a/Assets/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_opaque.shader @@ -445,6 +445,11 @@ Shader "Hidden/ltspass_opaque" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_proponly.shader b/Assets/lilToon/Shader/ltspass_proponly.shader index 58d63f68..82c0a162 100644 --- a/Assets/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/lilToon/Shader/ltspass_proponly.shader @@ -445,6 +445,7 @@ Shader "Hidden/ltspass_proponly" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/lilToon/Shader/ltspass_tess_cutout.shader index 37cb6dd3..3b89ecdf 100644 --- a/Assets/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_tess_cutout.shader @@ -445,6 +445,11 @@ Shader "Hidden/ltspass_tess_cutout" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/lilToon/Shader/ltspass_tess_opaque.shader index 5f17d7b4..ef3ffb32 100644 --- a/Assets/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_tess_opaque.shader @@ -445,6 +445,11 @@ Shader "Hidden/ltspass_tess_opaque" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/lilToon/Shader/ltspass_tess_transparent.shader index ecd24041..0ed89636 100644 --- a/Assets/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_tess_transparent.shader @@ -445,6 +445,11 @@ Shader "Hidden/ltspass_tess_transparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_transparent.shader b/Assets/lilToon/Shader/ltspass_transparent.shader index ba60e53c..c33a7488 100644 --- a/Assets/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_transparent.shader @@ -445,6 +445,11 @@ Shader "Hidden/ltspass_transparent" //---------------------------------------------------------------------------------------------------------------------- // ID Mask + // _IDMaskCompile will enable compilation of IDMask-related systems. For compatibility, setting certain + // parameters to non-zero values will also enable the IDMask feature, but this enable switch ensures that + // animator-controlled IDMasked meshes will be compiled correctly. Note that this _only_ controls compilation, + // and is ignored at runtime. + [ToggleUI] _IDMaskCompile ("_IDMaskCompile", Int) = 0 [lilEnum] _IDMaskFrom ("_IDMaskFrom|0: UV0|1: UV1|2: UV2|3: UV3|4: UV4|5: UV5|6: UV6|7: UV7|8: VertexID", Int) = 8 [ToggleUI] _IDMask1 ("_IDMask1", Int) = 0 [ToggleUI] _IDMask2 ("_IDMask2", Int) = 0 From c89d46c812b4b288683159aebc8eeaf3034a3a3a Mon Sep 17 00:00:00 2001 From: bd_ Date: Tue, 12 Dec 2023 13:59:20 +0900 Subject: [PATCH 02/13] fix: liltoon optimization breaks when _IDMaskIsBitmap is constant --- Assets/lilToon/Shader/Includes/lil_common_vert.hlsl | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/lilToon/Shader/Includes/lil_common_vert.hlsl b/Assets/lilToon/Shader/Includes/lil_common_vert.hlsl index b232c8d1..239eca29 100644 --- a/Assets/lilToon/Shader/Includes/lil_common_vert.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_common_vert.hlsl @@ -396,7 +396,6 @@ LIL_V2F_TYPE vert(appdata input) #endif default: idMaskArg = input.vertexID; break; } - _IDMaskIsBitmap = round(_IDMaskIsBitmap); bool idMasked = IDMask(idMaskArg,_IDMaskIsBitmap,idMaskIndices,idMaskFlags); if(_IDMaskControlsDissolve) { From a905992179976438df4d377a7450d3f8579bb9ea Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Tue, 12 Dec 2023 17:56:14 +0900 Subject: [PATCH 03/13] fix: Workaround for editor crash #142 --- Assets/lilToon/Editor/lilToonSetting.cs | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Assets/lilToon/Editor/lilToonSetting.cs b/Assets/lilToon/Editor/lilToonSetting.cs index 4d930270..43dfac5a 100644 --- a/Assets/lilToon/Editor/lilToonSetting.cs +++ b/Assets/lilToon/Editor/lilToonSetting.cs @@ -800,9 +800,33 @@ internal static void GetOptimizedSetting(Material[] materials, AnimationClip[] c shaderSettingText = BuildShaderSettingString(shaderSetting, false); } + #if UNITY_2022_1_OR_NEWER || (UNITY_2023_1_OR_NEWER && !UNITY_2023_2_OR_NEWER) + private static bool WorkaroundForUsePassBug() + { + // Normally, there is no problem if you update Unity. + // This workaround exists for unusual cases. + // https://issuetracker.unity3d.com/issues/crash-on-malloc-internal-when-recompiling-a-shadergraph-used-by-another-shader-via-usepass + var regex = new Regex(@"(\d*)\.(\d*)\.(\d*)"); + var match = regex.Match(Application.unityVersion); + + if(!match.Success) return true; + var major = int.Parse(match.Groups[1].Value); + var minor = int.Parse(match.Groups[2].Value); + var patch = int.Parse(match.Groups[3].Value); + + if(major == 2022 && (minor < 3 || patch < 14)) return true; + if(major == 2023 && patch < 20) return true; + + return false; + } + #endif + internal static void SetShaderSettingBeforeBuild(Material[] materials, AnimationClip[] clips) { #if !LILTOON_DISABLE_OPTIMIZATION + #if UNITY_2022_1_OR_NEWER || (UNITY_2023_1_OR_NEWER && !UNITY_2023_2_OR_NEWER) + if(WorkaroundForUsePassBug()){ Debug.Log("[lilToon] Skip Optimization"); return; } + #endif try { if(!ShouldOptimization()) return; @@ -844,6 +868,9 @@ internal static void SetShaderSettingBeforeBuild(Material[] materials, Animation internal static void SetShaderSettingBeforeBuild() { #if !LILTOON_DISABLE_OPTIMIZATION + #if UNITY_2022_1_OR_NEWER || (UNITY_2023_1_OR_NEWER && !UNITY_2023_2_OR_NEWER) + if(WorkaroundForUsePassBug()){ Debug.Log("[lilToon] Skip Optimization"); return; } + #endif try { if(!ShouldOptimization()) return; From 5e73ff831423d9c0bd12bea73d5e178543d2ce2d Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Tue, 12 Dec 2023 14:37:03 +0100 Subject: [PATCH 04/13] add missing reference to Regex --- Assets/lilToon/Editor/lilToonSetting.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/lilToon/Editor/lilToonSetting.cs b/Assets/lilToon/Editor/lilToonSetting.cs index 43dfac5a..47c1f882 100644 --- a/Assets/lilToon/Editor/lilToonSetting.cs +++ b/Assets/lilToon/Editor/lilToonSetting.cs @@ -12,6 +12,7 @@ using System.IO; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using UnityEditor; using UnityEngine; From e37ec1e7ed195d1c045cdaa075317750c866abeb Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 24 Dec 2023 00:46:46 +0900 Subject: [PATCH 05/13] chore: Change migration timing --- Assets/lilToon/Editor/lilInspector.cs | 1 - Assets/lilToon/Editor/lilStartup.cs | 13 +++++------ .../Editor/lilToonAssetPostprocessor.cs | 22 ++++++++++++++++++- Assets/lilToon/Editor/lilToonSetting.cs | 7 +++++- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/Assets/lilToon/Editor/lilInspector.cs b/Assets/lilToon/Editor/lilInspector.cs index e25e78f7..5c34658e 100644 --- a/Assets/lilToon/Editor/lilInspector.cs +++ b/Assets/lilToon/Editor/lilInspector.cs @@ -111,7 +111,6 @@ protected virtual void DrawCustomProperties(Material material) public class lilToonEditorSetting : ScriptableSingleton { public EditorMode editorMode = EditorMode.Simple; - public int currentVersionValue = 0; public bool isShowBase = false; public bool isShowPrePreset = false; public bool isShowMainUV = false; diff --git a/Assets/lilToon/Editor/lilStartup.cs b/Assets/lilToon/Editor/lilStartup.cs index 0af0b74d..a6ea17f0 100644 --- a/Assets/lilToon/Editor/lilStartup.cs +++ b/Assets/lilToon/Editor/lilStartup.cs @@ -69,6 +69,8 @@ public static void lilStartupMethod() //------------------------------------------------------------------------------------------------------------------------------ // Shader setting + lilToonSetting shaderSetting = null; + lilToonSetting.InitializeShaderSetting(ref shaderSetting); string currentRPPath = lilDirectoryManager.GetCurrentRPPath(); if(File.Exists(currentRPPath)) { @@ -99,8 +101,6 @@ public static void lilStartupMethod() swRP.Close(); if(shouldRewrite) { - lilToonSetting shaderSetting = null; - lilToonSetting.InitializeShaderSetting(ref shaderSetting); if(shaderSetting.isDebugOptimize) { lilToonSetting.ApplyShaderSettingOptimized(); @@ -128,13 +128,12 @@ public static void lilStartupMethod() //------------------------------------------------------------------------------------------------------------------------------ // Update - if(lilToonInspector.edSet.currentVersionValue != lilConstants.currentVersionValue) + if(shaderSetting.previousVersion != lilConstants.currentVersionValue) { // Migrate Materials - lilToonSetting shaderSetting = null; - lilToonSetting.InitializeShaderSetting(ref shaderSetting); if(shaderSetting.isMigrateInStartUp) EditorApplication.delayCall += MigrateMaterials; - lilToonInspector.edSet.currentVersionValue = lilConstants.currentVersionValue; + shaderSetting.previousVersion = lilConstants.currentVersionValue; + lilToonSetting.SaveShaderSetting(shaderSetting); #if UNITY_2019_4_OR_NEWER // Update custom shaders @@ -196,7 +195,7 @@ internal static void MigrateMaterials() AssetDatabase.Refresh(); } - private static void MigrateMaterial(Material material, int id) + internal static void MigrateMaterial(Material material, int id) { if(!lilMaterialUtils.CheckShaderIslilToon(material)) return; int version = 0; diff --git a/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs b/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs index 5f282702..87ed15b8 100644 --- a/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs +++ b/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs @@ -1 +1,21 @@ - \ No newline at end of file +#if UNITY_EDITOR +using UnityEngine; +using UnityEditor; + +namespace lilToon +{ + internal class lilToonAssetPostprocessor : AssetPostprocessor + { + static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths, bool didDomainReload) + { + var id = Shader.PropertyToID("_lilToonVersion"); + foreach(var path in importedAssets) + { + if(!path.EndsWith(".mat")) continue; + var material = AssetDatabase.LoadAssetAtPath(path); + lilStartup.MigrateMaterial(material, id); + } + } + } +} +#endif diff --git a/Assets/lilToon/Editor/lilToonSetting.cs b/Assets/lilToon/Editor/lilToonSetting.cs index 47c1f882..842bd322 100644 --- a/Assets/lilToon/Editor/lilToonSetting.cs +++ b/Assets/lilToon/Editor/lilToonSetting.cs @@ -12,9 +12,11 @@ using System.IO; using System.Linq; using System.Text; -using System.Text.RegularExpressions; using UnityEditor; using UnityEngine; +#if UNITY_2022_1_OR_NEWER || (UNITY_2023_1_OR_NEWER && !UNITY_2023_2_OR_NEWER) + using System.Text.RegularExpressions; +#endif public class lilToonSetting : ScriptableObject { @@ -150,6 +152,9 @@ public class lilToonSetting : ScriptableObject public lilToonPreset presetHair; public lilToonPreset presetCloth; + // This is not a shader setting, but the version number is stored here for material migration. + public int previousVersion = 0; + // Lock internal static void SaveLockedSetting(lilToonSetting shaderSetting) { From d3ec183e2dc3c77fbafd9923b7df1fc3a6639df4 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 24 Dec 2023 00:49:03 +0900 Subject: [PATCH 06/13] chore: update version value --- Assets/lilToon/Editor/lilConstants.cs | 4 ++-- Assets/lilToon/README.md | 2 +- Assets/lilToon/README_JP.md | 2 +- Assets/lilToon/Shader/lts.shader | 2 +- Assets/lilToon/Shader/lts_cutout.shader | 2 +- Assets/lilToon/Shader/lts_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_cutout_oo.shader | 2 +- Assets/lilToon/Shader/lts_fakeshadow.shader | 2 +- Assets/lilToon/Shader/lts_fur.shader | 2 +- Assets/lilToon/Shader/lts_fur_cutout.shader | 2 +- Assets/lilToon/Shader/lts_fur_two.shader | 2 +- Assets/lilToon/Shader/lts_furonly.shader | 2 +- Assets/lilToon/Shader/lts_furonly_cutout.shader | 2 +- Assets/lilToon/Shader/lts_furonly_two.shader | 2 +- Assets/lilToon/Shader/lts_gem.shader | 2 +- Assets/lilToon/Shader/lts_o.shader | 2 +- Assets/lilToon/Shader/lts_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_oo.shader | 2 +- Assets/lilToon/Shader/lts_overlay.shader | 2 +- Assets/lilToon/Shader/lts_overlay_one.shader | 2 +- Assets/lilToon/Shader/lts_ref.shader | 2 +- Assets/lilToon/Shader/lts_ref_blur.shader | 2 +- Assets/lilToon/Shader/lts_tess.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans.shader | 2 +- Assets/lilToon/Shader/lts_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans_oo.shader | 2 +- Assets/lilToon/Shader/lts_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_twotrans_o.shader | 2 +- Assets/lilToon/Shader/ltsl.shader | 2 +- Assets/lilToon/Shader/ltsl_cutout.shader | 2 +- Assets/lilToon/Shader/ltsl_cutout_o.shader | 2 +- Assets/lilToon/Shader/ltsl_o.shader | 2 +- Assets/lilToon/Shader/ltsl_onetrans.shader | 2 +- Assets/lilToon/Shader/ltsl_onetrans_o.shader | 2 +- Assets/lilToon/Shader/ltsl_overlay.shader | 2 +- Assets/lilToon/Shader/ltsl_overlay_one.shader | 2 +- Assets/lilToon/Shader/ltsl_trans.shader | 2 +- Assets/lilToon/Shader/ltsl_trans_o.shader | 2 +- Assets/lilToon/Shader/ltsl_twotrans.shader | 2 +- Assets/lilToon/Shader/ltsl_twotrans_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti.shader | 2 +- Assets/lilToon/Shader/ltsmulti_fur.shader | 2 +- Assets/lilToon/Shader/ltsmulti_gem.shader | 2 +- Assets/lilToon/Shader/ltsmulti_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti_ref.shader | 2 +- Assets/lilToon/Shader/ltspass_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_transparent.shader | 2 +- Assets/lilToon/Shader/ltspass_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_proponly.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_transparent.shader | 2 +- Assets/lilToon/Shader/ltspass_transparent.shader | 2 +- Assets/lilToon/package.json | 4 ++-- version.json | 2 +- 67 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Assets/lilToon/Editor/lilConstants.cs b/Assets/lilToon/Editor/lilConstants.cs index 3f7803a5..61b7036a 100644 --- a/Assets/lilToon/Editor/lilConstants.cs +++ b/Assets/lilToon/Editor/lilConstants.cs @@ -6,8 +6,8 @@ namespace lilToon { public class lilConstants { - public const string currentVersionName = "1.5.0"; - public const int currentVersionValue = 36; + public const string currentVersionName = "1.5.1"; + public const int currentVersionValue = 37; internal const string boothURL = "https://lilxyzw.booth.pm/"; internal const string githubURL = "https://github.com/lilxyzw/lilToon"; diff --git a/Assets/lilToon/README.md b/Assets/lilToon/README.md index 38da29a1..f2eb7636 100644 --- a/Assets/lilToon/README.md +++ b/Assets/lilToon/README.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.0 +Version 1.5.1 # Overview This shader is developed for services using avatars (VRChat, etc.) and has the following features. diff --git a/Assets/lilToon/README_JP.md b/Assets/lilToon/README_JP.md index 654e946c..ae15744e 100644 --- a/Assets/lilToon/README_JP.md +++ b/Assets/lilToon/README_JP.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.0 +Version 1.5.1 # 概要 アバターを用いたサービス(VRChat等)向けに開発したシェーダーで以下のような特徴があります。 diff --git a/Assets/lilToon/Shader/lts.shader b/Assets/lilToon/Shader/lts.shader index b69d239a..e89f117a 100644 --- a/Assets/lilToon/Shader/lts.shader +++ b/Assets/lilToon/Shader/lts.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout.shader b/Assets/lilToon/Shader/lts_cutout.shader index eb16b8c5..c1dd1216 100644 --- a/Assets/lilToon/Shader/lts_cutout.shader +++ b/Assets/lilToon/Shader/lts_cutout.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout_o.shader b/Assets/lilToon/Shader/lts_cutout_o.shader index 8b9dc22b..ec8088c9 100644 --- a/Assets/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_cutout_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout_oo.shader b/Assets/lilToon/Shader/lts_cutout_oo.shader index dac9406a..4e29bafe 100644 --- a/Assets/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/lilToon/Shader/lts_cutout_oo.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fakeshadow.shader b/Assets/lilToon/Shader/lts_fakeshadow.shader index 6e150aec..96d72df3 100644 --- a/Assets/lilToon/Shader/lts_fakeshadow.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 } SubShader diff --git a/Assets/lilToon/Shader/lts_fur.shader b/Assets/lilToon/Shader/lts_fur.shader index 286a2ce3..89487685 100644 --- a/Assets/lilToon/Shader/lts_fur.shader +++ b/Assets/lilToon/Shader/lts_fur.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_cutout.shader b/Assets/lilToon/Shader/lts_fur_cutout.shader index 8c751a43..8ef6828e 100644 --- a/Assets/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/lilToon/Shader/lts_fur_cutout.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_two.shader b/Assets/lilToon/Shader/lts_fur_two.shader index a4bfe760..8d6007fb 100644 --- a/Assets/lilToon/Shader/lts_fur_two.shader +++ b/Assets/lilToon/Shader/lts_fur_two.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly.shader b/Assets/lilToon/Shader/lts_furonly.shader index 3a9607a3..9130fec9 100644 --- a/Assets/lilToon/Shader/lts_furonly.shader +++ b/Assets/lilToon/Shader/lts_furonly.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly_cutout.shader b/Assets/lilToon/Shader/lts_furonly_cutout.shader index 069f407b..bd87cd63 100644 --- a/Assets/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/lilToon/Shader/lts_furonly_cutout.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly_two.shader b/Assets/lilToon/Shader/lts_furonly_two.shader index 2a273720..01743b6e 100644 --- a/Assets/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/lilToon/Shader/lts_furonly_two.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_gem.shader b/Assets/lilToon/Shader/lts_gem.shader index beb759ee..28fe900d 100644 --- a/Assets/lilToon/Shader/lts_gem.shader +++ b/Assets/lilToon/Shader/lts_gem.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_o.shader b/Assets/lilToon/Shader/lts_o.shader index 66c53513..6e503b80 100644 --- a/Assets/lilToon/Shader/lts_o.shader +++ b/Assets/lilToon/Shader/lts_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_onetrans.shader b/Assets/lilToon/Shader/lts_onetrans.shader index 19fcf536..eb95d196 100644 --- a/Assets/lilToon/Shader/lts_onetrans.shader +++ b/Assets/lilToon/Shader/lts_onetrans.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_onetrans_o.shader b/Assets/lilToon/Shader/lts_onetrans_o.shader index 435d695a..f4adc996 100644 --- a/Assets/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_onetrans_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_oo.shader b/Assets/lilToon/Shader/lts_oo.shader index ef248952..bdea35f6 100644 --- a/Assets/lilToon/Shader/lts_oo.shader +++ b/Assets/lilToon/Shader/lts_oo.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_overlay.shader b/Assets/lilToon/Shader/lts_overlay.shader index 45edde25..2e3b6de7 100644 --- a/Assets/lilToon/Shader/lts_overlay.shader +++ b/Assets/lilToon/Shader/lts_overlay.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_overlay_one.shader b/Assets/lilToon/Shader/lts_overlay_one.shader index 6d9bc71d..1e947d6b 100644 --- a/Assets/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/lilToon/Shader/lts_overlay_one.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_ref.shader b/Assets/lilToon/Shader/lts_ref.shader index b7f81cbf..12b13fba 100644 --- a/Assets/lilToon/Shader/lts_ref.shader +++ b/Assets/lilToon/Shader/lts_ref.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_ref_blur.shader b/Assets/lilToon/Shader/lts_ref_blur.shader index 1c816d36..648ab602 100644 --- a/Assets/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/lilToon/Shader/lts_ref_blur.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess.shader b/Assets/lilToon/Shader/lts_tess.shader index 319600b7..a23e7ee4 100644 --- a/Assets/lilToon/Shader/lts_tess.shader +++ b/Assets/lilToon/Shader/lts_tess.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_cutout.shader b/Assets/lilToon/Shader/lts_tess_cutout.shader index e3d7e288..4ec7c9ec 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/lilToon/Shader/lts_tess_cutout_o.shader index 92b1466c..0eca1aac 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_o.shader b/Assets/lilToon/Shader/lts_tess_o.shader index 374838c3..3ec145f2 100644 --- a/Assets/lilToon/Shader/lts_tess_o.shader +++ b/Assets/lilToon/Shader/lts_tess_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_onetrans.shader b/Assets/lilToon/Shader/lts_tess_onetrans.shader index 344c86b1..78d1f740 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader index edf17f7f..d6fa97de 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_trans.shader b/Assets/lilToon/Shader/lts_tess_trans.shader index efdb3589..264bdcf2 100644 --- a/Assets/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/lilToon/Shader/lts_tess_trans.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_trans_o.shader b/Assets/lilToon/Shader/lts_tess_trans_o.shader index f5d5acb5..6825d72c 100644 --- a/Assets/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_trans_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_twotrans.shader b/Assets/lilToon/Shader/lts_tess_twotrans.shader index b372a8e9..e66bcd41 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader index 36525e9f..34d311df 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans.shader b/Assets/lilToon/Shader/lts_trans.shader index aa1be4b6..1a2240ba 100644 --- a/Assets/lilToon/Shader/lts_trans.shader +++ b/Assets/lilToon/Shader/lts_trans.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans_o.shader b/Assets/lilToon/Shader/lts_trans_o.shader index 13c33627..fbc82f12 100644 --- a/Assets/lilToon/Shader/lts_trans_o.shader +++ b/Assets/lilToon/Shader/lts_trans_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans_oo.shader b/Assets/lilToon/Shader/lts_trans_oo.shader index 8b766103..e1343203 100644 --- a/Assets/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/lilToon/Shader/lts_trans_oo.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_twotrans.shader b/Assets/lilToon/Shader/lts_twotrans.shader index 02445b8c..51d22384 100644 --- a/Assets/lilToon/Shader/lts_twotrans.shader +++ b/Assets/lilToon/Shader/lts_twotrans.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_twotrans_o.shader b/Assets/lilToon/Shader/lts_twotrans_o.shader index 0c7586f0..7e9fca1d 100644 --- a/Assets/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_twotrans_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl.shader b/Assets/lilToon/Shader/ltsl.shader index 517c5d83..7781fbb0 100644 --- a/Assets/lilToon/Shader/ltsl.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_cutout.shader b/Assets/lilToon/Shader/ltsl_cutout.shader index a3681b21..f0fa03f0 100644 --- a/Assets/lilToon/Shader/ltsl_cutout.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_cutout_o.shader b/Assets/lilToon/Shader/ltsl_cutout_o.shader index 57332769..c57e56c8 100644 --- a/Assets/lilToon/Shader/ltsl_cutout_o.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_o.shader b/Assets/lilToon/Shader/ltsl_o.shader index e9b82447..4e8c4fdf 100644 --- a/Assets/lilToon/Shader/ltsl_o.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_onetrans.shader b/Assets/lilToon/Shader/ltsl_onetrans.shader index 3325632a..1f5c4928 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_onetrans_o.shader b/Assets/lilToon/Shader/ltsl_onetrans_o.shader index 70b6ecfe..e29b810f 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans_o.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_overlay.shader b/Assets/lilToon/Shader/ltsl_overlay.shader index e912fe37..28a208e5 100644 --- a/Assets/lilToon/Shader/ltsl_overlay.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_overlay_one.shader b/Assets/lilToon/Shader/ltsl_overlay_one.shader index 33ed2ca4..7ce1f767 100644 --- a/Assets/lilToon/Shader/ltsl_overlay_one.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_trans.shader b/Assets/lilToon/Shader/ltsl_trans.shader index 8e342b4f..bc859771 100644 --- a/Assets/lilToon/Shader/ltsl_trans.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_trans_o.shader b/Assets/lilToon/Shader/ltsl_trans_o.shader index 9fd029b2..cbb0ea33 100644 --- a/Assets/lilToon/Shader/ltsl_trans_o.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_twotrans.shader b/Assets/lilToon/Shader/ltsl_twotrans.shader index dae56d4f..ccada802 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_twotrans_o.shader b/Assets/lilToon/Shader/ltsl_twotrans_o.shader index c43e2955..0f1cbdf4 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans_o.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti.shader b/Assets/lilToon/Shader/ltsmulti.shader index 67cbabb4..53c9ae12 100644 --- a/Assets/lilToon/Shader/ltsmulti.shader +++ b/Assets/lilToon/Shader/ltsmulti.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_fur.shader b/Assets/lilToon/Shader/ltsmulti_fur.shader index c1e55c9b..b10109eb 100644 --- a/Assets/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/lilToon/Shader/ltsmulti_fur.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_gem.shader b/Assets/lilToon/Shader/ltsmulti_gem.shader index 5485c46c..33297bdc 100644 --- a/Assets/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/lilToon/Shader/ltsmulti_gem.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_o.shader b/Assets/lilToon/Shader/ltsmulti_o.shader index b0720518..b77bf252 100644 --- a/Assets/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/lilToon/Shader/ltsmulti_o.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_ref.shader b/Assets/lilToon/Shader/ltsmulti_ref.shader index 09289fa9..035339f6 100644 --- a/Assets/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/lilToon/Shader/ltsmulti_ref.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_cutout.shader b/Assets/lilToon/Shader/ltspass_cutout.shader index 88caafb8..e8d8106e 100644 --- a/Assets/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_cutout.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_cutout.shader b/Assets/lilToon/Shader/ltspass_lite_cutout.shader index 02b0a40e..cd6fe330 100644 --- a/Assets/lilToon/Shader/ltspass_lite_cutout.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_opaque.shader b/Assets/lilToon/Shader/ltspass_lite_opaque.shader index 11be413d..46f9833b 100644 --- a/Assets/lilToon/Shader/ltspass_lite_opaque.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_transparent.shader b/Assets/lilToon/Shader/ltspass_lite_transparent.shader index 0e882047..a0632487 100644 --- a/Assets/lilToon/Shader/ltspass_lite_transparent.shader +++ b/Assets/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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_opaque.shader b/Assets/lilToon/Shader/ltspass_opaque.shader index ac76ed08..53e07a60 100644 --- a/Assets/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_opaque.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_proponly.shader b/Assets/lilToon/Shader/ltspass_proponly.shader index 82c0a162..775ebef8 100644 --- a/Assets/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/lilToon/Shader/ltspass_proponly.shader @@ -554,7 +554,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/lilToon/Shader/ltspass_tess_cutout.shader index 3b89ecdf..17090454 100644 --- a/Assets/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_tess_cutout.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/lilToon/Shader/ltspass_tess_opaque.shader index ef3ffb32..064af53a 100644 --- a/Assets/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_tess_opaque.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/lilToon/Shader/ltspass_tess_transparent.shader index 0ed89636..48c323b1 100644 --- a/Assets/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_tess_transparent.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_transparent.shader b/Assets/lilToon/Shader/ltspass_transparent.shader index c33a7488..e256018f 100644 --- a/Assets/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_transparent.shader @@ -558,7 +558,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) = 35 + [HideInInspector] _lilToonVersion ("Version", Int) = 36 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/package.json b/Assets/lilToon/package.json index fcadc79e..965346b2 100644 --- a/Assets/lilToon/package.json +++ b/Assets/lilToon/package.json @@ -1,6 +1,6 @@ { "name": "jp.lilxyzw.liltoon", - "version": "1.5.0", + "version": "1.5.1", "displayName": "lilToon", "description": "Feature-rich toon shader.", "unity": "2018.1", @@ -9,7 +9,7 @@ "licensesUrl": "https://github.com/lilxyzw/lilToon/blob/master/Assets/lilToon/LICENSE", "license": "MIT", "keywords": ["Toon", "Shader", "Material"], - "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.5.0/jp.lilxyzw.liltoon-1.5.0.zip?", + "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.5.1/jp.lilxyzw.liltoon-1.5.1.zip?", "repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json", "legacyFolders" : { "Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05" diff --git a/version.json b/version.json index e4c58ddc..6dbad48b 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"latest_vertion_name": "1.5.0", "latest_vertion_value": 36} \ No newline at end of file +{"latest_vertion_name": "1.5.1", "latest_vertion_value": 37} \ No newline at end of file From 958d3dbd6914511db3ed590b069a6816813d02ea Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 24 Dec 2023 14:58:46 +0900 Subject: [PATCH 07/13] chore: support for material variants --- Assets/lilToon/Editor/lilToonSetting.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Assets/lilToon/Editor/lilToonSetting.cs b/Assets/lilToon/Editor/lilToonSetting.cs index 842bd322..5feb8536 100644 --- a/Assets/lilToon/Editor/lilToonSetting.cs +++ b/Assets/lilToon/Editor/lilToonSetting.cs @@ -835,6 +835,14 @@ internal static void SetShaderSettingBeforeBuild(Material[] materials, Animation #endif try { + #if UNITY_2022_1_OR_NEWER + var materialParents = new HashSet(); + foreach(var m in materials) + { + GetMaterialParents(materialParents, m); + } + materials = materials.Union(materialParents).ToArray(); + #endif if(!ShouldOptimization()) return; var shaders = GetShaderListFromGameObject(materials, clips); if(shaders.Count() == 0) return; @@ -871,6 +879,16 @@ internal static void SetShaderSettingBeforeBuild(Material[] materials, Animation #endif } + #if UNITY_2022_1_OR_NEWER + private static void GetMaterialParents(HashSet parents, Material material) + { + var p = material.parent; + if(p == null) return; + parents.Add(p); + GetMaterialParents(parents, p); + } + #endif + internal static void SetShaderSettingBeforeBuild() { #if !LILTOON_DISABLE_OPTIMIZATION From 222c3d814aa50b5bbdb6217037b9fdc7ff377870 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 24 Dec 2023 15:02:04 +0900 Subject: [PATCH 08/13] chore: update shaders --- Assets/lilToon/Shader/lts.shader | 2 +- Assets/lilToon/Shader/lts_cutout.shader | 2 +- Assets/lilToon/Shader/lts_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_cutout_oo.shader | 2 +- Assets/lilToon/Shader/lts_fakeshadow.shader | 2 +- Assets/lilToon/Shader/lts_fur.shader | 2 +- Assets/lilToon/Shader/lts_fur_cutout.shader | 2 +- Assets/lilToon/Shader/lts_fur_two.shader | 2 +- Assets/lilToon/Shader/lts_furonly.shader | 2 +- Assets/lilToon/Shader/lts_furonly_cutout.shader | 2 +- Assets/lilToon/Shader/lts_furonly_two.shader | 2 +- Assets/lilToon/Shader/lts_gem.shader | 2 +- Assets/lilToon/Shader/lts_o.shader | 2 +- Assets/lilToon/Shader/lts_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_oo.shader | 2 +- Assets/lilToon/Shader/lts_overlay.shader | 2 +- Assets/lilToon/Shader/lts_overlay_one.shader | 2 +- Assets/lilToon/Shader/lts_ref.shader | 2 +- Assets/lilToon/Shader/lts_ref_blur.shader | 2 +- Assets/lilToon/Shader/lts_tess.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans.shader | 2 +- Assets/lilToon/Shader/lts_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans_oo.shader | 2 +- Assets/lilToon/Shader/lts_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_twotrans_o.shader | 2 +- Assets/lilToon/Shader/ltsl.shader | 2 +- Assets/lilToon/Shader/ltsl_cutout.shader | 2 +- Assets/lilToon/Shader/ltsl_cutout_o.shader | 2 +- Assets/lilToon/Shader/ltsl_o.shader | 2 +- Assets/lilToon/Shader/ltsl_onetrans.shader | 2 +- Assets/lilToon/Shader/ltsl_onetrans_o.shader | 2 +- Assets/lilToon/Shader/ltsl_overlay.shader | 2 +- Assets/lilToon/Shader/ltsl_overlay_one.shader | 2 +- Assets/lilToon/Shader/ltsl_trans.shader | 2 +- Assets/lilToon/Shader/ltsl_trans_o.shader | 2 +- Assets/lilToon/Shader/ltsl_twotrans.shader | 2 +- Assets/lilToon/Shader/ltsl_twotrans_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti.shader | 2 +- Assets/lilToon/Shader/ltsmulti_fur.shader | 2 +- Assets/lilToon/Shader/ltsmulti_gem.shader | 2 +- Assets/lilToon/Shader/ltsmulti_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti_ref.shader | 2 +- Assets/lilToon/Shader/ltspass_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_transparent.shader | 2 +- Assets/lilToon/Shader/ltspass_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_proponly.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_transparent.shader | 2 +- Assets/lilToon/Shader/ltspass_transparent.shader | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Assets/lilToon/Shader/lts.shader b/Assets/lilToon/Shader/lts.shader index e89f117a..b3b93353 100644 --- a/Assets/lilToon/Shader/lts.shader +++ b/Assets/lilToon/Shader/lts.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout.shader b/Assets/lilToon/Shader/lts_cutout.shader index c1dd1216..b95492ea 100644 --- a/Assets/lilToon/Shader/lts_cutout.shader +++ b/Assets/lilToon/Shader/lts_cutout.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout_o.shader b/Assets/lilToon/Shader/lts_cutout_o.shader index ec8088c9..6c19fda3 100644 --- a/Assets/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_cutout_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout_oo.shader b/Assets/lilToon/Shader/lts_cutout_oo.shader index 4e29bafe..8d8d4164 100644 --- a/Assets/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/lilToon/Shader/lts_cutout_oo.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fakeshadow.shader b/Assets/lilToon/Shader/lts_fakeshadow.shader index 96d72df3..586679a7 100644 --- a/Assets/lilToon/Shader/lts_fakeshadow.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 } SubShader diff --git a/Assets/lilToon/Shader/lts_fur.shader b/Assets/lilToon/Shader/lts_fur.shader index 89487685..654b5331 100644 --- a/Assets/lilToon/Shader/lts_fur.shader +++ b/Assets/lilToon/Shader/lts_fur.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_cutout.shader b/Assets/lilToon/Shader/lts_fur_cutout.shader index 8ef6828e..6abc9e7d 100644 --- a/Assets/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/lilToon/Shader/lts_fur_cutout.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_two.shader b/Assets/lilToon/Shader/lts_fur_two.shader index 8d6007fb..52b1b7f6 100644 --- a/Assets/lilToon/Shader/lts_fur_two.shader +++ b/Assets/lilToon/Shader/lts_fur_two.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly.shader b/Assets/lilToon/Shader/lts_furonly.shader index 9130fec9..7b37e80d 100644 --- a/Assets/lilToon/Shader/lts_furonly.shader +++ b/Assets/lilToon/Shader/lts_furonly.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly_cutout.shader b/Assets/lilToon/Shader/lts_furonly_cutout.shader index bd87cd63..206245d5 100644 --- a/Assets/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/lilToon/Shader/lts_furonly_cutout.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly_two.shader b/Assets/lilToon/Shader/lts_furonly_two.shader index 01743b6e..8789b454 100644 --- a/Assets/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/lilToon/Shader/lts_furonly_two.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_gem.shader b/Assets/lilToon/Shader/lts_gem.shader index 28fe900d..0daf70fc 100644 --- a/Assets/lilToon/Shader/lts_gem.shader +++ b/Assets/lilToon/Shader/lts_gem.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_o.shader b/Assets/lilToon/Shader/lts_o.shader index 6e503b80..2c18321f 100644 --- a/Assets/lilToon/Shader/lts_o.shader +++ b/Assets/lilToon/Shader/lts_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_onetrans.shader b/Assets/lilToon/Shader/lts_onetrans.shader index eb95d196..fd084fff 100644 --- a/Assets/lilToon/Shader/lts_onetrans.shader +++ b/Assets/lilToon/Shader/lts_onetrans.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_onetrans_o.shader b/Assets/lilToon/Shader/lts_onetrans_o.shader index f4adc996..d343f66d 100644 --- a/Assets/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_onetrans_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_oo.shader b/Assets/lilToon/Shader/lts_oo.shader index bdea35f6..fe14ef67 100644 --- a/Assets/lilToon/Shader/lts_oo.shader +++ b/Assets/lilToon/Shader/lts_oo.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_overlay.shader b/Assets/lilToon/Shader/lts_overlay.shader index 2e3b6de7..1e7f00dc 100644 --- a/Assets/lilToon/Shader/lts_overlay.shader +++ b/Assets/lilToon/Shader/lts_overlay.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_overlay_one.shader b/Assets/lilToon/Shader/lts_overlay_one.shader index 1e947d6b..9baf0595 100644 --- a/Assets/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/lilToon/Shader/lts_overlay_one.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_ref.shader b/Assets/lilToon/Shader/lts_ref.shader index 12b13fba..8bb2a626 100644 --- a/Assets/lilToon/Shader/lts_ref.shader +++ b/Assets/lilToon/Shader/lts_ref.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_ref_blur.shader b/Assets/lilToon/Shader/lts_ref_blur.shader index 648ab602..82e3c751 100644 --- a/Assets/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/lilToon/Shader/lts_ref_blur.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess.shader b/Assets/lilToon/Shader/lts_tess.shader index a23e7ee4..17f6709f 100644 --- a/Assets/lilToon/Shader/lts_tess.shader +++ b/Assets/lilToon/Shader/lts_tess.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_cutout.shader b/Assets/lilToon/Shader/lts_tess_cutout.shader index 4ec7c9ec..0a9f3f79 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/lilToon/Shader/lts_tess_cutout_o.shader index 0eca1aac..8c7777ed 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_o.shader b/Assets/lilToon/Shader/lts_tess_o.shader index 3ec145f2..e9ee0b68 100644 --- a/Assets/lilToon/Shader/lts_tess_o.shader +++ b/Assets/lilToon/Shader/lts_tess_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_onetrans.shader b/Assets/lilToon/Shader/lts_tess_onetrans.shader index 78d1f740..04615681 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader index d6fa97de..6cd90b96 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_trans.shader b/Assets/lilToon/Shader/lts_tess_trans.shader index 264bdcf2..1ea4adde 100644 --- a/Assets/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/lilToon/Shader/lts_tess_trans.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_trans_o.shader b/Assets/lilToon/Shader/lts_tess_trans_o.shader index 6825d72c..28610110 100644 --- a/Assets/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_trans_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_twotrans.shader b/Assets/lilToon/Shader/lts_tess_twotrans.shader index e66bcd41..45698c4d 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader index 34d311df..792fc0b8 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans.shader b/Assets/lilToon/Shader/lts_trans.shader index 1a2240ba..52bd962b 100644 --- a/Assets/lilToon/Shader/lts_trans.shader +++ b/Assets/lilToon/Shader/lts_trans.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans_o.shader b/Assets/lilToon/Shader/lts_trans_o.shader index fbc82f12..8f375653 100644 --- a/Assets/lilToon/Shader/lts_trans_o.shader +++ b/Assets/lilToon/Shader/lts_trans_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans_oo.shader b/Assets/lilToon/Shader/lts_trans_oo.shader index e1343203..cbce6608 100644 --- a/Assets/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/lilToon/Shader/lts_trans_oo.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_twotrans.shader b/Assets/lilToon/Shader/lts_twotrans.shader index 51d22384..798fabef 100644 --- a/Assets/lilToon/Shader/lts_twotrans.shader +++ b/Assets/lilToon/Shader/lts_twotrans.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_twotrans_o.shader b/Assets/lilToon/Shader/lts_twotrans_o.shader index 7e9fca1d..5db80659 100644 --- a/Assets/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_twotrans_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl.shader b/Assets/lilToon/Shader/ltsl.shader index 7781fbb0..b5c9c45e 100644 --- a/Assets/lilToon/Shader/ltsl.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_cutout.shader b/Assets/lilToon/Shader/ltsl_cutout.shader index f0fa03f0..2ab87a15 100644 --- a/Assets/lilToon/Shader/ltsl_cutout.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_cutout_o.shader b/Assets/lilToon/Shader/ltsl_cutout_o.shader index c57e56c8..ce99eb2e 100644 --- a/Assets/lilToon/Shader/ltsl_cutout_o.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_o.shader b/Assets/lilToon/Shader/ltsl_o.shader index 4e8c4fdf..b06b8fd5 100644 --- a/Assets/lilToon/Shader/ltsl_o.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_onetrans.shader b/Assets/lilToon/Shader/ltsl_onetrans.shader index 1f5c4928..9cc145de 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_onetrans_o.shader b/Assets/lilToon/Shader/ltsl_onetrans_o.shader index e29b810f..53bd6021 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans_o.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_overlay.shader b/Assets/lilToon/Shader/ltsl_overlay.shader index 28a208e5..d41d7b35 100644 --- a/Assets/lilToon/Shader/ltsl_overlay.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_overlay_one.shader b/Assets/lilToon/Shader/ltsl_overlay_one.shader index 7ce1f767..c7968228 100644 --- a/Assets/lilToon/Shader/ltsl_overlay_one.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_trans.shader b/Assets/lilToon/Shader/ltsl_trans.shader index bc859771..2670b491 100644 --- a/Assets/lilToon/Shader/ltsl_trans.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_trans_o.shader b/Assets/lilToon/Shader/ltsl_trans_o.shader index cbb0ea33..83b530df 100644 --- a/Assets/lilToon/Shader/ltsl_trans_o.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_twotrans.shader b/Assets/lilToon/Shader/ltsl_twotrans.shader index ccada802..1b813b90 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_twotrans_o.shader b/Assets/lilToon/Shader/ltsl_twotrans_o.shader index 0f1cbdf4..7b7fe039 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans_o.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti.shader b/Assets/lilToon/Shader/ltsmulti.shader index 53c9ae12..cba7c5f1 100644 --- a/Assets/lilToon/Shader/ltsmulti.shader +++ b/Assets/lilToon/Shader/ltsmulti.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_fur.shader b/Assets/lilToon/Shader/ltsmulti_fur.shader index b10109eb..15f07412 100644 --- a/Assets/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/lilToon/Shader/ltsmulti_fur.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_gem.shader b/Assets/lilToon/Shader/ltsmulti_gem.shader index 33297bdc..4e99acda 100644 --- a/Assets/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/lilToon/Shader/ltsmulti_gem.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_o.shader b/Assets/lilToon/Shader/ltsmulti_o.shader index b77bf252..d7642d7e 100644 --- a/Assets/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/lilToon/Shader/ltsmulti_o.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_ref.shader b/Assets/lilToon/Shader/ltsmulti_ref.shader index 035339f6..9910146d 100644 --- a/Assets/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/lilToon/Shader/ltsmulti_ref.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_cutout.shader b/Assets/lilToon/Shader/ltspass_cutout.shader index e8d8106e..db714b47 100644 --- a/Assets/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_cutout.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_cutout.shader b/Assets/lilToon/Shader/ltspass_lite_cutout.shader index cd6fe330..b0bbfb7c 100644 --- a/Assets/lilToon/Shader/ltspass_lite_cutout.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_opaque.shader b/Assets/lilToon/Shader/ltspass_lite_opaque.shader index 46f9833b..8f99311b 100644 --- a/Assets/lilToon/Shader/ltspass_lite_opaque.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_transparent.shader b/Assets/lilToon/Shader/ltspass_lite_transparent.shader index a0632487..df23b25b 100644 --- a/Assets/lilToon/Shader/ltspass_lite_transparent.shader +++ b/Assets/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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_opaque.shader b/Assets/lilToon/Shader/ltspass_opaque.shader index 53e07a60..ef70ed57 100644 --- a/Assets/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_opaque.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_proponly.shader b/Assets/lilToon/Shader/ltspass_proponly.shader index 775ebef8..dd910855 100644 --- a/Assets/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/lilToon/Shader/ltspass_proponly.shader @@ -554,7 +554,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/lilToon/Shader/ltspass_tess_cutout.shader index 17090454..e2f0e2f2 100644 --- a/Assets/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_tess_cutout.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/lilToon/Shader/ltspass_tess_opaque.shader index 064af53a..a512630d 100644 --- a/Assets/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_tess_opaque.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/lilToon/Shader/ltspass_tess_transparent.shader index 48c323b1..612fa761 100644 --- a/Assets/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_tess_transparent.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_transparent.shader b/Assets/lilToon/Shader/ltspass_transparent.shader index e256018f..721740e6 100644 --- a/Assets/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_transparent.shader @@ -558,7 +558,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) = 36 + [HideInInspector] _lilToonVersion ("Version", Int) = 37 //---------------------------------------------------------------------------------------------------------------------- // Advanced From 3984a74f61cea7681db9ed68c559746e9e5fc4b9 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Wed, 27 Dec 2023 19:16:22 +0900 Subject: [PATCH 09/13] docs: update changelog --- Assets/lilToon/CHANGELOG.md | 6 ++++++ Assets/lilToon/CHANGELOG_JP.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md index b6687b79..7e8cffc3 100644 --- a/Assets/lilToon/CHANGELOG.md +++ b/Assets/lilToon/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.1] - 2023-12-27 +### Fixed +- Avoid crashes in certain Unity versions +- Support for material variants +- Reduced the frequency of material migration + ## [1.5.0] - 2023-12-10 ### Added - Enabled to see property name with alt key diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md index b202c18e..686da736 100644 --- a/Assets/lilToon/CHANGELOG_JP.md +++ b/Assets/lilToon/CHANGELOG_JP.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.1] - 2023-12-27 +### 修正 +- 特定Unityバージョンにおけるクラッシュ問題を回避 +- マテリアルバリアントへの対応 +- マテリアルのマイグレーションを発生しにくくした + ## [1.5.0] - 2023-12-10 ### 追加 - altキーでプロパティ名を見られるようにした From eaf16b140ecf0c3a55044ed2495586dfaad63f5b Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Fri, 29 Dec 2023 21:57:55 +0900 Subject: [PATCH 10/13] fix: necessary vertex data might be deleted when building AssetBundle --- Assets/lilToon/CHANGELOG.md | 4 ++ Assets/lilToon/CHANGELOG_JP.md | 4 ++ .../Misc/ReferenceUVs.lilblock | 42 +++++++++++------- Assets/lilToon/Editor/lilConstants.cs | 4 +- Assets/lilToon/README.md | 2 +- Assets/lilToon/README_JP.md | 2 +- Assets/lilToon/Shader/lts.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_cutout.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_cutout_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_cutout_oo.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_fakeshadow.shader | 2 +- Assets/lilToon/Shader/lts_fur.shader | 2 +- Assets/lilToon/Shader/lts_fur_cutout.shader | 2 +- Assets/lilToon/Shader/lts_fur_two.shader | 2 +- Assets/lilToon/Shader/lts_furonly.shader | 43 ++++++++++++------- .../lilToon/Shader/lts_furonly_cutout.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_furonly_two.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_gem.shader | 2 +- Assets/lilToon/Shader/lts_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_onetrans.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_onetrans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_oo.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_overlay.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_overlay_one.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_ref.shader | 2 +- Assets/lilToon/Shader/lts_ref_blur.shader | 2 +- Assets/lilToon/Shader/lts_tess.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_tess_cutout.shader | 43 ++++++++++++------- .../lilToon/Shader/lts_tess_cutout_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_tess_o.shader | 43 ++++++++++++------- .../lilToon/Shader/lts_tess_onetrans.shader | 43 ++++++++++++------- .../lilToon/Shader/lts_tess_onetrans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_tess_trans.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_tess_trans_o.shader | 43 ++++++++++++------- .../lilToon/Shader/lts_tess_twotrans.shader | 43 ++++++++++++------- .../lilToon/Shader/lts_tess_twotrans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_trans.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_trans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_trans_oo.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_twotrans.shader | 43 ++++++++++++------- Assets/lilToon/Shader/lts_twotrans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_cutout.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_cutout_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_onetrans.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_onetrans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_overlay.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_overlay_one.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_trans.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_trans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_twotrans.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsl_twotrans_o.shader | 43 ++++++++++++------- Assets/lilToon/Shader/ltsmulti.shader | 2 +- Assets/lilToon/Shader/ltsmulti_fur.shader | 2 +- Assets/lilToon/Shader/ltsmulti_gem.shader | 2 +- Assets/lilToon/Shader/ltsmulti_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti_ref.shader | 2 +- Assets/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 +- Assets/lilToon/Shader/ltspass_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_proponly.shader | 2 +- .../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 +- Assets/lilToon/package.json | 4 +- version.json | 2 +- 70 files changed, 1184 insertions(+), 644 deletions(-) diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md index 7e8cffc3..6c8235b2 100644 --- a/Assets/lilToon/CHANGELOG.md +++ b/Assets/lilToon/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.2] - 2023-12-30 +### Fixed +- Fixed an issue where necessary vertex data might be deleted when building AssetBundle + ## [1.5.1] - 2023-12-27 ### Fixed - Avoid crashes in certain Unity versions diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md index 686da736..4bdb7a09 100644 --- a/Assets/lilToon/CHANGELOG_JP.md +++ b/Assets/lilToon/CHANGELOG_JP.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.2] - 2023-12-30 +### 修正 +- AssetBundleビルド時に必要な頂点データが消されてしまう場合があるのを修正 + ## [1.5.1] - 2023-12-27 ### 修正 - 特定Unityバージョンにおけるクラッシュ問題を回避 diff --git a/Assets/lilToon/CustomShaderResources/Misc/ReferenceUVs.lilblock b/Assets/lilToon/CustomShaderResources/Misc/ReferenceUVs.lilblock index d0213adf..d1914f7a 100644 --- a/Assets/lilToon/CustomShaderResources/Misc/ReferenceUVs.lilblock +++ b/Assets/lilToon/CustomShaderResources/Misc/ReferenceUVs.lilblock @@ -1,20 +1,20 @@ Pass { Tags { "LightMode" = "Never" } - + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -23,12 +23,18 @@ float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -46,7 +52,13 @@ // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Editor/lilConstants.cs b/Assets/lilToon/Editor/lilConstants.cs index 61b7036a..ae80e10d 100644 --- a/Assets/lilToon/Editor/lilConstants.cs +++ b/Assets/lilToon/Editor/lilConstants.cs @@ -6,8 +6,8 @@ namespace lilToon { public class lilConstants { - public const string currentVersionName = "1.5.1"; - public const int currentVersionValue = 37; + public const string currentVersionName = "1.5.2"; + public const int currentVersionValue = 38; internal const string boothURL = "https://lilxyzw.booth.pm/"; internal const string githubURL = "https://github.com/lilxyzw/lilToon"; diff --git a/Assets/lilToon/README.md b/Assets/lilToon/README.md index f2eb7636..8d3e42c9 100644 --- a/Assets/lilToon/README.md +++ b/Assets/lilToon/README.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.1 +Version 1.5.2 # Overview This shader is developed for services using avatars (VRChat, etc.) and has the following features. diff --git a/Assets/lilToon/README_JP.md b/Assets/lilToon/README_JP.md index ae15744e..f155d423 100644 --- a/Assets/lilToon/README_JP.md +++ b/Assets/lilToon/README_JP.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.1 +Version 1.5.2 # 概要 アバターを用いたサービス(VRChat等)向けに開発したシェーダーで以下のような特徴があります。 diff --git a/Assets/lilToon/Shader/lts.shader b/Assets/lilToon/Shader/lts.shader index b3b93353..3c0bc1b7 100644 --- a/Assets/lilToon/Shader/lts.shader +++ b/Assets/lilToon/Shader/lts.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -632,19 +632,20 @@ Shader "lilToon" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -653,12 +654,18 @@ Shader "lilToon" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -676,7 +683,13 @@ Shader "lilToon" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_cutout.shader b/Assets/lilToon/Shader/lts_cutout.shader index b95492ea..e1e26e33 100644 --- a/Assets/lilToon/Shader/lts_cutout.shader +++ b/Assets/lilToon/Shader/lts_cutout.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -632,19 +632,20 @@ Shader "Hidden/lilToonCutout" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -653,12 +654,18 @@ Shader "Hidden/lilToonCutout" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -676,7 +683,13 @@ Shader "Hidden/lilToonCutout" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_cutout_o.shader b/Assets/lilToon/Shader/lts_cutout_o.shader index 6c19fda3..2040f730 100644 --- a/Assets/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_cutout_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -634,19 +634,20 @@ Shader "Hidden/lilToonCutoutOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -655,12 +656,18 @@ Shader "Hidden/lilToonCutoutOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -678,7 +685,13 @@ Shader "Hidden/lilToonCutoutOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_cutout_oo.shader b/Assets/lilToon/Shader/lts_cutout_oo.shader index 8d8d4164..1a95dfb2 100644 --- a/Assets/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/lilToon/Shader/lts_cutout_oo.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -630,19 +630,20 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -651,12 +652,18 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -674,7 +681,13 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_fakeshadow.shader b/Assets/lilToon/Shader/lts_fakeshadow.shader index 586679a7..677ddd38 100644 --- a/Assets/lilToon/Shader/lts_fakeshadow.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 } SubShader diff --git a/Assets/lilToon/Shader/lts_fur.shader b/Assets/lilToon/Shader/lts_fur.shader index 654b5331..d052c103 100644 --- a/Assets/lilToon/Shader/lts_fur.shader +++ b/Assets/lilToon/Shader/lts_fur.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_cutout.shader b/Assets/lilToon/Shader/lts_fur_cutout.shader index 6abc9e7d..69e66505 100644 --- a/Assets/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/lilToon/Shader/lts_fur_cutout.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_two.shader b/Assets/lilToon/Shader/lts_fur_two.shader index 52b1b7f6..c00ad3eb 100644 --- a/Assets/lilToon/Shader/lts_fur_two.shader +++ b/Assets/lilToon/Shader/lts_fur_two.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly.shader b/Assets/lilToon/Shader/lts_furonly.shader index 7b37e80d..82f0582a 100644 --- a/Assets/lilToon/Shader/lts_furonly.shader +++ b/Assets/lilToon/Shader/lts_furonly.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -648,19 +648,20 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -669,12 +670,18 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -692,7 +699,13 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_furonly_cutout.shader b/Assets/lilToon/Shader/lts_furonly_cutout.shader index 206245d5..ac906f50 100644 --- a/Assets/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/lilToon/Shader/lts_furonly_cutout.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -648,19 +648,20 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -669,12 +670,18 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -692,7 +699,13 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_furonly_two.shader b/Assets/lilToon/Shader/lts_furonly_two.shader index 8789b454..a1cee0e0 100644 --- a/Assets/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/lilToon/Shader/lts_furonly_two.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -650,19 +650,20 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -671,12 +672,18 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -694,7 +701,13 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_gem.shader b/Assets/lilToon/Shader/lts_gem.shader index 0daf70fc..de89be23 100644 --- a/Assets/lilToon/Shader/lts_gem.shader +++ b/Assets/lilToon/Shader/lts_gem.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_o.shader b/Assets/lilToon/Shader/lts_o.shader index 2c18321f..247936f1 100644 --- a/Assets/lilToon/Shader/lts_o.shader +++ b/Assets/lilToon/Shader/lts_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -634,19 +634,20 @@ Shader "Hidden/lilToonOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -655,12 +656,18 @@ Shader "Hidden/lilToonOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -678,7 +685,13 @@ Shader "Hidden/lilToonOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_onetrans.shader b/Assets/lilToon/Shader/lts_onetrans.shader index fd084fff..628eb52a 100644 --- a/Assets/lilToon/Shader/lts_onetrans.shader +++ b/Assets/lilToon/Shader/lts_onetrans.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -664,19 +664,20 @@ Shader "Hidden/lilToonOnePassTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -685,12 +686,18 @@ Shader "Hidden/lilToonOnePassTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -708,7 +715,13 @@ Shader "Hidden/lilToonOnePassTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_onetrans_o.shader b/Assets/lilToon/Shader/lts_onetrans_o.shader index d343f66d..9251f170 100644 --- a/Assets/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_onetrans_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -665,19 +665,20 @@ Shader "Hidden/lilToonOnePassTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -686,12 +687,18 @@ Shader "Hidden/lilToonOnePassTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -709,7 +716,13 @@ Shader "Hidden/lilToonOnePassTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_oo.shader b/Assets/lilToon/Shader/lts_oo.shader index fe14ef67..ea87f07e 100644 --- a/Assets/lilToon/Shader/lts_oo.shader +++ b/Assets/lilToon/Shader/lts_oo.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -630,19 +630,20 @@ Shader "_lil/[Optional] lilToonOutlineOnly" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -651,12 +652,18 @@ Shader "_lil/[Optional] lilToonOutlineOnly" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -674,7 +681,13 @@ Shader "_lil/[Optional] lilToonOutlineOnly" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_overlay.shader b/Assets/lilToon/Shader/lts_overlay.shader index 1e7f00dc..96a00e41 100644 --- a/Assets/lilToon/Shader/lts_overlay.shader +++ b/Assets/lilToon/Shader/lts_overlay.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -663,19 +663,20 @@ Shader "_lil/[Optional] lilToonOverlay" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -684,12 +685,18 @@ Shader "_lil/[Optional] lilToonOverlay" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -707,7 +714,13 @@ Shader "_lil/[Optional] lilToonOverlay" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_overlay_one.shader b/Assets/lilToon/Shader/lts_overlay_one.shader index 9baf0595..8e2e6300 100644 --- a/Assets/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/lilToon/Shader/lts_overlay_one.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -662,19 +662,20 @@ Shader "_lil/[Optional] lilToonOverlayOnePass" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -683,12 +684,18 @@ Shader "_lil/[Optional] lilToonOverlayOnePass" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -706,7 +713,13 @@ Shader "_lil/[Optional] lilToonOverlayOnePass" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_ref.shader b/Assets/lilToon/Shader/lts_ref.shader index 8bb2a626..4ef13e88 100644 --- a/Assets/lilToon/Shader/lts_ref.shader +++ b/Assets/lilToon/Shader/lts_ref.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_ref_blur.shader b/Assets/lilToon/Shader/lts_ref_blur.shader index 82e3c751..68e4466e 100644 --- a/Assets/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/lilToon/Shader/lts_ref_blur.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess.shader b/Assets/lilToon/Shader/lts_tess.shader index 17f6709f..daf830c9 100644 --- a/Assets/lilToon/Shader/lts_tess.shader +++ b/Assets/lilToon/Shader/lts_tess.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -632,19 +632,20 @@ Shader "Hidden/lilToonTessellation" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -653,12 +654,18 @@ Shader "Hidden/lilToonTessellation" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -676,7 +683,13 @@ Shader "Hidden/lilToonTessellation" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_cutout.shader b/Assets/lilToon/Shader/lts_tess_cutout.shader index 0a9f3f79..dbee32e6 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -632,19 +632,20 @@ Shader "Hidden/lilToonTessellationCutout" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -653,12 +654,18 @@ Shader "Hidden/lilToonTessellationCutout" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -676,7 +683,13 @@ Shader "Hidden/lilToonTessellationCutout" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/lilToon/Shader/lts_tess_cutout_o.shader index 8c7777ed..41b919ff 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -634,19 +634,20 @@ Shader "Hidden/lilToonTessellationCutoutOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -655,12 +656,18 @@ Shader "Hidden/lilToonTessellationCutoutOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -678,7 +685,13 @@ Shader "Hidden/lilToonTessellationCutoutOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_o.shader b/Assets/lilToon/Shader/lts_tess_o.shader index e9ee0b68..85eb3e5a 100644 --- a/Assets/lilToon/Shader/lts_tess_o.shader +++ b/Assets/lilToon/Shader/lts_tess_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -634,19 +634,20 @@ Shader "Hidden/lilToonTessellationOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -655,12 +656,18 @@ Shader "Hidden/lilToonTessellationOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -678,7 +685,13 @@ Shader "Hidden/lilToonTessellationOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_onetrans.shader b/Assets/lilToon/Shader/lts_tess_onetrans.shader index 04615681..9171d099 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -664,19 +664,20 @@ Shader "Hidden/lilToonTessellationOnePassTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -685,12 +686,18 @@ Shader "Hidden/lilToonTessellationOnePassTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -708,7 +715,13 @@ Shader "Hidden/lilToonTessellationOnePassTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader index 6cd90b96..d0d23062 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -665,19 +665,20 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -686,12 +687,18 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -709,7 +716,13 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_trans.shader b/Assets/lilToon/Shader/lts_tess_trans.shader index 1ea4adde..8d3bd95b 100644 --- a/Assets/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/lilToon/Shader/lts_tess_trans.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -665,19 +665,20 @@ Shader "Hidden/lilToonTessellationTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -686,12 +687,18 @@ Shader "Hidden/lilToonTessellationTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -709,7 +716,13 @@ Shader "Hidden/lilToonTessellationTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_trans_o.shader b/Assets/lilToon/Shader/lts_tess_trans_o.shader index 28610110..6cdbf820 100644 --- a/Assets/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_trans_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -667,19 +667,20 @@ Shader "Hidden/lilToonTessellationTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -688,12 +689,18 @@ Shader "Hidden/lilToonTessellationTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -711,7 +718,13 @@ Shader "Hidden/lilToonTessellationTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_twotrans.shader b/Assets/lilToon/Shader/lts_tess_twotrans.shader index 45698c4d..0d81db86 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -666,19 +666,20 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -687,12 +688,18 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -710,7 +717,13 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader index 792fc0b8..ca6b1469 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -668,19 +668,20 @@ Shader "Hidden/lilToonTessellationTwoPassTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -689,12 +690,18 @@ Shader "Hidden/lilToonTessellationTwoPassTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -712,7 +719,13 @@ Shader "Hidden/lilToonTessellationTwoPassTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_trans.shader b/Assets/lilToon/Shader/lts_trans.shader index 52bd962b..5f0e324c 100644 --- a/Assets/lilToon/Shader/lts_trans.shader +++ b/Assets/lilToon/Shader/lts_trans.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -665,19 +665,20 @@ Shader "Hidden/lilToonTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -686,12 +687,18 @@ Shader "Hidden/lilToonTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -709,7 +716,13 @@ Shader "Hidden/lilToonTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_trans_o.shader b/Assets/lilToon/Shader/lts_trans_o.shader index 8f375653..7926ae4b 100644 --- a/Assets/lilToon/Shader/lts_trans_o.shader +++ b/Assets/lilToon/Shader/lts_trans_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -667,19 +667,20 @@ Shader "Hidden/lilToonTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -688,12 +689,18 @@ Shader "Hidden/lilToonTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -711,7 +718,13 @@ Shader "Hidden/lilToonTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_trans_oo.shader b/Assets/lilToon/Shader/lts_trans_oo.shader index cbce6608..c7f607b1 100644 --- a/Assets/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/lilToon/Shader/lts_trans_oo.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -663,19 +663,20 @@ Shader "_lil/[Optional] lilToonOutlineOnlyTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -684,12 +685,18 @@ Shader "_lil/[Optional] lilToonOutlineOnlyTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -707,7 +714,13 @@ Shader "_lil/[Optional] lilToonOutlineOnlyTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_twotrans.shader b/Assets/lilToon/Shader/lts_twotrans.shader index 798fabef..b00d4722 100644 --- a/Assets/lilToon/Shader/lts_twotrans.shader +++ b/Assets/lilToon/Shader/lts_twotrans.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -666,19 +666,20 @@ Shader "Hidden/lilToonTwoPassTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -687,12 +688,18 @@ Shader "Hidden/lilToonTwoPassTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -710,7 +717,13 @@ Shader "Hidden/lilToonTwoPassTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/lts_twotrans_o.shader b/Assets/lilToon/Shader/lts_twotrans_o.shader index 5db80659..8ca3d2d9 100644 --- a/Assets/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_twotrans_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -668,19 +668,20 @@ Shader "Hidden/lilToonTwoPassTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -689,12 +690,18 @@ Shader "Hidden/lilToonTwoPassTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -712,7 +719,13 @@ Shader "Hidden/lilToonTwoPassTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl.shader b/Assets/lilToon/Shader/ltsl.shader index b5c9c45e..e9c54b24 100644 --- a/Assets/lilToon/Shader/ltsl.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -161,19 +161,20 @@ Shader "Hidden/lilToonLite" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -182,12 +183,18 @@ Shader "Hidden/lilToonLite" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -205,7 +212,13 @@ Shader "Hidden/lilToonLite" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_cutout.shader b/Assets/lilToon/Shader/ltsl_cutout.shader index 2ab87a15..7a798f00 100644 --- a/Assets/lilToon/Shader/ltsl_cutout.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -161,19 +161,20 @@ Shader "Hidden/lilToonLiteCutout" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -182,12 +183,18 @@ Shader "Hidden/lilToonLiteCutout" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -205,7 +212,13 @@ Shader "Hidden/lilToonLiteCutout" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_cutout_o.shader b/Assets/lilToon/Shader/ltsl_cutout_o.shader index ce99eb2e..78867b65 100644 --- a/Assets/lilToon/Shader/ltsl_cutout_o.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -163,19 +163,20 @@ Shader "Hidden/lilToonLiteCutoutOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -184,12 +185,18 @@ Shader "Hidden/lilToonLiteCutoutOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -207,7 +214,13 @@ Shader "Hidden/lilToonLiteCutoutOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_o.shader b/Assets/lilToon/Shader/ltsl_o.shader index b06b8fd5..6a379b21 100644 --- a/Assets/lilToon/Shader/ltsl_o.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -163,19 +163,20 @@ Shader "Hidden/lilToonLiteOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -184,12 +185,18 @@ Shader "Hidden/lilToonLiteOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -207,7 +214,13 @@ Shader "Hidden/lilToonLiteOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_onetrans.shader b/Assets/lilToon/Shader/ltsl_onetrans.shader index 9cc145de..e6134d92 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -193,19 +193,20 @@ Shader "Hidden/lilToonLiteOnePassTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -214,12 +215,18 @@ Shader "Hidden/lilToonLiteOnePassTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -237,7 +244,13 @@ Shader "Hidden/lilToonLiteOnePassTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_onetrans_o.shader b/Assets/lilToon/Shader/ltsl_onetrans_o.shader index 53bd6021..1e9436eb 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans_o.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -194,19 +194,20 @@ Shader "Hidden/lilToonLiteOnePassTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -215,12 +216,18 @@ Shader "Hidden/lilToonLiteOnePassTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -238,7 +245,13 @@ Shader "Hidden/lilToonLiteOnePassTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_overlay.shader b/Assets/lilToon/Shader/ltsl_overlay.shader index d41d7b35..d9f3e7fb 100644 --- a/Assets/lilToon/Shader/ltsl_overlay.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -192,19 +192,20 @@ Shader "_lil/[Optional] lilToonLiteOverlay" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -213,12 +214,18 @@ Shader "_lil/[Optional] lilToonLiteOverlay" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -236,7 +243,13 @@ Shader "_lil/[Optional] lilToonLiteOverlay" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_overlay_one.shader b/Assets/lilToon/Shader/ltsl_overlay_one.shader index c7968228..ca8b3a32 100644 --- a/Assets/lilToon/Shader/ltsl_overlay_one.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -191,19 +191,20 @@ Shader "_lil/[Optional] lilToonLiteOverlayOnePass" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -212,12 +213,18 @@ Shader "_lil/[Optional] lilToonLiteOverlayOnePass" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -235,7 +242,13 @@ Shader "_lil/[Optional] lilToonLiteOverlayOnePass" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_trans.shader b/Assets/lilToon/Shader/ltsl_trans.shader index 2670b491..18f56071 100644 --- a/Assets/lilToon/Shader/ltsl_trans.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -194,19 +194,20 @@ Shader "Hidden/lilToonLiteTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -215,12 +216,18 @@ Shader "Hidden/lilToonLiteTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -238,7 +245,13 @@ Shader "Hidden/lilToonLiteTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_trans_o.shader b/Assets/lilToon/Shader/ltsl_trans_o.shader index 83b530df..1694ca91 100644 --- a/Assets/lilToon/Shader/ltsl_trans_o.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -196,19 +196,20 @@ Shader "Hidden/lilToonLiteTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -217,12 +218,18 @@ Shader "Hidden/lilToonLiteTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -240,7 +247,13 @@ Shader "Hidden/lilToonLiteTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_twotrans.shader b/Assets/lilToon/Shader/ltsl_twotrans.shader index 1b813b90..9c721e98 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -195,19 +195,20 @@ Shader "Hidden/lilToonLiteTwoPassTransparent" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -216,12 +217,18 @@ Shader "Hidden/lilToonLiteTwoPassTransparent" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -239,7 +246,13 @@ Shader "Hidden/lilToonLiteTwoPassTransparent" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsl_twotrans_o.shader b/Assets/lilToon/Shader/ltsl_twotrans_o.shader index 7b7fe039..1c1fd0bc 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans_o.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced @@ -197,19 +197,20 @@ Shader "Hidden/lilToonLiteTwoPassTransparentOutline" Pass { Tags { "LightMode" = "Never" } + HLSLPROGRAM -// Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels -// are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into -// each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. -// -// Unity bug report ID: IN-60271 -#pragma vertex vert -#pragma fragment frag + // Unity strips unused UV channels from meshes; unfortunately, in 2022.3.13f1, Unity fails to detect that UV channels + // are used when they are referenced from a pass included via `UsePass`. This fake pass is #included directly into + // each shader to work around this; because this has an invalid lightmode set, it will never actually be executed. + // + // Unity bug report ID: IN-60271 + #pragma vertex vert + #pragma fragment frag -// For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... -//#include "Includes/lil_pipeline_brp.hlsl" -//#include "Includes/lil_common.hlsl" -//#include "Includes/lil_common_appdata.hlsl" + // For some reason, using struct appdata from lil_common_appdata doesn't work as a workaround... + //#include "Includes/lil_pipeline_brp.hlsl" + //#include "Includes/lil_common.hlsl" + //#include "Includes/lil_common_appdata.hlsl" struct appdata @@ -218,12 +219,18 @@ Shader "Hidden/lilToonLiteTwoPassTransparentOutline" float2 uv1 : TEXCOORD1; float2 uv2 : TEXCOORD2; float2 uv3 : TEXCOORD3; - + float2 uv4 : TEXCOORD4; float2 uv5 : TEXCOORD5; float2 uv6 : TEXCOORD6; float2 uv7 : TEXCOORD7; - + + float4 color : COLOR; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + uint vertexID : SV_VertexID; + #endif float4 pos : POSITION; }; @@ -241,7 +248,13 @@ Shader "Hidden/lilToonLiteTwoPassTransparentOutline" // shader so it shows up as an input in the compiled shader program. output.pos = float4(0,0,0,1); output.col = float4(input.uv, input.uv1) + float4(input.uv2, input.uv3) - + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7); + + float4(input.uv4, input.uv5) + float4(input.uv6, input.uv7) + + input.color + float4(input.normalOS, 1) + input.tangentOS; + + #if !defined(SHADER_API_MOBILE) && !defined(SHADER_API_GLES) + output.col.a += input.vertexID; + #endif + return output; } diff --git a/Assets/lilToon/Shader/ltsmulti.shader b/Assets/lilToon/Shader/ltsmulti.shader index cba7c5f1..876e80a1 100644 --- a/Assets/lilToon/Shader/ltsmulti.shader +++ b/Assets/lilToon/Shader/ltsmulti.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_fur.shader b/Assets/lilToon/Shader/ltsmulti_fur.shader index 15f07412..a9e068f8 100644 --- a/Assets/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/lilToon/Shader/ltsmulti_fur.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_gem.shader b/Assets/lilToon/Shader/ltsmulti_gem.shader index 4e99acda..2db57d0c 100644 --- a/Assets/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/lilToon/Shader/ltsmulti_gem.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_o.shader b/Assets/lilToon/Shader/ltsmulti_o.shader index d7642d7e..beda2631 100644 --- a/Assets/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/lilToon/Shader/ltsmulti_o.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_ref.shader b/Assets/lilToon/Shader/ltsmulti_ref.shader index 9910146d..3a9a66de 100644 --- a/Assets/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/lilToon/Shader/ltsmulti_ref.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_cutout.shader b/Assets/lilToon/Shader/ltspass_cutout.shader index db714b47..00ba975b 100644 --- a/Assets/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_cutout.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_cutout.shader b/Assets/lilToon/Shader/ltspass_lite_cutout.shader index b0bbfb7c..35f13127 100644 --- a/Assets/lilToon/Shader/ltspass_lite_cutout.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_opaque.shader b/Assets/lilToon/Shader/ltspass_lite_opaque.shader index 8f99311b..9ae9e66c 100644 --- a/Assets/lilToon/Shader/ltspass_lite_opaque.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_transparent.shader b/Assets/lilToon/Shader/ltspass_lite_transparent.shader index df23b25b..054540be 100644 --- a/Assets/lilToon/Shader/ltspass_lite_transparent.shader +++ b/Assets/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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_opaque.shader b/Assets/lilToon/Shader/ltspass_opaque.shader index ef70ed57..8a3f9793 100644 --- a/Assets/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_opaque.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_proponly.shader b/Assets/lilToon/Shader/ltspass_proponly.shader index dd910855..ca498fc8 100644 --- a/Assets/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/lilToon/Shader/ltspass_proponly.shader @@ -554,7 +554,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/lilToon/Shader/ltspass_tess_cutout.shader index e2f0e2f2..e03fab42 100644 --- a/Assets/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_tess_cutout.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/lilToon/Shader/ltspass_tess_opaque.shader index a512630d..c5e8deb7 100644 --- a/Assets/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_tess_opaque.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/lilToon/Shader/ltspass_tess_transparent.shader index 612fa761..100469e9 100644 --- a/Assets/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_tess_transparent.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_transparent.shader b/Assets/lilToon/Shader/ltspass_transparent.shader index 721740e6..24bb99f9 100644 --- a/Assets/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_transparent.shader @@ -558,7 +558,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) = 37 + [HideInInspector] _lilToonVersion ("Version", Int) = 38 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/package.json b/Assets/lilToon/package.json index 965346b2..5e4b1372 100644 --- a/Assets/lilToon/package.json +++ b/Assets/lilToon/package.json @@ -1,6 +1,6 @@ { "name": "jp.lilxyzw.liltoon", - "version": "1.5.1", + "version": "1.5.2", "displayName": "lilToon", "description": "Feature-rich toon shader.", "unity": "2018.1", @@ -9,7 +9,7 @@ "licensesUrl": "https://github.com/lilxyzw/lilToon/blob/master/Assets/lilToon/LICENSE", "license": "MIT", "keywords": ["Toon", "Shader", "Material"], - "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.5.1/jp.lilxyzw.liltoon-1.5.1.zip?", + "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.5.2/jp.lilxyzw.liltoon-1.5.2.zip?", "repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json", "legacyFolders" : { "Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05" diff --git a/version.json b/version.json index 6dbad48b..20038319 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"latest_vertion_name": "1.5.1", "latest_vertion_value": 37} \ No newline at end of file +{"latest_vertion_name": "1.5.2", "latest_vertion_value": 38} \ No newline at end of file From ad431cff35e19c19917effa1e21f1e9244338b68 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 31 Dec 2023 00:52:16 +0900 Subject: [PATCH 11/13] fix: TargetParameterCountException because of lilToonAssetPostprocessor (#153) --- Assets/lilToon/CHANGELOG.md | 4 ++++ Assets/lilToon/CHANGELOG_JP.md | 4 ++++ Assets/lilToon/Editor/lilConstants.cs | 4 ++-- Assets/lilToon/Editor/lilToonAssetPostprocessor.cs | 2 +- Assets/lilToon/README.md | 2 +- Assets/lilToon/README_JP.md | 2 +- Assets/lilToon/Shader/lts.shader | 2 +- Assets/lilToon/Shader/lts_cutout.shader | 2 +- Assets/lilToon/Shader/lts_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_cutout_oo.shader | 2 +- Assets/lilToon/Shader/lts_fakeshadow.shader | 2 +- Assets/lilToon/Shader/lts_fur.shader | 2 +- Assets/lilToon/Shader/lts_fur_cutout.shader | 2 +- Assets/lilToon/Shader/lts_fur_two.shader | 2 +- Assets/lilToon/Shader/lts_furonly.shader | 2 +- Assets/lilToon/Shader/lts_furonly_cutout.shader | 2 +- Assets/lilToon/Shader/lts_furonly_two.shader | 2 +- Assets/lilToon/Shader/lts_gem.shader | 2 +- Assets/lilToon/Shader/lts_o.shader | 2 +- Assets/lilToon/Shader/lts_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_oo.shader | 2 +- Assets/lilToon/Shader/lts_overlay.shader | 2 +- Assets/lilToon/Shader/lts_overlay_one.shader | 2 +- Assets/lilToon/Shader/lts_ref.shader | 2 +- Assets/lilToon/Shader/lts_ref_blur.shader | 2 +- Assets/lilToon/Shader/lts_tess.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout.shader | 2 +- Assets/lilToon/Shader/lts_tess_cutout_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_onetrans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans.shader | 2 +- Assets/lilToon/Shader/lts_tess_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_tess_twotrans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans.shader | 2 +- Assets/lilToon/Shader/lts_trans_o.shader | 2 +- Assets/lilToon/Shader/lts_trans_oo.shader | 2 +- Assets/lilToon/Shader/lts_twotrans.shader | 2 +- Assets/lilToon/Shader/lts_twotrans_o.shader | 2 +- Assets/lilToon/Shader/ltsl.shader | 2 +- Assets/lilToon/Shader/ltsl_cutout.shader | 2 +- Assets/lilToon/Shader/ltsl_cutout_o.shader | 2 +- Assets/lilToon/Shader/ltsl_o.shader | 2 +- Assets/lilToon/Shader/ltsl_onetrans.shader | 2 +- Assets/lilToon/Shader/ltsl_onetrans_o.shader | 2 +- Assets/lilToon/Shader/ltsl_overlay.shader | 2 +- Assets/lilToon/Shader/ltsl_overlay_one.shader | 2 +- Assets/lilToon/Shader/ltsl_trans.shader | 2 +- Assets/lilToon/Shader/ltsl_trans_o.shader | 2 +- Assets/lilToon/Shader/ltsl_twotrans.shader | 2 +- Assets/lilToon/Shader/ltsl_twotrans_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti.shader | 2 +- Assets/lilToon/Shader/ltsmulti_fur.shader | 2 +- Assets/lilToon/Shader/ltsmulti_gem.shader | 2 +- Assets/lilToon/Shader/ltsmulti_o.shader | 2 +- Assets/lilToon/Shader/ltsmulti_ref.shader | 2 +- Assets/lilToon/Shader/ltspass_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_lite_transparent.shader | 2 +- Assets/lilToon/Shader/ltspass_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_proponly.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_cutout.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_opaque.shader | 2 +- Assets/lilToon/Shader/ltspass_tess_transparent.shader | 2 +- Assets/lilToon/Shader/ltspass_transparent.shader | 2 +- Assets/lilToon/package.json | 4 ++-- version.json | 2 +- 70 files changed, 78 insertions(+), 70 deletions(-) diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md index 6c8235b2..99d14e70 100644 --- a/Assets/lilToon/CHANGELOG.md +++ b/Assets/lilToon/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.3] - 2023-12-31 +### Fixed +- AssetPostprocessor not working properly + ## [1.5.2] - 2023-12-30 ### Fixed - Fixed an issue where necessary vertex data might be deleted when building AssetBundle diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md index 4bdb7a09..6f84b6df 100644 --- a/Assets/lilToon/CHANGELOG_JP.md +++ b/Assets/lilToon/CHANGELOG_JP.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.3] - 2023-12-31 +### 修正 +- AssetPostprocessorが正しく動作していなかったのを修正 + ## [1.5.2] - 2023-12-30 ### 修正 - AssetBundleビルド時に必要な頂点データが消されてしまう場合があるのを修正 diff --git a/Assets/lilToon/Editor/lilConstants.cs b/Assets/lilToon/Editor/lilConstants.cs index ae80e10d..bbd6eb89 100644 --- a/Assets/lilToon/Editor/lilConstants.cs +++ b/Assets/lilToon/Editor/lilConstants.cs @@ -6,8 +6,8 @@ namespace lilToon { public class lilConstants { - public const string currentVersionName = "1.5.2"; - public const int currentVersionValue = 38; + public const string currentVersionName = "1.5.3"; + public const int currentVersionValue = 39; internal const string boothURL = "https://lilxyzw.booth.pm/"; internal const string githubURL = "https://github.com/lilxyzw/lilToon"; diff --git a/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs b/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs index 87ed15b8..5eed6db0 100644 --- a/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs +++ b/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs @@ -6,7 +6,7 @@ namespace lilToon { internal class lilToonAssetPostprocessor : AssetPostprocessor { - static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths, bool didDomainReload) + static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths) { var id = Shader.PropertyToID("_lilToonVersion"); foreach(var path in importedAssets) diff --git a/Assets/lilToon/README.md b/Assets/lilToon/README.md index 8d3e42c9..0b228ee6 100644 --- a/Assets/lilToon/README.md +++ b/Assets/lilToon/README.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.2 +Version 1.5.3 # Overview This shader is developed for services using avatars (VRChat, etc.) and has the following features. diff --git a/Assets/lilToon/README_JP.md b/Assets/lilToon/README_JP.md index f155d423..80e4d373 100644 --- a/Assets/lilToon/README_JP.md +++ b/Assets/lilToon/README_JP.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.2 +Version 1.5.3 # 概要 アバターを用いたサービス(VRChat等)向けに開発したシェーダーで以下のような特徴があります。 diff --git a/Assets/lilToon/Shader/lts.shader b/Assets/lilToon/Shader/lts.shader index 3c0bc1b7..7fdee9b5 100644 --- a/Assets/lilToon/Shader/lts.shader +++ b/Assets/lilToon/Shader/lts.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout.shader b/Assets/lilToon/Shader/lts_cutout.shader index e1e26e33..03e2e7b1 100644 --- a/Assets/lilToon/Shader/lts_cutout.shader +++ b/Assets/lilToon/Shader/lts_cutout.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout_o.shader b/Assets/lilToon/Shader/lts_cutout_o.shader index 2040f730..1ec601f6 100644 --- a/Assets/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_cutout_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_cutout_oo.shader b/Assets/lilToon/Shader/lts_cutout_oo.shader index 1a95dfb2..c460074f 100644 --- a/Assets/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/lilToon/Shader/lts_cutout_oo.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fakeshadow.shader b/Assets/lilToon/Shader/lts_fakeshadow.shader index 677ddd38..c1fa7de4 100644 --- a/Assets/lilToon/Shader/lts_fakeshadow.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 } SubShader diff --git a/Assets/lilToon/Shader/lts_fur.shader b/Assets/lilToon/Shader/lts_fur.shader index d052c103..69291fdf 100644 --- a/Assets/lilToon/Shader/lts_fur.shader +++ b/Assets/lilToon/Shader/lts_fur.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_cutout.shader b/Assets/lilToon/Shader/lts_fur_cutout.shader index 69e66505..ada39d43 100644 --- a/Assets/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/lilToon/Shader/lts_fur_cutout.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_fur_two.shader b/Assets/lilToon/Shader/lts_fur_two.shader index c00ad3eb..3277cbe6 100644 --- a/Assets/lilToon/Shader/lts_fur_two.shader +++ b/Assets/lilToon/Shader/lts_fur_two.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly.shader b/Assets/lilToon/Shader/lts_furonly.shader index 82f0582a..8ae3c060 100644 --- a/Assets/lilToon/Shader/lts_furonly.shader +++ b/Assets/lilToon/Shader/lts_furonly.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly_cutout.shader b/Assets/lilToon/Shader/lts_furonly_cutout.shader index ac906f50..1dbbb4ad 100644 --- a/Assets/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/lilToon/Shader/lts_furonly_cutout.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_furonly_two.shader b/Assets/lilToon/Shader/lts_furonly_two.shader index a1cee0e0..8bcfec89 100644 --- a/Assets/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/lilToon/Shader/lts_furonly_two.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_gem.shader b/Assets/lilToon/Shader/lts_gem.shader index de89be23..7ab5b350 100644 --- a/Assets/lilToon/Shader/lts_gem.shader +++ b/Assets/lilToon/Shader/lts_gem.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_o.shader b/Assets/lilToon/Shader/lts_o.shader index 247936f1..dbe6d6c2 100644 --- a/Assets/lilToon/Shader/lts_o.shader +++ b/Assets/lilToon/Shader/lts_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_onetrans.shader b/Assets/lilToon/Shader/lts_onetrans.shader index 628eb52a..598882f1 100644 --- a/Assets/lilToon/Shader/lts_onetrans.shader +++ b/Assets/lilToon/Shader/lts_onetrans.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_onetrans_o.shader b/Assets/lilToon/Shader/lts_onetrans_o.shader index 9251f170..ade332a6 100644 --- a/Assets/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_onetrans_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_oo.shader b/Assets/lilToon/Shader/lts_oo.shader index ea87f07e..b8004d86 100644 --- a/Assets/lilToon/Shader/lts_oo.shader +++ b/Assets/lilToon/Shader/lts_oo.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_overlay.shader b/Assets/lilToon/Shader/lts_overlay.shader index 96a00e41..238ee491 100644 --- a/Assets/lilToon/Shader/lts_overlay.shader +++ b/Assets/lilToon/Shader/lts_overlay.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_overlay_one.shader b/Assets/lilToon/Shader/lts_overlay_one.shader index 8e2e6300..b69e5c1e 100644 --- a/Assets/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/lilToon/Shader/lts_overlay_one.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_ref.shader b/Assets/lilToon/Shader/lts_ref.shader index 4ef13e88..3bbafef2 100644 --- a/Assets/lilToon/Shader/lts_ref.shader +++ b/Assets/lilToon/Shader/lts_ref.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_ref_blur.shader b/Assets/lilToon/Shader/lts_ref_blur.shader index 68e4466e..fd8fe757 100644 --- a/Assets/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/lilToon/Shader/lts_ref_blur.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess.shader b/Assets/lilToon/Shader/lts_tess.shader index daf830c9..8e535964 100644 --- a/Assets/lilToon/Shader/lts_tess.shader +++ b/Assets/lilToon/Shader/lts_tess.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_cutout.shader b/Assets/lilToon/Shader/lts_tess_cutout.shader index dbee32e6..d497daee 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/lilToon/Shader/lts_tess_cutout_o.shader index 41b919ff..513e093a 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_o.shader b/Assets/lilToon/Shader/lts_tess_o.shader index 85eb3e5a..4dedd10c 100644 --- a/Assets/lilToon/Shader/lts_tess_o.shader +++ b/Assets/lilToon/Shader/lts_tess_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_onetrans.shader b/Assets/lilToon/Shader/lts_tess_onetrans.shader index 9171d099..44f1adda 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader index d0d23062..bf5c3f7b 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_trans.shader b/Assets/lilToon/Shader/lts_tess_trans.shader index 8d3bd95b..80c2ea92 100644 --- a/Assets/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/lilToon/Shader/lts_tess_trans.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_trans_o.shader b/Assets/lilToon/Shader/lts_tess_trans_o.shader index 6cdbf820..9f8a821e 100644 --- a/Assets/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_trans_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_twotrans.shader b/Assets/lilToon/Shader/lts_tess_twotrans.shader index 0d81db86..434c9810 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader index ca6b1469..6535ea0e 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans.shader b/Assets/lilToon/Shader/lts_trans.shader index 5f0e324c..a81fc475 100644 --- a/Assets/lilToon/Shader/lts_trans.shader +++ b/Assets/lilToon/Shader/lts_trans.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans_o.shader b/Assets/lilToon/Shader/lts_trans_o.shader index 7926ae4b..a22ada69 100644 --- a/Assets/lilToon/Shader/lts_trans_o.shader +++ b/Assets/lilToon/Shader/lts_trans_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_trans_oo.shader b/Assets/lilToon/Shader/lts_trans_oo.shader index c7f607b1..2a5fe448 100644 --- a/Assets/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/lilToon/Shader/lts_trans_oo.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_twotrans.shader b/Assets/lilToon/Shader/lts_twotrans.shader index b00d4722..17964f98 100644 --- a/Assets/lilToon/Shader/lts_twotrans.shader +++ b/Assets/lilToon/Shader/lts_twotrans.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/lts_twotrans_o.shader b/Assets/lilToon/Shader/lts_twotrans_o.shader index 8ca3d2d9..8db72f3e 100644 --- a/Assets/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_twotrans_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl.shader b/Assets/lilToon/Shader/ltsl.shader index e9c54b24..13ec9853 100644 --- a/Assets/lilToon/Shader/ltsl.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_cutout.shader b/Assets/lilToon/Shader/ltsl_cutout.shader index 7a798f00..2a76eef6 100644 --- a/Assets/lilToon/Shader/ltsl_cutout.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_cutout_o.shader b/Assets/lilToon/Shader/ltsl_cutout_o.shader index 78867b65..78a4a412 100644 --- a/Assets/lilToon/Shader/ltsl_cutout_o.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_o.shader b/Assets/lilToon/Shader/ltsl_o.shader index 6a379b21..5aa51d39 100644 --- a/Assets/lilToon/Shader/ltsl_o.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_onetrans.shader b/Assets/lilToon/Shader/ltsl_onetrans.shader index e6134d92..621e28e5 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_onetrans_o.shader b/Assets/lilToon/Shader/ltsl_onetrans_o.shader index 1e9436eb..50319f54 100644 --- a/Assets/lilToon/Shader/ltsl_onetrans_o.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_overlay.shader b/Assets/lilToon/Shader/ltsl_overlay.shader index d9f3e7fb..1399f8b5 100644 --- a/Assets/lilToon/Shader/ltsl_overlay.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_overlay_one.shader b/Assets/lilToon/Shader/ltsl_overlay_one.shader index ca8b3a32..3274ee14 100644 --- a/Assets/lilToon/Shader/ltsl_overlay_one.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_trans.shader b/Assets/lilToon/Shader/ltsl_trans.shader index 18f56071..5570273d 100644 --- a/Assets/lilToon/Shader/ltsl_trans.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_trans_o.shader b/Assets/lilToon/Shader/ltsl_trans_o.shader index 1694ca91..5ceedada 100644 --- a/Assets/lilToon/Shader/ltsl_trans_o.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_twotrans.shader b/Assets/lilToon/Shader/ltsl_twotrans.shader index 9c721e98..97ad492b 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsl_twotrans_o.shader b/Assets/lilToon/Shader/ltsl_twotrans_o.shader index 1c1fd0bc..2b41cc7f 100644 --- a/Assets/lilToon/Shader/ltsl_twotrans_o.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti.shader b/Assets/lilToon/Shader/ltsmulti.shader index 876e80a1..7e3372d3 100644 --- a/Assets/lilToon/Shader/ltsmulti.shader +++ b/Assets/lilToon/Shader/ltsmulti.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_fur.shader b/Assets/lilToon/Shader/ltsmulti_fur.shader index a9e068f8..a5c88d0f 100644 --- a/Assets/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/lilToon/Shader/ltsmulti_fur.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_gem.shader b/Assets/lilToon/Shader/ltsmulti_gem.shader index 2db57d0c..39cc34b3 100644 --- a/Assets/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/lilToon/Shader/ltsmulti_gem.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_o.shader b/Assets/lilToon/Shader/ltsmulti_o.shader index beda2631..7a7ed374 100644 --- a/Assets/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/lilToon/Shader/ltsmulti_o.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltsmulti_ref.shader b/Assets/lilToon/Shader/ltsmulti_ref.shader index 3a9a66de..2dd3faa3 100644 --- a/Assets/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/lilToon/Shader/ltsmulti_ref.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_cutout.shader b/Assets/lilToon/Shader/ltspass_cutout.shader index 00ba975b..0ad74d66 100644 --- a/Assets/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_cutout.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_cutout.shader b/Assets/lilToon/Shader/ltspass_lite_cutout.shader index 35f13127..24ad8576 100644 --- a/Assets/lilToon/Shader/ltspass_lite_cutout.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_opaque.shader b/Assets/lilToon/Shader/ltspass_lite_opaque.shader index 9ae9e66c..426ec129 100644 --- a/Assets/lilToon/Shader/ltspass_lite_opaque.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_lite_transparent.shader b/Assets/lilToon/Shader/ltspass_lite_transparent.shader index 054540be..318aa87a 100644 --- a/Assets/lilToon/Shader/ltspass_lite_transparent.shader +++ b/Assets/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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_opaque.shader b/Assets/lilToon/Shader/ltspass_opaque.shader index 8a3f9793..65ac7364 100644 --- a/Assets/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_opaque.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_proponly.shader b/Assets/lilToon/Shader/ltspass_proponly.shader index ca498fc8..6f0efa3b 100644 --- a/Assets/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/lilToon/Shader/ltspass_proponly.shader @@ -554,7 +554,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/lilToon/Shader/ltspass_tess_cutout.shader index e03fab42..e624fe93 100644 --- a/Assets/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_tess_cutout.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/lilToon/Shader/ltspass_tess_opaque.shader index c5e8deb7..6d9b625f 100644 --- a/Assets/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_tess_opaque.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/lilToon/Shader/ltspass_tess_transparent.shader index 100469e9..f1fbd8d3 100644 --- a/Assets/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_tess_transparent.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/Shader/ltspass_transparent.shader b/Assets/lilToon/Shader/ltspass_transparent.shader index 24bb99f9..804ea6cd 100644 --- a/Assets/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_transparent.shader @@ -558,7 +558,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) = 38 + [HideInInspector] _lilToonVersion ("Version", Int) = 39 //---------------------------------------------------------------------------------------------------------------------- // Advanced diff --git a/Assets/lilToon/package.json b/Assets/lilToon/package.json index 5e4b1372..266dd54d 100644 --- a/Assets/lilToon/package.json +++ b/Assets/lilToon/package.json @@ -1,6 +1,6 @@ { "name": "jp.lilxyzw.liltoon", - "version": "1.5.2", + "version": "1.5.3", "displayName": "lilToon", "description": "Feature-rich toon shader.", "unity": "2018.1", @@ -9,7 +9,7 @@ "licensesUrl": "https://github.com/lilxyzw/lilToon/blob/master/Assets/lilToon/LICENSE", "license": "MIT", "keywords": ["Toon", "Shader", "Material"], - "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.5.2/jp.lilxyzw.liltoon-1.5.2.zip?", + "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.5.3/jp.lilxyzw.liltoon-1.5.3.zip?", "repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json", "legacyFolders" : { "Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05" diff --git a/version.json b/version.json index 20038319..0552ab0a 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"latest_vertion_name": "1.5.2", "latest_vertion_value": 38} \ No newline at end of file +{"latest_vertion_name": "1.5.3", "latest_vertion_value": 39} \ No newline at end of file From 563a5d0c6838d996531b17c1cdab88cae2502a5c Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 31 Dec 2023 09:56:43 +0900 Subject: [PATCH 12/13] fix: Avoid problems caused by incompatibility of shader keywords --- Assets/lilToon/CHANGELOG.md | 1 + Assets/lilToon/CHANGELOG_JP.md | 1 + Assets/lilToon/Editor/lilToonAssetPostprocessor.cs | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md index 99d14e70..bfc23afa 100644 --- a/Assets/lilToon/CHANGELOG.md +++ b/Assets/lilToon/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.5.3] - 2023-12-31 ### Fixed - AssetPostprocessor not working properly +- Avoid problems caused by incompatibility of shader keywords ## [1.5.2] - 2023-12-30 ### Fixed diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md index 6f84b6df..1345de25 100644 --- a/Assets/lilToon/CHANGELOG_JP.md +++ b/Assets/lilToon/CHANGELOG_JP.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.5.3] - 2023-12-31 ### 修正 - AssetPostprocessorが正しく動作していなかったのを修正 +- シェーダーキーワードの非互換による不具合を回避 ## [1.5.2] - 2023-12-30 ### 修正 diff --git a/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs b/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs index 5eed6db0..ce2521ed 100644 --- a/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs +++ b/Assets/lilToon/Editor/lilToonAssetPostprocessor.cs @@ -13,7 +13,13 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse { if(!path.EndsWith(".mat")) continue; var material = AssetDatabase.LoadAssetAtPath(path); + if(!lilMaterialUtils.CheckShaderIslilToon(material)) continue; + lilStartup.MigrateMaterial(material, id); + if(material.shader.name.Contains("Multi")) + { + lilMaterialUtils.SetupMultiMaterial(material); + } } } } From d6f6cb0b2d27287596197095fd6b66ad0d531ab6 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 31 Dec 2023 12:07:52 +0900 Subject: [PATCH 13/13] feat: rimshade --- Assets/lilToon/CHANGELOG.md | 5 ++- Assets/lilToon/CHANGELOG_JP.md | 5 ++- .../BRP/DefaultMulti.lilblock | 3 ++ .../BRP/DefaultMultiFur.lilblock | 3 ++ .../BRP/DefaultMultiOutline.lilblock | 3 ++ .../BRP/DefaultMultiRefraction.lilblock | 3 ++ .../HDRP/DefaultMulti.lilblock | 2 + .../HDRP/DefaultMultiFur.lilblock | 2 + .../HDRP/DefaultMultiOutline.lilblock | 2 + .../HDRP/DefaultMultiRefraction.lilblock | 2 + .../LWRP/DefaultMulti.lilblock | 2 + .../LWRP/DefaultMultiFur.lilblock | 2 + .../LWRP/DefaultMultiOutline.lilblock | 2 + .../LWRP/DefaultMultiRefraction.lilblock | 2 + .../Properties/Default.lilblock | 10 +++++ .../Properties/DefaultAll.lilblock | 10 +++++ .../URP/DefaultMulti.lilblock | 2 + .../URP/DefaultMultiFur.lilblock | 2 + .../URP/DefaultMultiOutline.lilblock | 2 + .../URP/DefaultMultiRefraction.lilblock | 2 + Assets/lilToon/Editor/Resources/lang.txt | 1 + Assets/lilToon/Editor/lilConstants.cs | 2 +- Assets/lilToon/Editor/lilEnumeration.cs | 1 + Assets/lilToon/Editor/lilInspector.cs | 45 +++++++++++++++++++ Assets/lilToon/Editor/lilMaterialUtils.cs | 7 +++ .../lilToon/Editor/lilPropertyNameChecker.cs | 8 ++++ Assets/lilToon/Editor/lilToonSetting.cs | 10 +++++ Assets/lilToon/README.md | 2 +- Assets/lilToon/README_JP.md | 2 +- .../lilToon/Shader/Includes/lil_common.hlsl | 1 + .../Shader/Includes/lil_common_frag.hlsl | 37 +++++++++++++++ .../Shader/Includes/lil_common_input.hlsl | 10 +++++ .../Includes/lil_common_input_base.hlsl | 14 ++++++ .../Shader/Includes/lil_common_macro.hlsl | 4 +- .../Includes/lil_pass_forward_normal.hlsl | 7 +++ .../Shader/Includes/lil_replace_keywords.hlsl | 6 +++ Assets/lilToon/Shader/lts.shader | 10 +++++ Assets/lilToon/Shader/lts_cutout.shader | 10 +++++ Assets/lilToon/Shader/lts_cutout_o.shader | 10 +++++ Assets/lilToon/Shader/lts_cutout_oo.shader | 10 +++++ Assets/lilToon/Shader/lts_fakeshadow.shader | 1 + Assets/lilToon/Shader/lts_fur.shader | 11 +++++ Assets/lilToon/Shader/lts_fur_cutout.shader | 11 +++++ Assets/lilToon/Shader/lts_fur_two.shader | 11 +++++ Assets/lilToon/Shader/lts_furonly.shader | 10 +++++ .../lilToon/Shader/lts_furonly_cutout.shader | 10 +++++ Assets/lilToon/Shader/lts_furonly_two.shader | 10 +++++ Assets/lilToon/Shader/lts_gem.shader | 11 +++++ Assets/lilToon/Shader/lts_o.shader | 10 +++++ Assets/lilToon/Shader/lts_onetrans.shader | 10 +++++ Assets/lilToon/Shader/lts_onetrans_o.shader | 10 +++++ Assets/lilToon/Shader/lts_oo.shader | 10 +++++ Assets/lilToon/Shader/lts_overlay.shader | 10 +++++ Assets/lilToon/Shader/lts_overlay_one.shader | 10 +++++ Assets/lilToon/Shader/lts_ref.shader | 11 +++++ Assets/lilToon/Shader/lts_ref_blur.shader | 11 +++++ Assets/lilToon/Shader/lts_tess.shader | 10 +++++ Assets/lilToon/Shader/lts_tess_cutout.shader | 10 +++++ .../lilToon/Shader/lts_tess_cutout_o.shader | 10 +++++ Assets/lilToon/Shader/lts_tess_o.shader | 10 +++++ .../lilToon/Shader/lts_tess_onetrans.shader | 10 +++++ .../lilToon/Shader/lts_tess_onetrans_o.shader | 10 +++++ Assets/lilToon/Shader/lts_tess_trans.shader | 10 +++++ Assets/lilToon/Shader/lts_tess_trans_o.shader | 10 +++++ .../lilToon/Shader/lts_tess_twotrans.shader | 10 +++++ .../lilToon/Shader/lts_tess_twotrans_o.shader | 10 +++++ Assets/lilToon/Shader/lts_trans.shader | 10 +++++ Assets/lilToon/Shader/lts_trans_o.shader | 10 +++++ Assets/lilToon/Shader/lts_trans_oo.shader | 10 +++++ Assets/lilToon/Shader/lts_twotrans.shader | 10 +++++ Assets/lilToon/Shader/lts_twotrans_o.shader | 10 +++++ Assets/lilToon/Shader/ltsmulti.shader | 13 ++++++ Assets/lilToon/Shader/ltsmulti_fur.shader | 13 ++++++ Assets/lilToon/Shader/ltsmulti_gem.shader | 10 +++++ Assets/lilToon/Shader/ltsmulti_o.shader | 13 ++++++ Assets/lilToon/Shader/ltsmulti_ref.shader | 13 ++++++ Assets/lilToon/Shader/ltspass_baker.shader | 1 + Assets/lilToon/Shader/ltspass_cutout.shader | 11 +++++ Assets/lilToon/Shader/ltspass_opaque.shader | 11 +++++ Assets/lilToon/Shader/ltspass_proponly.shader | 10 +++++ .../lilToon/Shader/ltspass_tess_cutout.shader | 11 +++++ .../lilToon/Shader/ltspass_tess_opaque.shader | 11 +++++ .../Shader/ltspass_tess_transparent.shader | 11 +++++ .../lilToon/Shader/ltspass_transparent.shader | 11 +++++ Assets/lilToon/package.json | 4 +- version.json | 2 +- 86 files changed, 705 insertions(+), 10 deletions(-) diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md index bfc23afa..9a3cd17d 100644 --- a/Assets/lilToon/CHANGELOG.md +++ b/Assets/lilToon/CHANGELOG.md @@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.5.3] - 2023-12-31 +## [1.6.0] - 2023-12-31 +### Added +- RimShade feature + ### Fixed - AssetPostprocessor not working properly - Avoid problems caused by incompatibility of shader keywords diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md index 1345de25..678323dc 100644 --- a/Assets/lilToon/CHANGELOG_JP.md +++ b/Assets/lilToon/CHANGELOG_JP.md @@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.5.3] - 2023-12-31 +## [1.6.0] - 2023-12-31 +### 追加 +- RimShadeを追加 + ### 修正 - AssetPostprocessorが正しく動作していなかったのを修正 - シェーダーキーワードの非互換による不具合を回避 diff --git a/Assets/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock b/Assets/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock index cc821eca..275f4c3f 100644 --- a/Assets/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock +++ b/Assets/lilToon/CustomShaderResources/BRP/DefaultMulti.lilblock @@ -10,6 +10,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -86,6 +87,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -176,6 +178,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock b/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock index 1901f526..b7d90baa 100644 --- a/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock +++ b/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiFur.lilblock @@ -11,6 +11,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -87,6 +88,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -235,6 +237,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock b/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock index 4f23fda9..bbfce3b8 100644 --- a/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock +++ b/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiOutline.lilblock @@ -10,6 +10,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -87,6 +88,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -243,6 +245,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock b/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock index cff5b4b9..46329ba9 100644 --- a/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock +++ b/Assets/lilToon/CustomShaderResources/BRP/DefaultMultiRefraction.lilblock @@ -11,6 +11,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -84,6 +85,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -169,6 +171,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMulti.lilblock b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMulti.lilblock index 56b9671f..cb90ce87 100644 --- a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMulti.lilblock +++ b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMulti.lilblock @@ -12,6 +12,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -86,6 +87,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiFur.lilblock b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiFur.lilblock index 5cef8b99..57dfe683 100644 --- a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiFur.lilblock +++ b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiFur.lilblock @@ -14,6 +14,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -87,6 +88,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiOutline.lilblock b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiOutline.lilblock index bf05b97e..82944106 100644 --- a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiOutline.lilblock +++ b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiOutline.lilblock @@ -12,6 +12,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -86,6 +87,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiRefraction.lilblock b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiRefraction.lilblock index 2f91564c..45fb85bb 100644 --- a/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiRefraction.lilblock +++ b/Assets/lilToon/CustomShaderResources/HDRP/DefaultMultiRefraction.lilblock @@ -13,6 +13,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -80,6 +81,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMulti.lilblock b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMulti.lilblock index 8b0b8ddd..25a93176 100644 --- a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMulti.lilblock +++ b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMulti.lilblock @@ -11,6 +11,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -88,6 +89,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiFur.lilblock b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiFur.lilblock index 3fe73bdd..91a23034 100644 --- a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiFur.lilblock +++ b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiFur.lilblock @@ -13,6 +13,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -89,6 +90,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiOutline.lilblock b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiOutline.lilblock index cfd23e9b..7ddfc001 100644 --- a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiOutline.lilblock +++ b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiOutline.lilblock @@ -11,6 +11,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -88,6 +89,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiRefraction.lilblock b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiRefraction.lilblock index 33b80b69..9ddcc161 100644 --- a/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiRefraction.lilblock +++ b/Assets/lilToon/CustomShaderResources/LWRP/DefaultMultiRefraction.lilblock @@ -12,6 +12,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -82,6 +83,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock b/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock index 422bc39a..573ada3f 100644 --- a/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock +++ b/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock @@ -189,6 +189,16 @@ _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock b/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock index f170c56c..2f8957d3 100644 --- a/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock +++ b/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock @@ -189,6 +189,16 @@ _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultMulti.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultMulti.lilblock index 86d56784..1afcd1fb 100644 --- a/Assets/lilToon/CustomShaderResources/URP/DefaultMulti.lilblock +++ b/Assets/lilToon/CustomShaderResources/URP/DefaultMulti.lilblock @@ -11,6 +11,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -88,6 +89,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultMultiFur.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultMultiFur.lilblock index 2036a53f..e7e53756 100644 --- a/Assets/lilToon/CustomShaderResources/URP/DefaultMultiFur.lilblock +++ b/Assets/lilToon/CustomShaderResources/URP/DefaultMultiFur.lilblock @@ -13,6 +13,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -89,6 +90,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultMultiOutline.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultMultiOutline.lilblock index 3aa6f197..da09eaf8 100644 --- a/Assets/lilToon/CustomShaderResources/URP/DefaultMultiOutline.lilblock +++ b/Assets/lilToon/CustomShaderResources/URP/DefaultMultiOutline.lilblock @@ -11,6 +11,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -88,6 +89,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultMultiRefraction.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultMultiRefraction.lilblock index d60a97fc..1f62321e 100644 --- a/Assets/lilToon/CustomShaderResources/URP/DefaultMultiRefraction.lilblock +++ b/Assets/lilToon/CustomShaderResources/URP/DefaultMultiRefraction.lilblock @@ -12,6 +12,7 @@ #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -82,6 +83,7 @@ #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH diff --git a/Assets/lilToon/Editor/Resources/lang.txt b/Assets/lilToon/Editor/Resources/lang.txt index 1682c1ce..4af4f98d 100644 --- a/Assets/lilToon/Editor/Resources/lang.txt +++ b/Assets/lilToon/Editor/Resources/lang.txt @@ -495,6 +495,7 @@ sAnchorMainColor1 color/maincolor color/maincolor color/maincolor color/maincolo sAnchorMainColor2 color/maincolor_layer color/maincolor_layer color/maincolor_layer color/maincolor_layer color/maincolor_layer sAnchorAlphaMask color/alphamask color/alphamask color/alphamask color/alphamask color/alphamask sAnchorShadow color/shadow color/shadow color/shadow color/shadow color/shadow +sAnchorRimShade color/rimshade color/rimshade color/rimshade color/rimshade color/rimshade sAnchorEmission color/emission color/emission color/emission color/emission color/emission sAnchorNormalMap reflections/normal reflections/normal reflections/normal reflections/normal reflections/normal sAnchorAnisotropy reflections/anisotropy reflections/anisotropy reflections/anisotropy reflections/anisotropy reflections/anisotropy diff --git a/Assets/lilToon/Editor/lilConstants.cs b/Assets/lilToon/Editor/lilConstants.cs index bbd6eb89..0dc3c727 100644 --- a/Assets/lilToon/Editor/lilConstants.cs +++ b/Assets/lilToon/Editor/lilConstants.cs @@ -6,7 +6,7 @@ namespace lilToon { public class lilConstants { - public const string currentVersionName = "1.5.3"; + public const string currentVersionName = "1.6.0"; public const int currentVersionValue = 39; internal const string boothURL = "https://lilxyzw.booth.pm/"; diff --git a/Assets/lilToon/Editor/lilEnumeration.cs b/Assets/lilToon/Editor/lilEnumeration.cs index 5e771e71..05011f32 100644 --- a/Assets/lilToon/Editor/lilEnumeration.cs +++ b/Assets/lilToon/Editor/lilEnumeration.cs @@ -55,6 +55,7 @@ public enum PropertyBlock MainColor3rd, AlphaMask, Shadow, + RimShade, Emission, Emission1st, Emission2nd, diff --git a/Assets/lilToon/Editor/lilInspector.cs b/Assets/lilToon/Editor/lilInspector.cs index 5c34658e..b8b27d07 100644 --- a/Assets/lilToon/Editor/lilInspector.cs +++ b/Assets/lilToon/Editor/lilInspector.cs @@ -118,6 +118,7 @@ public class lilToonEditorSetting : ScriptableSingleton public bool isShowMainTone = false; public bool isShowShadow = false; public bool isShowShadowAO = false; + public bool isShowRimShade = false; public bool isShowBump = false; public bool isShowReflections = false; public bool isShowEmission = false; @@ -442,6 +443,14 @@ public struct PropertyBlockData private readonly lilMaterialProperty shadowFlatBlur = new lilMaterialProperty("_ShadowFlatBlur", PropertyBlock.Shadow); private readonly lilMaterialProperty lilShadowCasterBias = new lilMaterialProperty("_lilShadowCasterBias", PropertyBlock.Shadow, PropertyBlock.Rendering); + private readonly lilMaterialProperty useRimShade = new lilMaterialProperty("_UseRimShade", PropertyBlock.RimShade); + private readonly lilMaterialProperty rimShadeColor = new lilMaterialProperty("_RimShadeColor", PropertyBlock.RimShade); + private readonly lilMaterialProperty rimShadeMask = new lilMaterialProperty("_RimShadeMask", PropertyBlock.RimShade); + private readonly lilMaterialProperty rimShadeNormalStrength = new lilMaterialProperty("_RimShadeNormalStrength", PropertyBlock.RimShade); + private readonly lilMaterialProperty rimShadeBorder = new lilMaterialProperty("_RimShadeBorder", PropertyBlock.RimShade); + private readonly lilMaterialProperty rimShadeBlur = new lilMaterialProperty("_RimShadeBlur", PropertyBlock.RimShade); + private readonly lilMaterialProperty rimShadeFresnelPower = new lilMaterialProperty("_RimShadeFresnelPower", PropertyBlock.RimShade); + private readonly lilMaterialProperty useEmission = new lilMaterialProperty("_UseEmission", PropertyBlock.Emission, PropertyBlock.Emission1st); private readonly lilMaterialProperty emissionColor = new lilMaterialProperty("_EmissionColor", PropertyBlock.Emission, PropertyBlock.Emission1st); private readonly lilMaterialProperty emissionMap = new lilMaterialProperty("_EmissionMap", true, PropertyBlock.Emission, PropertyBlock.Emission1st); @@ -1051,6 +1060,14 @@ private lilMaterialProperty[] AllProperties() shadowFlatBlur, lilShadowCasterBias, + useRimShade, + rimShadeColor, + rimShadeMask, + rimShadeNormalStrength, + rimShadeBorder, + rimShadeBlur, + rimShadeFresnelPower, + useEmission, emissionColor, emissionMap, @@ -2592,6 +2609,34 @@ private void DrawAdvancedGUI(Material material) DrawShadowSettings(); } + //------------------------------------------------------------------------------------------------------------------------------ + // Rim Shade + if(!isGem) + { + if(ShouldDrawBlock(PropertyBlock.RimShade)) + { + edSet.isShowRimShade = lilEditorGUI.Foldout("RimShade", edSet.isShowRimShade); + DrawMenuButton(GetLoc("sAnchorRimShade"), PropertyBlock.RimShade); + if(edSet.isShowRimShade) + { + EditorGUILayout.BeginVertical(boxOuter); + LocalizedProperty(useRimShade, false); + DrawMenuButton(GetLoc("sAnchorRimShade"), PropertyBlock.RimShade); + if(useRimShade.floatValue == 1) + { + EditorGUILayout.BeginVertical(boxInnerHalf); + LocalizedPropertyTexture(colorMaskRGBAContent, rimShadeMask, rimShadeColor); + LocalizedProperty(rimShadeNormalStrength); + LocalizedProperty(rimShadeBorder); + LocalizedProperty(rimShadeBlur); + LocalizedProperty(rimShadeFresnelPower); + EditorGUILayout.EndVertical(); + } + EditorGUILayout.EndVertical(); + } + } + } + //------------------------------------------------------------------------------------------------------------------------------ // Emission if(ShouldDrawBlock(PropertyBlock.Emission)) diff --git a/Assets/lilToon/Editor/lilMaterialUtils.cs b/Assets/lilToon/Editor/lilMaterialUtils.cs index ce6c04ff..f71d54f1 100644 --- a/Assets/lilToon/Editor/lilMaterialUtils.cs +++ b/Assets/lilToon/Editor/lilMaterialUtils.cs @@ -354,6 +354,7 @@ public static void SetupMultiMaterial(Material material) int tpmode = 0; if(material.HasProperty("_TransparentMode")) tpmode = (int)material.GetFloat("_TransparentMode"); bool useShadow = IsFeatureOnFloat(material, "_UseShadow"); + bool useRimShade = IsFeatureOnFloat(material, "_UseRimShade"); bool useDistanceFade = IsFeatureOnVectorZ(material, "_DistanceFade"); bool useEmission = IsFeatureOnFloat(material, "_UseEmission"); bool useEmission2nd = IsFeatureOnFloat(material, "_UseEmission2nd"); @@ -403,11 +404,13 @@ public static void SetupMultiMaterial(Material material) if(isGem) { SetShaderKeywords(material, "_REQUIRE_UV2", false); + SetShaderKeywords(material, "AUTO_KEY_VALUE", false); SetShaderKeywords(material, "_FADING_ON", false); } else { SetShaderKeywords(material, "_REQUIRE_UV2", useShadow); + SetShaderKeywords(material, "AUTO_KEY_VALUE", useRimShade); SetShaderKeywords(material, "_FADING_ON", useDistanceFade); } @@ -561,6 +564,10 @@ public static void RemoveUnusedTexture(Material material, bool islite) material.SetTexture("_Shadow2ndColorTex", null); material.SetTexture("_Shadow3rdColorTex", null); } + if(material.GetFloat("_UseRimShade") == 0.0f) + { + material.SetTexture("_RimShadeMask", null); + } if(material.GetFloat("_UseEmission") == 0.0f) { material.SetTexture("_EmissionMap", null); diff --git a/Assets/lilToon/Editor/lilPropertyNameChecker.cs b/Assets/lilToon/Editor/lilPropertyNameChecker.cs index c6896799..86580c05 100644 --- a/Assets/lilToon/Editor/lilPropertyNameChecker.cs +++ b/Assets/lilToon/Editor/lilPropertyNameChecker.cs @@ -123,6 +123,14 @@ public static bool IsShadowProperty(string name) return res; } + public static bool IsRimShadeProperty(string name) + { + bool res = false; + res = res || name == "_UseRimShade"; + res = res || name.Contains("_RimShade"); + return res; + } + public static bool IsEmissionProperty(string name) { bool res = false; diff --git a/Assets/lilToon/Editor/lilToonSetting.cs b/Assets/lilToon/Editor/lilToonSetting.cs index 5feb8536..7346ee32 100644 --- a/Assets/lilToon/Editor/lilToonSetting.cs +++ b/Assets/lilToon/Editor/lilToonSetting.cs @@ -33,6 +33,7 @@ public class lilToonSetting : ScriptableObject public bool LIL_FEATURE_RECEIVE_SHADOW = true; public bool LIL_FEATURE_SHADOW_3RD = true; public bool LIL_FEATURE_SHADOW_LUT = true; + public bool LIL_FEATURE_RIMSHADE = true; public bool LIL_FEATURE_EMISSION_1ST = true; public bool LIL_FEATURE_EMISSION_2ND = true; public bool LIL_FEATURE_ANIMATE_EMISSION_UV = true; @@ -252,6 +253,7 @@ public static void TurnOffAllShaderSetting(ref lilToonSetting shaderSetting) shaderSetting.LIL_FEATURE_SHADOW_3RD = false; shaderSetting.LIL_FEATURE_SHADOW_LUT = false; shaderSetting.LIL_FEATURE_RECEIVE_SHADOW = false; + shaderSetting.LIL_FEATURE_RIMSHADE = false; shaderSetting.LIL_FEATURE_EMISSION_1ST = false; shaderSetting.LIL_FEATURE_EMISSION_2ND = false; shaderSetting.LIL_FEATURE_ANIMATE_EMISSION_UV = false; @@ -360,6 +362,7 @@ public static void TurnOnAllShaderSetting(ref lilToonSetting shaderSetting) shaderSetting.LIL_FEATURE_SHADOW_3RD = true; shaderSetting.LIL_FEATURE_SHADOW_LUT = true; shaderSetting.LIL_FEATURE_RECEIVE_SHADOW = true; + shaderSetting.LIL_FEATURE_RIMSHADE = true; shaderSetting.LIL_FEATURE_EMISSION_1ST = true; shaderSetting.LIL_FEATURE_EMISSION_2ND = true; shaderSetting.LIL_FEATURE_ANIMATE_EMISSION_UV = true; @@ -543,6 +546,7 @@ public static string BuildShaderSettingString(lilToonSetting shaderSetting, bool if(shaderSetting.LIL_FEATURE_SHADOW_3RD) sb.AppendLine("#define LIL_FEATURE_SHADOW_3RD"); if(shaderSetting.LIL_FEATURE_SHADOW_LUT) sb.AppendLine("#define LIL_FEATURE_SHADOW_LUT"); } + if(shaderSetting.LIL_FEATURE_RIMSHADE) sb.AppendLine("#define LIL_FEATURE_RIMSHADE"); if(shaderSetting.LIL_FEATURE_EMISSION_1ST) sb.AppendLine("#define LIL_FEATURE_EMISSION_1ST"); if(shaderSetting.LIL_FEATURE_EMISSION_2ND) sb.AppendLine("#define LIL_FEATURE_EMISSION_2ND"); @@ -957,6 +961,11 @@ internal static void SetupShaderSettingFromMaterial(Material material, ref lilTo 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) + { + 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 && ( (material.HasProperty("_ShadowReceive") && material.GetFloat("_ShadowReceive") > 0.0f) || (material.HasProperty("_Shadow2ndReceive") && material.GetFloat("_Shadow2ndReceive") > 0.0f) || @@ -1231,6 +1240,7 @@ private static void SetupShaderSettingFromAnimationClip(AnimationClip clip, ref shaderSetting.LIL_FEATURE_DISTANCE_FADE = shaderSetting.LIL_FEATURE_DISTANCE_FADE || propname.Contains("_DistanceFade"); shaderSetting.LIL_FEATURE_SHADOW_3RD = shaderSetting.LIL_FEATURE_SHADOW_3RD || propname.Contains("_Shadow3rdColor"); shaderSetting.LIL_FEATURE_SHADOW_LUT = shaderSetting.LIL_FEATURE_SHADOW_LUT || propname.Contains("_ShadowColorType"); + shaderSetting.LIL_FEATURE_RIMSHADE = shaderSetting.LIL_FEATURE_RIMSHADE || propname.Contains("_UseRimShade"); shaderSetting.LIL_FEATURE_FUR_COLLISION = shaderSetting.LIL_FEATURE_FUR_COLLISION || propname.Contains("_FurTouchStrength"); diff --git a/Assets/lilToon/README.md b/Assets/lilToon/README.md index 0b228ee6..64bf4dd7 100644 --- a/Assets/lilToon/README.md +++ b/Assets/lilToon/README.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.3 +Version 1.6.0 # Overview This shader is developed for services using avatars (VRChat, etc.) and has the following features. diff --git a/Assets/lilToon/README_JP.md b/Assets/lilToon/README_JP.md index 80e4d373..18e3c16e 100644 --- a/Assets/lilToon/README_JP.md +++ b/Assets/lilToon/README_JP.md @@ -1,5 +1,5 @@ # lilToon -Version 1.5.3 +Version 1.6.0 # 概要 アバターを用いたサービス(VRChat等)向けに開発したシェーダーで以下のような特徴があります。 diff --git a/Assets/lilToon/Shader/Includes/lil_common.hlsl b/Assets/lilToon/Shader/Includes/lil_common.hlsl index 4bf3867a..8f6950cd 100644 --- a/Assets/lilToon/Shader/Includes/lil_common.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_common.hlsl @@ -30,6 +30,7 @@ #define _UseMain2ndTex true #define _UseMain3rdTex true #define _UseShadow true + #define _UseRimShade true #define _UseBacklight true #define _UseBumpMap true #define _UseBump2ndMap true diff --git a/Assets/lilToon/Shader/Includes/lil_common_frag.hlsl b/Assets/lilToon/Shader/Includes/lil_common_frag.hlsl index e1442af3..081a46ca 100644 --- a/Assets/lilToon/Shader/Includes/lil_common_frag.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_common_frag.hlsl @@ -74,6 +74,10 @@ #define BEFORE_SHADOW #endif +#if !defined(BEFORE_RIMSHADE) + #define BEFORE_RIMSHADE +#endif + #if !defined(BEFORE_BACKLIGHT) #define BEFORE_BACKLIGHT #endif @@ -1163,6 +1167,39 @@ lilGetShading(fd LIL_SAMP_IN(sampler_MainTex)); #endif +//------------------------------------------------------------------------------------------------------------------------------ +// Rim Shade +#if defined(LIL_FEATURE_RIMSHADE) + void lilGetRimShade(inout lilFragData fd LIL_SAMP_IN_FUNC(samp)) + { + if(_UseRimShade) + { + float3 N = fd.N; + #if defined(LIL_FEATURE_NORMAL_1ST) || defined(LIL_FEATURE_NORMAL_2ND) + N = lerp(fd.origN, fd.N, _RimShadeNormalStrength); + #endif + float nvabs = abs(dot(N,fd.headV)); + float rim = pow(saturate(1.0 - nvabs), _RimShadeFresnelPower); + rim = lilTooningScale(_AAStrength, rim, _RimShadeBorder, _RimShadeBlur); + rim *= _RimShadeColor.a; + #if defined(LIL_FEATURE_ShadowColorTex) + rim *= LIL_SAMPLE_2D(_RimShadeMask, samp, fd.uvMain).r; + #endif + fd.col.rgb = lerp(fd.col.rgb, fd.col.rgb * _RimShadeColor.rgb, rim); + } + } +#endif + +#if !defined(OVERRIDE_RIMSHADE) + #if defined(LIL_LITE) + #define OVERRIDE_RIMSHADE \ + lilGetRimShade(fd); + #else + #define OVERRIDE_RIMSHADE \ + lilGetRimShade(fd LIL_SAMP_IN(sampler_MainTex)); + #endif +#endif + //------------------------------------------------------------------------------------------------------------------------------ // Backlight #if defined(LIL_FEATURE_BACKLIGHT) && !defined(LIL_LITE) && !defined(LIL_GEM) diff --git a/Assets/lilToon/Shader/Includes/lil_common_input.hlsl b/Assets/lilToon/Shader/Includes/lil_common_input.hlsl index 7db4a9d4..e5644447 100644 --- a/Assets/lilToon/Shader/Includes/lil_common_input.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_common_input.hlsl @@ -257,6 +257,9 @@ CBUFFER_START(UnityPerMaterial) float4 _ShadowAOShift; float4 _ShadowAOShift2; #endif + #if defined(LIL_MULTI_INPUTS_RIMSHADE) + float4 _RimShadeColor; + #endif #if defined(LIL_MULTI_INPUTS_BACKLIGHT) float4 _BacklightColor; float4 _BacklightColorTex_ST; @@ -437,6 +440,12 @@ CBUFFER_START(UnityPerMaterial) float _ShadowFlatBlur; float _ShadowFlatBorder; #endif + #if defined(LIL_MULTI_INPUTS_RIMSHADE) + float _RimShadeNormalStrength; + float _RimShadeBorder; + float _RimShadeBlur; + float _RimShadeFresnelPower; + #endif #if defined(LIL_MULTI_INPUTS_BACKLIGHT) float _BacklightNormalStrength; float _BacklightBorder; @@ -822,6 +831,7 @@ TEXTURE2D(_ShadowStrengthMask); TEXTURE2D(_ShadowColorTex); TEXTURE2D(_Shadow2ndColorTex); TEXTURE2D(_Shadow3rdColorTex); +TEXTURE2D(_RimShadeMask); TEXTURE2D(_BacklightColorTex); TEXTURE2D(_SmoothnessTex); TEXTURE2D(_MetallicGlossMap); diff --git a/Assets/lilToon/Shader/Includes/lil_common_input_base.hlsl b/Assets/lilToon/Shader/Includes/lil_common_input_base.hlsl index e83d56d8..ba54909c 100644 --- a/Assets/lilToon/Shader/Includes/lil_common_input_base.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_common_input_base.hlsl @@ -80,6 +80,11 @@ float4 _MainTex_ST; #endif #endif +// Rim Shade +#if defined(LIL_FEATURE_RIMSHADE) + float4 _RimShadeColor; +#endif + // Backlight #if defined(LIL_FEATURE_BACKLIGHT) float4 _BacklightColor; @@ -339,6 +344,12 @@ float _AAStrength; float _ShadowFlatBlur; float _ShadowFlatBorder; #endif +#if defined(LIL_FEATURE_RIMSHADE) + float _RimShadeNormalStrength; + float _RimShadeBorder; + float _RimShadeBlur; + float _RimShadeFresnelPower; +#endif #if defined(LIL_FEATURE_BACKLIGHT) float _BacklightNormalStrength; float _BacklightBorder; @@ -652,6 +663,9 @@ lilBool _Invisible; lilBool _UseShadow; lilBool _ShadowPostAO; #endif +#if defined(LIL_FEATURE_SHADOW) + lilBool _UseRimShade; +#endif #if defined(LIL_FEATURE_BACKLIGHT) lilBool _UseBacklight; lilBool _BacklightReceiveShadow; diff --git a/Assets/lilToon/Shader/Includes/lil_common_macro.hlsl b/Assets/lilToon/Shader/Includes/lil_common_macro.hlsl index 4c4390fb..ba6b9345 100644 --- a/Assets/lilToon/Shader/Includes/lil_common_macro.hlsl +++ b/Assets/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_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) +#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_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) +#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 diff --git a/Assets/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl b/Assets/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl index 8522dbc6..8a2f7d95 100644 --- a/Assets/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl @@ -442,6 +442,13 @@ float4 frag(v2f input LIL_VFACE(facing)) : SV_Target #endif #endif + //------------------------------------------------------------------------------------------------------------------------------ + // Rim Shade + BEFORE_RIMSHADE + #if defined(LIL_FEATURE_RIMSHADE) + OVERRIDE_RIMSHADE + #endif + //------------------------------------------------------------------------------------------------------------------------------ // Backlight BEFORE_BACKLIGHT diff --git a/Assets/lilToon/Shader/Includes/lil_replace_keywords.hlsl b/Assets/lilToon/Shader/Includes/lil_replace_keywords.hlsl index 9eacd6fd..f3bebc15 100644 --- a/Assets/lilToon/Shader/Includes/lil_replace_keywords.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_replace_keywords.hlsl @@ -25,6 +25,7 @@ // _COLOROVERLAY_ON LIL_FEATURE_ALPHAMASK // ------------------------------------ -------------------------------------------------------------------------------- // _REQUIRE_UV2 LIL_FEATURE_SHADOW +// AUTO_KEY_VALUE LIL_FEATURE_RIMSHADE // ANTI_FLICKER LIL_FEATURE_BACKLIGHT // _EMISSION LIL_FEATURE_EMISSION_1ST // GEOM_TYPE_BRANCH LIL_FEATURE_EMISSION_2ND @@ -112,6 +113,11 @@ #undef _REQUIRE_UV2 #endif +#if defined(AUTO_KEY_VALUE) + #define LIL_FEATURE_RIMSHADE + #undef AUTO_KEY_VALUE +#endif + #if defined(ANTI_FLICKER) #define LIL_FEATURE_BACKLIGHT #undef ANTI_FLICKER diff --git a/Assets/lilToon/Shader/lts.shader b/Assets/lilToon/Shader/lts.shader index 7fdee9b5..c1fe98db 100644 --- a/Assets/lilToon/Shader/lts.shader +++ b/Assets/lilToon/Shader/lts.shader @@ -193,6 +193,16 @@ Shader "lilToon" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_cutout.shader b/Assets/lilToon/Shader/lts_cutout.shader index 03e2e7b1..1bf561fa 100644 --- a/Assets/lilToon/Shader/lts_cutout.shader +++ b/Assets/lilToon/Shader/lts_cutout.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonCutout" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_cutout_o.shader b/Assets/lilToon/Shader/lts_cutout_o.shader index 1ec601f6..9a9c227f 100644 --- a/Assets/lilToon/Shader/lts_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_cutout_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonCutoutOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_cutout_oo.shader b/Assets/lilToon/Shader/lts_cutout_oo.shader index c460074f..76d0afe0 100644 --- a/Assets/lilToon/Shader/lts_cutout_oo.shader +++ b/Assets/lilToon/Shader/lts_cutout_oo.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_fakeshadow.shader b/Assets/lilToon/Shader/lts_fakeshadow.shader index c1fa7de4..9ae4df0a 100644 --- a/Assets/lilToon/Shader/lts_fakeshadow.shader +++ b/Assets/lilToon/Shader/lts_fakeshadow.shader @@ -105,6 +105,7 @@ Shader "_lil/[Optional] lilToonFakeShadow" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/lts_fur.shader b/Assets/lilToon/Shader/lts_fur.shader index 69291fdf..c3c79bea 100644 --- a/Assets/lilToon/Shader/lts_fur.shader +++ b/Assets/lilToon/Shader/lts_fur.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonFur" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -661,6 +671,7 @@ Shader "Hidden/lilToonFur" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/lts_fur_cutout.shader b/Assets/lilToon/Shader/lts_fur_cutout.shader index ada39d43..68892ad8 100644 --- a/Assets/lilToon/Shader/lts_fur_cutout.shader +++ b/Assets/lilToon/Shader/lts_fur_cutout.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonFurCutout" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -661,6 +671,7 @@ Shader "Hidden/lilToonFurCutout" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/lts_fur_two.shader b/Assets/lilToon/Shader/lts_fur_two.shader index 3277cbe6..6f54d0b8 100644 --- a/Assets/lilToon/Shader/lts_fur_two.shader +++ b/Assets/lilToon/Shader/lts_fur_two.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonFurTwoPass" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -661,6 +671,7 @@ Shader "Hidden/lilToonFurTwoPass" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/lts_furonly.shader b/Assets/lilToon/Shader/lts_furonly.shader index 8ae3c060..6c67bcaf 100644 --- a/Assets/lilToon/Shader/lts_furonly.shader +++ b/Assets/lilToon/Shader/lts_furonly.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_furonly_cutout.shader b/Assets/lilToon/Shader/lts_furonly_cutout.shader index 1dbbb4ad..22fe00f4 100644 --- a/Assets/lilToon/Shader/lts_furonly_cutout.shader +++ b/Assets/lilToon/Shader/lts_furonly_cutout.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_furonly_two.shader b/Assets/lilToon/Shader/lts_furonly_two.shader index 8bcfec89..4282e46b 100644 --- a/Assets/lilToon/Shader/lts_furonly_two.shader +++ b/Assets/lilToon/Shader/lts_furonly_two.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_gem.shader b/Assets/lilToon/Shader/lts_gem.shader index 7ab5b350..5a3a9784 100644 --- a/Assets/lilToon/Shader/lts_gem.shader +++ b/Assets/lilToon/Shader/lts_gem.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonGem" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -627,6 +637,7 @@ Shader "Hidden/lilToonGem" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/lts_o.shader b/Assets/lilToon/Shader/lts_o.shader index dbe6d6c2..2f225e6f 100644 --- a/Assets/lilToon/Shader/lts_o.shader +++ b/Assets/lilToon/Shader/lts_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_onetrans.shader b/Assets/lilToon/Shader/lts_onetrans.shader index 598882f1..b9063b91 100644 --- a/Assets/lilToon/Shader/lts_onetrans.shader +++ b/Assets/lilToon/Shader/lts_onetrans.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonOnePassTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_onetrans_o.shader b/Assets/lilToon/Shader/lts_onetrans_o.shader index ade332a6..1c621d1e 100644 --- a/Assets/lilToon/Shader/lts_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_onetrans_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonOnePassTransparentOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_oo.shader b/Assets/lilToon/Shader/lts_oo.shader index b8004d86..2136609c 100644 --- a/Assets/lilToon/Shader/lts_oo.shader +++ b/Assets/lilToon/Shader/lts_oo.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonOutlineOnly" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_overlay.shader b/Assets/lilToon/Shader/lts_overlay.shader index 238ee491..a271d590 100644 --- a/Assets/lilToon/Shader/lts_overlay.shader +++ b/Assets/lilToon/Shader/lts_overlay.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonOverlay" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_overlay_one.shader b/Assets/lilToon/Shader/lts_overlay_one.shader index b69e5c1e..83800194 100644 --- a/Assets/lilToon/Shader/lts_overlay_one.shader +++ b/Assets/lilToon/Shader/lts_overlay_one.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonOverlayOnePass" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_ref.shader b/Assets/lilToon/Shader/lts_ref.shader index 3bbafef2..f8381916 100644 --- a/Assets/lilToon/Shader/lts_ref.shader +++ b/Assets/lilToon/Shader/lts_ref.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonRefraction" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -620,6 +630,7 @@ Shader "Hidden/lilToonRefraction" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/lts_ref_blur.shader b/Assets/lilToon/Shader/lts_ref_blur.shader index fd8fe757..81acea5b 100644 --- a/Assets/lilToon/Shader/lts_ref_blur.shader +++ b/Assets/lilToon/Shader/lts_ref_blur.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonRefractionBlur" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -620,6 +630,7 @@ Shader "Hidden/lilToonRefractionBlur" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/lts_tess.shader b/Assets/lilToon/Shader/lts_tess.shader index 8e535964..9350f564 100644 --- a/Assets/lilToon/Shader/lts_tess.shader +++ b/Assets/lilToon/Shader/lts_tess.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellation" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_cutout.shader b/Assets/lilToon/Shader/lts_tess_cutout.shader index d497daee..de28fb72 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationCutout" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_cutout_o.shader b/Assets/lilToon/Shader/lts_tess_cutout_o.shader index 513e093a..4cefe6f1 100644 --- a/Assets/lilToon/Shader/lts_tess_cutout_o.shader +++ b/Assets/lilToon/Shader/lts_tess_cutout_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationCutoutOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_o.shader b/Assets/lilToon/Shader/lts_tess_o.shader index 4dedd10c..b14fcc3b 100644 --- a/Assets/lilToon/Shader/lts_tess_o.shader +++ b/Assets/lilToon/Shader/lts_tess_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_onetrans.shader b/Assets/lilToon/Shader/lts_tess_onetrans.shader index 44f1adda..03af5e5a 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationOnePassTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader index bf5c3f7b..5fb58293 100644 --- a/Assets/lilToon/Shader/lts_tess_onetrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_onetrans_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_trans.shader b/Assets/lilToon/Shader/lts_tess_trans.shader index 80c2ea92..89f16ceb 100644 --- a/Assets/lilToon/Shader/lts_tess_trans.shader +++ b/Assets/lilToon/Shader/lts_tess_trans.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_trans_o.shader b/Assets/lilToon/Shader/lts_tess_trans_o.shader index 9f8a821e..fe24f564 100644 --- a/Assets/lilToon/Shader/lts_tess_trans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_trans_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationTransparentOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_twotrans.shader b/Assets/lilToon/Shader/lts_tess_twotrans.shader index 434c9810..c526706e 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader index 6535ea0e..6ae0d337 100644 --- a/Assets/lilToon/Shader/lts_tess_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_tess_twotrans_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTessellationTwoPassTransparentOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_trans.shader b/Assets/lilToon/Shader/lts_trans.shader index a81fc475..32fb78e2 100644 --- a/Assets/lilToon/Shader/lts_trans.shader +++ b/Assets/lilToon/Shader/lts_trans.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_trans_o.shader b/Assets/lilToon/Shader/lts_trans_o.shader index a22ada69..c19398e9 100644 --- a/Assets/lilToon/Shader/lts_trans_o.shader +++ b/Assets/lilToon/Shader/lts_trans_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTransparentOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_trans_oo.shader b/Assets/lilToon/Shader/lts_trans_oo.shader index 2a5fe448..d247c32f 100644 --- a/Assets/lilToon/Shader/lts_trans_oo.shader +++ b/Assets/lilToon/Shader/lts_trans_oo.shader @@ -193,6 +193,16 @@ Shader "_lil/[Optional] lilToonOutlineOnlyTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_twotrans.shader b/Assets/lilToon/Shader/lts_twotrans.shader index 17964f98..69a584e8 100644 --- a/Assets/lilToon/Shader/lts_twotrans.shader +++ b/Assets/lilToon/Shader/lts_twotrans.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTwoPassTransparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/lts_twotrans_o.shader b/Assets/lilToon/Shader/lts_twotrans_o.shader index 8db72f3e..08e946ac 100644 --- a/Assets/lilToon/Shader/lts_twotrans_o.shader +++ b/Assets/lilToon/Shader/lts_twotrans_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonTwoPassTransparentOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/ltsmulti.shader b/Assets/lilToon/Shader/ltsmulti.shader index 7e3372d3..41c2c45b 100644 --- a/Assets/lilToon/Shader/ltsmulti.shader +++ b/Assets/lilToon/Shader/ltsmulti.shader @@ -193,6 +193,16 @@ Shader "_lil/lilToonMulti" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -634,6 +644,7 @@ Shader "_lil/lilToonMulti" #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -712,6 +723,7 @@ Shader "_lil/lilToonMulti" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -803,6 +815,7 @@ Shader "_lil/lilToonMulti" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/Shader/ltsmulti_fur.shader b/Assets/lilToon/Shader/ltsmulti_fur.shader index a5c88d0f..4e810460 100644 --- a/Assets/lilToon/Shader/ltsmulti_fur.shader +++ b/Assets/lilToon/Shader/ltsmulti_fur.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonMultiFur" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -653,6 +663,7 @@ Shader "Hidden/lilToonMultiFur" #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -731,6 +742,7 @@ Shader "Hidden/lilToonMultiFur" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -881,6 +893,7 @@ Shader "Hidden/lilToonMultiFur" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/Shader/ltsmulti_gem.shader b/Assets/lilToon/Shader/ltsmulti_gem.shader index 39cc34b3..be3b085a 100644 --- a/Assets/lilToon/Shader/ltsmulti_gem.shader +++ b/Assets/lilToon/Shader/ltsmulti_gem.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonMultiGem" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/ltsmulti_o.shader b/Assets/lilToon/Shader/ltsmulti_o.shader index 7a7ed374..10eca443 100644 --- a/Assets/lilToon/Shader/ltsmulti_o.shader +++ b/Assets/lilToon/Shader/ltsmulti_o.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonMultiOutline" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -634,6 +644,7 @@ Shader "Hidden/lilToonMultiOutline" #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -713,6 +724,7 @@ Shader "Hidden/lilToonMultiOutline" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -871,6 +883,7 @@ Shader "Hidden/lilToonMultiOutline" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/Shader/ltsmulti_ref.shader b/Assets/lilToon/Shader/ltsmulti_ref.shader index 2dd3faa3..d97c147a 100644 --- a/Assets/lilToon/Shader/ltsmulti_ref.shader +++ b/Assets/lilToon/Shader/ltsmulti_ref.shader @@ -193,6 +193,16 @@ Shader "Hidden/lilToonMultiRefraction" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -612,6 +622,7 @@ Shader "Hidden/lilToonMultiRefraction" #define LIL_MULTI_INPUTS_MAIN3RD #define LIL_MULTI_INPUTS_ALPHAMASK #define LIL_MULTI_INPUTS_SHADOW + #define LIL_MULTI_INPUTS_RIMSHADE #define LIL_MULTI_INPUTS_BACKLIGHT #define LIL_MULTI_INPUTS_EMISSION #define LIL_MULTI_INPUTS_EMISSION_2ND @@ -687,6 +698,7 @@ Shader "Hidden/lilToonMultiRefraction" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local ANTI_FLICKER #pragma shader_feature_local _EMISSION #pragma shader_feature_local GEOM_TYPE_BRANCH @@ -773,6 +785,7 @@ Shader "Hidden/lilToonMultiRefraction" #pragma shader_feature_local _SUNDISK_NONE #pragma shader_feature_local GEOM_TYPE_FROND #pragma shader_feature_local _REQUIRE_UV2 + #pragma shader_feature_local AUTO_KEY_VALUE #pragma shader_feature_local _NORMALMAP #pragma shader_feature_local EFFECT_BUMP #pragma shader_feature_local SOURCE_GBUFFER diff --git a/Assets/lilToon/Shader/ltspass_baker.shader b/Assets/lilToon/Shader/ltspass_baker.shader index c17658a6..88da35ed 100644 --- a/Assets/lilToon/Shader/ltspass_baker.shader +++ b/Assets/lilToon/Shader/ltspass_baker.shader @@ -85,6 +85,7 @@ Shader "Hidden/ltsother_baker" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/ltspass_cutout.shader b/Assets/lilToon/Shader/ltspass_cutout.shader index 0ad74d66..5701b3d3 100644 --- a/Assets/lilToon/Shader/ltspass_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_cutout.shader @@ -193,6 +193,16 @@ Shader "Hidden/ltspass_cutout" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -642,6 +652,7 @@ Shader "Hidden/ltspass_cutout" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/ltspass_opaque.shader b/Assets/lilToon/Shader/ltspass_opaque.shader index 65ac7364..30a3f8d4 100644 --- a/Assets/lilToon/Shader/ltspass_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_opaque.shader @@ -193,6 +193,16 @@ Shader "Hidden/ltspass_opaque" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -642,6 +652,7 @@ Shader "Hidden/ltspass_opaque" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/ltspass_proponly.shader b/Assets/lilToon/Shader/ltspass_proponly.shader index 6f0efa3b..7aaeb6d3 100644 --- a/Assets/lilToon/Shader/ltspass_proponly.shader +++ b/Assets/lilToon/Shader/ltspass_proponly.shader @@ -193,6 +193,16 @@ Shader "Hidden/ltspass_proponly" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 diff --git a/Assets/lilToon/Shader/ltspass_tess_cutout.shader b/Assets/lilToon/Shader/ltspass_tess_cutout.shader index e624fe93..e651644e 100644 --- a/Assets/lilToon/Shader/ltspass_tess_cutout.shader +++ b/Assets/lilToon/Shader/ltspass_tess_cutout.shader @@ -193,6 +193,16 @@ Shader "Hidden/ltspass_tess_cutout" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -642,6 +652,7 @@ Shader "Hidden/ltspass_tess_cutout" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/ltspass_tess_opaque.shader b/Assets/lilToon/Shader/ltspass_tess_opaque.shader index 6d9b625f..0b008a0e 100644 --- a/Assets/lilToon/Shader/ltspass_tess_opaque.shader +++ b/Assets/lilToon/Shader/ltspass_tess_opaque.shader @@ -193,6 +193,16 @@ Shader "Hidden/ltspass_tess_opaque" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -642,6 +652,7 @@ Shader "Hidden/ltspass_tess_opaque" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/ltspass_tess_transparent.shader b/Assets/lilToon/Shader/ltspass_tess_transparent.shader index f1fbd8d3..66fa8dfd 100644 --- a/Assets/lilToon/Shader/ltspass_tess_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_tess_transparent.shader @@ -193,6 +193,16 @@ Shader "Hidden/ltspass_tess_transparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -675,6 +685,7 @@ Shader "Hidden/ltspass_tess_transparent" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/Shader/ltspass_transparent.shader b/Assets/lilToon/Shader/ltspass_transparent.shader index 804ea6cd..0d52a0e4 100644 --- a/Assets/lilToon/Shader/ltspass_transparent.shader +++ b/Assets/lilToon/Shader/ltspass_transparent.shader @@ -193,6 +193,16 @@ Shader "Hidden/ltspass_transparent" _ShadowFlatBorder ("sBorder", Range(-2, 2)) = 1 _ShadowFlatBlur ("sBlur", Range(0.001, 2)) = 1 + //---------------------------------------------------------------------------------------------------------------------- + // Rim Shade + [lilToggleLeft] _UseRimShade ("RimShade", Int) = 0 + _RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0) + [NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {} + _RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0 + _RimShadeBorder ("sBorder", Range(0, 1)) = 0.5 + _RimShadeBlur ("sBlur", Range(0, 1)) = 1.0 + [PowerSlider(3.0)]_RimShadeFresnelPower ("sFresnelPower", Range(0.01, 50)) = 1.0 + //---------------------------------------------------------------------------------------------------------------------- // Reflection [lilToggleLeft] _UseReflection ("sReflection", Int) = 0 @@ -675,6 +685,7 @@ Shader "Hidden/ltspass_transparent" #define LIL_FEATURE_RECEIVE_SHADOW #define LIL_FEATURE_SHADOW_3RD #define LIL_FEATURE_SHADOW_LUT + #define LIL_FEATURE_RIMSHADE #define LIL_FEATURE_EMISSION_1ST #define LIL_FEATURE_EMISSION_2ND #define LIL_FEATURE_ANIMATE_EMISSION_UV diff --git a/Assets/lilToon/package.json b/Assets/lilToon/package.json index 266dd54d..a47ff549 100644 --- a/Assets/lilToon/package.json +++ b/Assets/lilToon/package.json @@ -1,6 +1,6 @@ { "name": "jp.lilxyzw.liltoon", - "version": "1.5.3", + "version": "1.6.0", "displayName": "lilToon", "description": "Feature-rich toon shader.", "unity": "2018.1", @@ -9,7 +9,7 @@ "licensesUrl": "https://github.com/lilxyzw/lilToon/blob/master/Assets/lilToon/LICENSE", "license": "MIT", "keywords": ["Toon", "Shader", "Material"], - "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.5.3/jp.lilxyzw.liltoon-1.5.3.zip?", + "url" : "https://github.com/lilxyzw/lilToon/releases/download/1.6.0/jp.lilxyzw.liltoon-1.6.0.zip?", "repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json", "legacyFolders" : { "Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05" diff --git a/version.json b/version.json index 0552ab0a..5640ffba 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"latest_vertion_name": "1.5.3", "latest_vertion_value": 39} \ No newline at end of file +{"latest_vertion_name": "1.6.0", "latest_vertion_value": 39} \ No newline at end of file