diff options
| author | yum <yum.food.vr@gmail.com> | 2026-02-25 19:03:14 -0800 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2026-02-25 19:03:14 -0800 |
| commit | 69dded4f94ab2f7e99b4959793a9eaf1f19aef07 (patch) | |
| tree | 94a57f4b6da22b004c5c1d830b27f2bf0e3f88df | |
| parent | e7c7b5e9fd1dc14755da97b0f4edb0bc92c744b3 (diff) | |
Fix matcap compiler bug & reorder UI
| -rwxr-xr-x | 3ner.shader | 44 | ||||
| -rw-r--r-- | matcap.cginc | 4 |
2 files changed, 24 insertions, 24 deletions
diff --git a/3ner.shader b/3ner.shader index 678e757..7386ba7 100755 --- a/3ner.shader +++ b/3ner.shader @@ -108,6 +108,28 @@ Shader "yum_food/3ner" //endex [HideInInspector] m_end_Rim_Lightings("Rim Lighting", Float) = 0 + //ifex _Shadows_Enabled==0 + [HideInInspector] m_start_Shadows("Shadows", Float) = 0 + [ThryToggle(_SHADOWS)] _Shadows_Enabled("Enable", Float) = 0 + + [HideInInspector] m_start_Shadow_0("Shadow 0", Float) = 0 + _Shadow_0_Color("Color 0", Color) = (0, 0, 0, 0) + _Shadow_0_Threshold("Threshold 0", Range(0, 1)) = 0.5 + _Shadow_0_Blur("Blur 0", Range(0, 1)) = 0.1 + [HideInInspector] m_end_Shadow_0("Shadow 0", Float) = 0 + + //ifex _Shadow_1_Enabled==0 + [HideInInspector] m_start_Shadow_1("Shadow 1", Float) = 0 + [ThryToggle(_SHADOW_1)] _Shadow_1_Enabled("Enable", Float) = 0 + _Shadow_1_Color("Color 1", Color) = (0, 0, 0, 0) + _Shadow_1_Threshold("Threshold 1", Range(0, 1)) = 0.5 + _Shadow_1_Blur("Blur 1", Range(0, 1)) = 0.1 + [HideInInspector] m_end_Shadow_1("Shadow 1", Float) = 0 + //endex + + [HideInInspector] m_end_Shadows("Shadows", Float) = 0 + //endex + //ifex _Clearcoat_Enabled==0 [HideInInspector] m_start_Clearcoat("Clearcoat", Float) = 0 [ThryToggle(_CLEARCOAT)] _Clearcoat_Enabled("Enable", Float) = 0 @@ -147,28 +169,6 @@ Shader "yum_food/3ner" [HideInInspector] m_end_Outlines("Outlines", Float) = 0 //endex - //ifex _Shadows_Enabled==0 - [HideInInspector] m_start_Shadows("Shadows", Float) = 0 - [ThryToggle(_SHADOWS)] _Shadows_Enabled("Enable", Float) = 0 - - [HideInInspector] m_start_Shadow_0("Shadow 0", Float) = 0 - _Shadow_0_Color("Color 0", Color) = (0, 0, 0, 0) - _Shadow_0_Threshold("Threshold 0", Range(0, 1)) = 0.5 - _Shadow_0_Blur("Blur 0", Range(0, 1)) = 0.1 - [HideInInspector] m_end_Shadow_0("Shadow 0", Float) = 0 - - //ifex _Shadow_1_Enabled==0 - [HideInInspector] m_start_Shadow_1("Shadow 1", Float) = 0 - [ThryToggle(_SHADOW_1)] _Shadow_1_Enabled("Enable", Float) = 0 - _Shadow_1_Color("Color 1", Color) = (0, 0, 0, 0) - _Shadow_1_Threshold("Threshold 1", Range(0, 1)) = 0.5 - _Shadow_1_Blur("Blur 1", Range(0, 1)) = 0.1 - [HideInInspector] m_end_Shadow_1("Shadow 1", Float) = 0 - //endex - - [HideInInspector] m_end_Shadows("Shadows", Float) = 0 - //endex - //ifex _Bent_Normals_Enabled==0 [HideInInspector] m_start_Bent_Normals("Bent Normals", Float) = 0 [ThryToggle(_BENT_NORMALS)] _Bent_Normals_Enabled("Enable", Float) = 0 diff --git a/matcap.cginc b/matcap.cginc index c34d294..55eff5a 100644 --- a/matcap.cginc +++ b/matcap.cginc @@ -9,7 +9,7 @@ #if defined(_MATCAP0) || defined(_RIM_LIGHTING0) float2 getMatcapUV(v2f i, Pbr pbr) { const float3 cam_normal = normalize(mul(UNITY_MATRIX_V, float4(pbr.normal, 0))); - const float3 cam_view_dir = normalize(mul(UNITY_MATRIX_V, float4(-i.eyeVec, 0))); + const float3 cam_view_dir = normalize(mul(UNITY_MATRIX_V, float4(-i.eyeVec.xyz, 0))); const float3 cam_refl = -reflect(cam_view_dir, cam_normal); float m = 2.0 * sqrt( cam_refl.x * cam_refl.x + @@ -92,7 +92,7 @@ void applyMatcapsAndRimLighting(v2f i, inout Pbr pbr, inout LightData light_data #if defined(_RIM_LIGHTING0_QUANTIZATION) rl0_dist = floor(rl0_dist * _Rim_Lighting0_Quantization_Steps) / _Rim_Lighting0_Quantization_Steps; #endif - float3 rl0 = _Rim_Lighting0_Color * rl0_dist; + float3 rl0 = lerp(1, _Rim_Lighting0_Color, rl0_dist); #if defined(_RIM_LIGHTING0_MASK) float rl0_mask = _Rim_Lighting0_Mask.Sample(linear_repeat_s, UV_SCOFF(i, _Rim_Lighting0_Mask_ST, /*which_channel=*/0)); #else |