diff options
| author | yum <yum.food.vr@gmail.com> | 2026-03-06 16:01:44 -0800 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2026-03-06 16:01:44 -0800 |
| commit | 99da9a7918af4a12b8894b4dea8569e952e5f2a1 (patch) | |
| tree | a05a4faf148bab0b170b72f51cb16f29d2296b59 | |
| parent | 20234b7fdc550fd3d2542391ac5bb735a7edb820 (diff) | |
Add 4 more decal slots
| -rwxr-xr-x | 3ner.shader | 144 | ||||
| -rw-r--r-- | decal.cginc | 12 | ||||
| -rwxr-xr-x | features.cginc | 16 | ||||
| -rwxr-xr-x | globals.cginc | 12 |
4 files changed, 184 insertions, 0 deletions
diff --git a/3ner.shader b/3ner.shader index 32f51d7..11bc32f 100755 --- a/3ner.shader +++ b/3ner.shader @@ -209,6 +209,150 @@ Shader "yum_food/3ner" //endex [HideInInspector] m_end_Decal3("Decal 3", Float) = 0 //endex + + //ifex _Decal4_Enabled==0 + [HideInInspector] m_start_Decal4("Decal 4", Float) = 0 + [ThryToggle(_DECAL4)] _Decal4_Enabled("Enable", Float) = 0 + _Decal4_MainTex("Base color", 2D) = "white" {} + [HDR] _Decal4_Color("Tint", Color) = (1, 1, 1, 1) + _Decal4_Opacity("Opacity", Range(0, 1)) = 1 + [ThryWideEnum(Repeat, 0, Mirror, 1, Clamp, 2)] _Decal4_UV_Mode("UV Mode", Int) = 0 + [ThryWideEnum(AlphaBlend, 0, Multiply, 1, AddProduct, 2)] _Decal4_Mix_Mode("Mix Mode", Int) = 0 + [IntRange] _Decal4_UV_Channel("UV Channel", Range(0, 3)) = 0 + [ThryToggle(_DECAL4_ALBEDO_CLAMP)] _Decal4_Albedo_Clamp("Clamp albedo", Float) = 0 + + //ifex _Decal4_Mask_Enabled==0 + [HideInInspector] m_start_Decal4_Mask("Mask", Float) = 0 + [ThryToggle(_DECAL4_MASK)] _Decal4_Mask_Enabled("Enable", Float) = 0 + _Decal4_Mask("Mask", 2D) = "white" {} + [ThryToggle(_DECAL4_MASK_INVERT)] _Decal4_Mask_Invert("Invert", Float) = 0 + [IntRange] _Decal4_Mask_UV_Channel("UV Channel", Range(0, 3)) = 0 + [HideInInspector] m_end_Decal4_Mask("Mask", Float) = 0 + //endex + + //ifex _Decal4_Metallic_Gloss_Enabled==0 + [HideInInspector] m_start_Decal4_Metallic_Gloss("Metallic Gloss", Float) = 0 + [ThryToggle(_DECAL4_METALLIC_GLOSS)] _Decal4_Metallic_Gloss_Enabled("Enable", Float) = 0 + _Decal4_Metallic_Gloss("Metallic Gloss", 2D) = "white" {} + [HideInInspector] m_end_Decal4_Metallic_Gloss("Metallic Gloss", Float) = 0 + //endex + + //ifex _Decal4_Rotation_Enabled==0 + [HideInInspector] m_start_Decal4_Rotation("Rotation", Float) = 0 + [ThryToggle(_DECAL4_ROTATION)] _Decal4_Rotation_Enabled("Enable", Float) = 0 + _Decal4_Rotation("Rotation", Range(-0.5, 0.5)) = 0 + [HideInInspector] m_end_Decal4_Rotation("Rotation", Float) = 0 + //endex + [HideInInspector] m_end_Decal4("Decal 4", Float) = 0 + //endex + + //ifex _Decal5_Enabled==0 + [HideInInspector] m_start_Decal5("Decal 5", Float) = 0 + [ThryToggle(_DECAL5)] _Decal5_Enabled("Enable", Float) = 0 + _Decal5_MainTex("Base color", 2D) = "white" {} + [HDR] _Decal5_Color("Tint", Color) = (1, 1, 1, 1) + _Decal5_Opacity("Opacity", Range(0, 1)) = 1 + [ThryWideEnum(Repeat, 0, Mirror, 1, Clamp, 2)] _Decal5_UV_Mode("UV Mode", Int) = 0 + [ThryWideEnum(AlphaBlend, 0, Multiply, 1, AddProduct, 2)] _Decal5_Mix_Mode("Mix Mode", Int) = 0 + [IntRange] _Decal5_UV_Channel("UV Channel", Range(0, 3)) = 0 + [ThryToggle(_DECAL5_ALBEDO_CLAMP)] _Decal5_Albedo_Clamp("Clamp albedo", Float) = 0 + + //ifex _Decal5_Mask_Enabled==0 + [HideInInspector] m_start_Decal5_Mask("Mask", Float) = 0 + [ThryToggle(_DECAL5_MASK)] _Decal5_Mask_Enabled("Enable", Float) = 0 + _Decal5_Mask("Mask", 2D) = "white" {} + [ThryToggle(_DECAL5_MASK_INVERT)] _Decal5_Mask_Invert("Invert", Float) = 0 + [IntRange] _Decal5_Mask_UV_Channel("UV Channel", Range(0, 3)) = 0 + [HideInInspector] m_end_Decal5_Mask("Mask", Float) = 0 + //endex + + //ifex _Decal5_Metallic_Gloss_Enabled==0 + [HideInInspector] m_start_Decal5_Metallic_Gloss("Metallic Gloss", Float) = 0 + [ThryToggle(_DECAL5_METALLIC_GLOSS)] _Decal5_Metallic_Gloss_Enabled("Enable", Float) = 0 + _Decal5_Metallic_Gloss("Metallic Gloss", 2D) = "white" {} + [HideInInspector] m_end_Decal5_Metallic_Gloss("Metallic Gloss", Float) = 0 + //endex + + //ifex _Decal5_Rotation_Enabled==0 + [HideInInspector] m_start_Decal5_Rotation("Rotation", Float) = 0 + [ThryToggle(_DECAL5_ROTATION)] _Decal5_Rotation_Enabled("Enable", Float) = 0 + _Decal5_Rotation("Rotation", Range(-0.5, 0.5)) = 0 + [HideInInspector] m_end_Decal5_Rotation("Rotation", Float) = 0 + //endex + [HideInInspector] m_end_Decal5("Decal 5", Float) = 0 + //endex + + //ifex _Decal6_Enabled==0 + [HideInInspector] m_start_Decal6("Decal 6", Float) = 0 + [ThryToggle(_DECAL6)] _Decal6_Enabled("Enable", Float) = 0 + _Decal6_MainTex("Base color", 2D) = "white" {} + [HDR] _Decal6_Color("Tint", Color) = (1, 1, 1, 1) + _Decal6_Opacity("Opacity", Range(0, 1)) = 1 + [ThryWideEnum(Repeat, 0, Mirror, 1, Clamp, 2)] _Decal6_UV_Mode("UV Mode", Int) = 0 + [ThryWideEnum(AlphaBlend, 0, Multiply, 1, AddProduct, 2)] _Decal6_Mix_Mode("Mix Mode", Int) = 0 + [IntRange] _Decal6_UV_Channel("UV Channel", Range(0, 3)) = 0 + [ThryToggle(_DECAL6_ALBEDO_CLAMP)] _Decal6_Albedo_Clamp("Clamp albedo", Float) = 0 + + //ifex _Decal6_Mask_Enabled==0 + [HideInInspector] m_start_Decal6_Mask("Mask", Float) = 0 + [ThryToggle(_DECAL6_MASK)] _Decal6_Mask_Enabled("Enable", Float) = 0 + _Decal6_Mask("Mask", 2D) = "white" {} + [ThryToggle(_DECAL6_MASK_INVERT)] _Decal6_Mask_Invert("Invert", Float) = 0 + [IntRange] _Decal6_Mask_UV_Channel("UV Channel", Range(0, 3)) = 0 + [HideInInspector] m_end_Decal6_Mask("Mask", Float) = 0 + //endex + + //ifex _Decal6_Metallic_Gloss_Enabled==0 + [HideInInspector] m_start_Decal6_Metallic_Gloss("Metallic Gloss", Float) = 0 + [ThryToggle(_DECAL6_METALLIC_GLOSS)] _Decal6_Metallic_Gloss_Enabled("Enable", Float) = 0 + _Decal6_Metallic_Gloss("Metallic Gloss", 2D) = "white" {} + [HideInInspector] m_end_Decal6_Metallic_Gloss("Metallic Gloss", Float) = 0 + //endex + + //ifex _Decal6_Rotation_Enabled==0 + [HideInInspector] m_start_Decal6_Rotation("Rotation", Float) = 0 + [ThryToggle(_DECAL6_ROTATION)] _Decal6_Rotation_Enabled("Enable", Float) = 0 + _Decal6_Rotation("Rotation", Range(-0.5, 0.5)) = 0 + [HideInInspector] m_end_Decal6_Rotation("Rotation", Float) = 0 + //endex + [HideInInspector] m_end_Decal6("Decal 6", Float) = 0 + //endex + + //ifex _Decal7_Enabled==0 + [HideInInspector] m_start_Decal7("Decal 7", Float) = 0 + [ThryToggle(_DECAL7)] _Decal7_Enabled("Enable", Float) = 0 + _Decal7_MainTex("Base color", 2D) = "white" {} + [HDR] _Decal7_Color("Tint", Color) = (1, 1, 1, 1) + _Decal7_Opacity("Opacity", Range(0, 1)) = 1 + [ThryWideEnum(Repeat, 0, Mirror, 1, Clamp, 2)] _Decal7_UV_Mode("UV Mode", Int) = 0 + [ThryWideEnum(AlphaBlend, 0, Multiply, 1, AddProduct, 2)] _Decal7_Mix_Mode("Mix Mode", Int) = 0 + [IntRange] _Decal7_UV_Channel("UV Channel", Range(0, 3)) = 0 + [ThryToggle(_DECAL7_ALBEDO_CLAMP)] _Decal7_Albedo_Clamp("Clamp albedo", Float) = 0 + + //ifex _Decal7_Mask_Enabled==0 + [HideInInspector] m_start_Decal7_Mask("Mask", Float) = 0 + [ThryToggle(_DECAL7_MASK)] _Decal7_Mask_Enabled("Enable", Float) = 0 + _Decal7_Mask("Mask", 2D) = "white" {} + [ThryToggle(_DECAL7_MASK_INVERT)] _Decal7_Mask_Invert("Invert", Float) = 0 + [IntRange] _Decal7_Mask_UV_Channel("UV Channel", Range(0, 3)) = 0 + [HideInInspector] m_end_Decal7_Mask("Mask", Float) = 0 + //endex + + //ifex _Decal7_Metallic_Gloss_Enabled==0 + [HideInInspector] m_start_Decal7_Metallic_Gloss("Metallic Gloss", Float) = 0 + [ThryToggle(_DECAL7_METALLIC_GLOSS)] _Decal7_Metallic_Gloss_Enabled("Enable", Float) = 0 + _Decal7_Metallic_Gloss("Metallic Gloss", 2D) = "white" {} + [HideInInspector] m_end_Decal7_Metallic_Gloss("Metallic Gloss", Float) = 0 + //endex + + //ifex _Decal7_Rotation_Enabled==0 + [HideInInspector] m_start_Decal7_Rotation("Rotation", Float) = 0 + [ThryToggle(_DECAL7_ROTATION)] _Decal7_Rotation_Enabled("Enable", Float) = 0 + _Decal7_Rotation("Rotation", Range(-0.5, 0.5)) = 0 + [HideInInspector] m_end_Decal7_Rotation("Rotation", Float) = 0 + //endex + [HideInInspector] m_end_Decal7("Decal 7", Float) = 0 + //endex [HideInInspector] m_end_Decals("Decals", Float) = 0 [HideInInspector] m_start_Matcaps("Matcaps", Float) = 0 diff --git a/decal.cginc b/decal.cginc index aee7cf0..515c2b7 100644 --- a/decal.cginc +++ b/decal.cginc @@ -80,6 +80,18 @@ void applyDecals(v2f i, inout Pbr pbr) { #if defined(_DECAL3) APPLY_DECAL(3) #endif +#if defined(_DECAL4) + APPLY_DECAL(4) +#endif +#if defined(_DECAL5) + APPLY_DECAL(5) +#endif +#if defined(_DECAL6) + APPLY_DECAL(6) +#endif +#if defined(_DECAL7) + APPLY_DECAL(7) +#endif } #endif // __DECAL_INC diff --git a/features.cginc b/features.cginc index c3c5aa1..5353060 100755 --- a/features.cginc +++ b/features.cginc @@ -174,6 +174,22 @@ #pragma shader_feature_local _DECAL3 //endex +//ifex _Decal4_Enabled==0 +#pragma shader_feature_local _DECAL4 +//endex + +//ifex _Decal5_Enabled==0 +#pragma shader_feature_local _DECAL5 +//endex + +//ifex _Decal6_Enabled==0 +#pragma shader_feature_local _DECAL6 +//endex + +//ifex _Decal7_Enabled==0 +#pragma shader_feature_local _DECAL7 +//endex + //ifex _Matcap0_Enabled==0 #pragma shader_feature_local _MATCAP0 #pragma shader_feature_local _MATCAP0_QUANTIZATION diff --git a/globals.cginc b/globals.cginc index c7529b1..c3ac36c 100755 --- a/globals.cginc +++ b/globals.cginc @@ -281,6 +281,18 @@ DECAL_GLOBALS(2) #if defined(_DECAL3) DECAL_GLOBALS(3) #endif +#if defined(_DECAL4) +DECAL_GLOBALS(4) +#endif +#if defined(_DECAL5) +DECAL_GLOBALS(5) +#endif +#if defined(_DECAL6) +DECAL_GLOBALS(6) +#endif +#if defined(_DECAL7) +DECAL_GLOBALS(7) +#endif #define MATCAP_MODE_REPLACE 0 #define MATCAP_MODE_ADD 1 |