From 6e1c003ad574fa7606b91cc1c59b327237b6af3e Mon Sep 17 00:00:00 2001 From: yum Date: Sat, 19 Jul 2025 19:31:57 -0700 Subject: meow im gay --- 2ner.shader | 8 ++++---- decals.cginc | 2 +- features.cginc | 4 ++-- ssao.cginc | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/2ner.shader b/2ner.shader index a016f8b..b769dff 100644 --- a/2ner.shader +++ b/2ner.shader @@ -2213,10 +2213,10 @@ Shader "yum_food/2ner" [HideInInspector] m_end_Shadow_Casting("Cast shadows", Float) = 0 //endex - //ifex _Spherical_Harmonics_L1_Enabled==0 - [HideInInspector] m_start_Spherical_Harmonics_L1("L1 spherical harmonics", Float) = 0 - [ThryToggle(_SPHERICAL_HARMONICS_L1)] _Spherical_Harmonics_L1_Enabled("Enable", Float) = 0 - [HideInInspector] m_end_Spherical_Harmonics_L1("L1 spherical harmonics", Float) = 0 + //ifex _Screen_Space_Normals_Enabled==0 + [HideInInspector] m_start_Screen_Space_Normals("Screen Space Normals", Float) = 0 + [ThryToggle(_SCREEN_SPACE_NORMALS)] _Screen_Space_Normals_Enabled("Enable", Float) = 0 + [HideInInspector] m_end_Screen_Space_Normals("Screen Space Normals", Float) = 0 //endex //ifex _Depth_Prepass_Enabled==0 diff --git a/decals.cginc b/decals.cginc index 8311b4a..80f5a96 100644 --- a/decals.cginc +++ b/decals.cginc @@ -178,7 +178,7 @@ float4 getCmykWarpingPlanesColor(DecalParams params, float2 uv) { #define APPLY_DECAL_SDF_OFF(i, albedo, normal_tangent, metallic, smoothness, emission, params) \ float4 decal_albedo; \ { \ - decal_albedo = params.mainTex.SampleGrad(trilinear_repeat_s, decal_uv, ddx(raw_decal_uv), ddy(raw_decal_uv)); \ + decal_albedo = params.mainTex.Sample(trilinear_repeat_s, decal_uv); \ decal_albedo *= params.color; \ } diff --git a/features.cginc b/features.cginc index 80029bb..2489f54 100644 --- a/features.cginc +++ b/features.cginc @@ -460,8 +460,8 @@ #pragma shader_feature_local _BAKERY_MONOSH //endex -//ifex _Spherical_Harmonics_L1_Enabled==0 -#pragma shader_feature_local _SPHERICAL_HARMONICS_L1 +//ifex _Screen_Space_Normals_Enabled==0 +#pragma shader_feature_local _SCREEN_SPACE_NORMALS //endex #endif // __FEATURES_INC diff --git a/ssao.cginc b/ssao.cginc index ad20a28..f8d7e0d 100644 --- a/ssao.cginc +++ b/ssao.cginc @@ -23,6 +23,11 @@ float get_ssao(v2f i, float3x3 tangentToWorld, out float2 debug) { cos(ssao_theta), -sin(ssao_theta), sin(ssao_theta), cos(ssao_theta)); + [branch] + if (round(_SSAO_Samples) < 1) { + return 1; + } + float ssao_occlusion = 0; const float ssao_eps = 1E-5; [loop] -- cgit v1.2.3