UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-04 06:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fix Tint and TintBlack shaders ignoring alpha.

Browse Source
This commit is contained in:
pharan 2017-09-30 20:37:31 +08:00
parent 3f242450cf
commit c7017067ea
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/spine-unity/Modules/Shaders/Spine-Skeleton-Tint.shader
View File

@ -52,7 +52,7 @@ Shader "Spine/Skeleton Tint" {
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : COLOR {
float4 texColor = tex2D(_MainTex, i.uv); 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 ENDCG
} }

2
spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader
View File

@ -110,7 +110,7 @@ Shader "Spine/SkeletonGraphic Tint Black (Premultiply Alpha)"
clip (texColor.a - 0.001); clip (texColor.a - 0.001);
#endif #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 ENDCG
} }

2
spine-unity/Assets/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader
View File

@ -61,7 +61,7 @@ Shader "Spine/Skeleton Tint Black" {
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : COLOR {
float4 texColor = tex2D(_MainTex, i.uv); 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 ENDCG
} }