From c7017067ea2cbf2f91a7dad0c235e0408638b9bd Mon Sep 17 00:00:00 2001 From: pharan Date: Sat, 30 Sep 2017 20:37:31 +0800 Subject: [PATCH] [unity] Fix Tint and TintBlack shaders ignoring alpha. --- .../spine-unity/Modules/Shaders/Spine-Skeleton-Tint.shader | 2 +- .../Shaders/Spine-SkeletonGraphic-TintBlack.shader | 2 +- .../Assets/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Modules/Shaders/Spine-Skeleton-Tint.shader b/spine-unity/Assets/spine-unity/Modules/Shaders/Spine-Skeleton-Tint.shader index 3ef83b319..117ae495e 100644 --- a/spine-unity/Assets/spine-unity/Modules/Shaders/Spine-Skeleton-Tint.shader +++ b/spine-unity/Assets/spine-unity/Modules/Shaders/Spine-Skeleton-Tint.shader @@ -52,7 +52,7 @@ Shader "Spine/Skeleton Tint" { float4 frag (VertexOutput i) : COLOR { float4 texColor = tex2D(_MainTex, i.uv); - return (texColor * i.vertexColor) + float4(((1-texColor.rgb) * texColor.a * _Black.rgb), 0); + return (texColor * i.vertexColor) + float4(((1-texColor.rgb) * _Black.rgb * texColor.a*_Color.a*i.vertexColor.a), 0); } ENDCG } diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader index b45e14749..696d66006 100644 --- a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader +++ b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader @@ -110,7 +110,7 @@ Shader "Spine/SkeletonGraphic Tint Black (Premultiply Alpha)" clip (texColor.a - 0.001); #endif - return (texColor * IN.color) + float4(((1-texColor.rgb) * texColor.a * (_Black.rgb + float3(IN.uv1.r, IN.uv1.g, IN.uv2.r))), 0); + return (texColor * IN.color) + float4(((1-texColor.rgb) * (_Black.rgb + float3(IN.uv1.r, IN.uv1.g, IN.uv2.r)) * texColor.a*_Color.a*i.vertexColor.a), 0); } ENDCG } diff --git a/spine-unity/Assets/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader b/spine-unity/Assets/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader index 5e3420499..7eeca1e75 100644 --- a/spine-unity/Assets/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader +++ b/spine-unity/Assets/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader @@ -61,7 +61,7 @@ Shader "Spine/Skeleton Tint Black" { float4 frag (VertexOutput i) : COLOR { float4 texColor = tex2D(_MainTex, i.uv); - return (texColor * i.vertexColor) + float4(((1-texColor.rgb) * texColor.a * (_Black.rgb + float3(i.uv1.r, i.uv1.g, i.uv2.r))), 0); + return (texColor * i.vertexColor) + float4(((1-texColor.rgb) * (_Black.rgb + float3(i.uv1.r, i.uv1.g, i.uv2.r)) * texColor.a*_Color.a*i.vertexColor.a), 0); } ENDCG }