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 e5b8f3b..42fbfd2 100644 Binary files a/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab and b/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab differ