From d80d5158f1a21dbbec8de74f01d39febde0c7b1d Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Thu, 11 Jun 2020 22:02:13 -0700 Subject: [PATCH] fix cutoff value on shaders --- Assets/Shaders/DecalFeatureBumped.shader | 10 ++-------- Assets/Shaders/DecalPaint.shader | 4 ++-- .../ConformalDecals/Resources/conformaldecals.shab | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Assets/Shaders/DecalFeatureBumped.shader b/Assets/Shaders/DecalFeatureBumped.shader index 1e46f6f..5c8ac4c 100644 --- a/Assets/Shaders/DecalFeatureBumped.shader +++ b/Assets/Shaders/DecalFeatureBumped.shader @@ -61,10 +61,7 @@ Shader "ConformalDecals/Feature/Bumped" float4 color = tex2D(_Decal, IN.uv_decal); float3 normal = UnpackNormalDXT5nm(tex2D(_DecalBumpMap, IN.uv_bump)); - #ifdef DECAL_PROJECT - // clip alpha - clip(color.a - _Cutoff + 0.01); - #endif //DECAL_PROJECT + decalClipAlpha(color.a - _Cutoff); half rim = 1.0 - saturate(dot (normalize(IN.viewDir), normal)); float3 emission = (_RimColor.rgb * pow(rim, _RimFalloff)) * _RimColor.a; @@ -113,10 +110,7 @@ Shader "ConformalDecals/Feature/Bumped" float4 color = tex2D(_Decal, IN.uv_decal); float3 normal = UnpackNormal(tex2D(_DecalBumpMap, IN.uv_bump)); - #ifdef DECAL_PROJECT - // clip alpha - clip(color.a - _Cutoff + 0.01); - #endif //DECAL_PROJECT + decalClipAlpha(color.a - _Cutoff); half rim = 1.0 - saturate(dot (normalize(IN.viewDir), normal)); float3 emission = (_RimColor.rgb * pow(rim, _RimFalloff)) * _RimColor.a; diff --git a/Assets/Shaders/DecalPaint.shader b/Assets/Shaders/DecalPaint.shader index ce3384b..88f3a4f 100644 --- a/Assets/Shaders/DecalPaint.shader +++ b/Assets/Shaders/DecalPaint.shader @@ -64,7 +64,7 @@ Shader "ConformalDecals/Paint/Diffuse" { float4 color = tex2D(_Decal, IN.uv_decal); - decalClipAlpha(color.a); + decalClipAlpha(color.a - _Cutoff); float3 normal = IN.normal; half rim = 1.0 - saturate(dot (normalize(IN.viewDir), normal)); @@ -118,7 +118,7 @@ Shader "ConformalDecals/Paint/Diffuse" { float4 color = tex2D(_Decal, IN.uv_decal); - decalClipAlpha(color.a); + decalClipAlpha(color.a - _Cutoff); float3 normal = IN.normal; half rim = 1.0 - saturate(dot (normalize(IN.viewDir), normal)); diff --git a/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab b/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab index abecf5a..4f6750c 100644 --- a/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab +++ b/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b22837b8b0daf53718793228d8e965a2604cd209b09150e656000f308c4b7993 -size 171063 +oid sha256:e439269d41a7212915a68e75beb891f9b85f107ba15de28e935f9170570a61ca +size 170387