diff options
| -rw-r--r-- | Editor/tooner.cs | 2 | ||||
| -rw-r--r-- | feature_macros.cginc | 2 | ||||
| -rw-r--r-- | globals.cginc | 4 | ||||
| -rw-r--r-- | tooner.shader | 1 | ||||
| -rw-r--r-- | tooner_lighting.cginc | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Editor/tooner.cs b/Editor/tooner.cs index fae2c47..d4e9d7d 100644 --- a/Editor/tooner.cs +++ b/Editor/tooner.cs @@ -3241,6 +3241,8 @@ public class ToonerGUI : ShaderGUI { FloatProperty(bc, "Scale"); bc = FindProperty("_Gimmick_Lens_00_SSFD_Max_Fwidth"); FloatProperty(bc, "Max fwidth"); + bc = FindProperty("_Gimmick_Lens_00_SSFD_Size_Factor"); + FloatProperty(bc, "Size factor"); bc = FindProperty("_Gimmick_Lens_00_SSFD_Noise"); TexturePropertySingleLine(MakeLabel(bc, "Noise"), bc); EditorGUI.indentLevel -= 1; diff --git a/feature_macros.cginc b/feature_macros.cginc index 98d439f..4cf789f 100644 --- a/feature_macros.cginc +++ b/feature_macros.cginc @@ -1,7 +1,7 @@ #ifndef __FEATURE_MACROS_INC #define __FEATURE_MACROS_INC -#define EXPERIMENT__CUSTOM_DEPTH +//#define EXPERIMENT__CUSTOM_DEPTH #pragma shader_feature_local _ _BASECOLOR_MAP #pragma shader_feature_local _ _NORMAL_MAP diff --git a/globals.cginc b/globals.cginc index 4045633..ad55457 100644 --- a/globals.cginc +++ b/globals.cginc @@ -1145,6 +1145,7 @@ float _Gimmick_Lens_00_Frame_Counter_Speed; #if defined(_GIMMICK_LENS_00_SSFD) float _Gimmick_Lens_00_SSFD_Scale; float _Gimmick_Lens_00_SSFD_Max_Fwidth; +float _Gimmick_Lens_00_SSFD_Size_Factor; texture3D _Gimmick_Lens_00_SSFD_Noise; #endif #endif @@ -1158,8 +1159,5 @@ float _Surface_Stable_Fractal_Dithering_Size_Factor; float _Surface_Stable_Fractal_Dithering_Brightness_Factor; #endif - - - #endif diff --git a/tooner.shader b/tooner.shader index ea72eb8..9f7a841 100644 --- a/tooner.shader +++ b/tooner.shader @@ -1179,6 +1179,7 @@ Shader "yum_food/tooner" _Gimmick_Lens_00_Scale("Scale", Float) = 1 _Gimmick_Lens_00_SSFD_Scale("Scale", Float) = 1 _Gimmick_Lens_00_SSFD_Max_Fwidth("Max fwidth", Float) = 0.001 + _Gimmick_Lens_00_SSFD_Size_Factor("Size factor", Float) = 1 _Gimmick_Lens_00_SSFD_Noise("Noise", 3D) = "white" {} _Surface_Stable_Fractal_Dithering_Enable_Static("Enable stable fractal dithering", Float) = 0 diff --git a/tooner_lighting.cginc b/tooner_lighting.cginc index 6bf62ae..1ecdfc0 100644 --- a/tooner_lighting.cginc +++ b/tooner_lighting.cginc @@ -2360,7 +2360,7 @@ float4 effect(inout v2f i, out float depth) ssfd(i.uv0, _Gimmick_Lens_00_SSFD_Scale / grab_color.g, _Gimmick_Lens_00_SSFD_Max_Fwidth, _Gimmick_Lens_00_SSFD_Noise), ssfd(i.uv0, _Gimmick_Lens_00_SSFD_Scale / grab_color.b, _Gimmick_Lens_00_SSFD_Max_Fwidth, _Gimmick_Lens_00_SSFD_Noise) ); - mask = mask > grab_color ? 1 : 0; + mask = mask > grab_color * _Gimmick_Lens_00_SSFD_Size_Factor ? 1 : 0; #endif //grab_uv = floor(grab_uv * _ScreenParams.xy * _Gimmick_Lens_00_Scale) / (_ScreenParams.xy * _Gimmick_Lens_00_Scale); |