UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed URP Sprite shader treating skeleton alpha incorrectly. Closes #1735.

Browse Source
This commit is contained in:
Harald Csaszar 2020-08-07 15:40:35 +02:00
parent bb34e33aee
commit 11006baa65
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Shaders/CGIncludes/Spine-Sprite-ForwardPass-LW.hlsl
View File

@ -105,7 +105,7 @@ half4 LightweightFragmentPBRSimplified(InputData inputData, half4 texAlbedoAlpha
finalColor += inputData.vertexLighting * brdfData.diffuse; finalColor += inputData.vertexLighting * brdfData.diffuse;
#endif #endif
finalColor += emission; finalColor += emission;
return prepareLitPixelForOutput(half4(finalColor, texAlbedoAlpha.a), vertexColor); return prepareLitPixelForOutput(half4(finalColor, albedo.a), vertexColor);
} }
#else // !SPECULAR #else // !SPECULAR
@ -148,7 +148,7 @@ half4 LightweightFragmentBlinnPhongSimplified(InputData inputData, half4 texDiff
diffuseLighting += emission; diffuseLighting += emission;
//half3 finalColor = diffuseLighting * diffuse + emission; //half3 finalColor = diffuseLighting * diffuse + emission;
half3 finalColor = diffuseLighting * diffuse.rgb; half3 finalColor = diffuseLighting * diffuse.rgb;
return prepareLitPixelForOutput(half4(finalColor, texDiffuseAlpha.a), vertexColor); return prepareLitPixelForOutput(half4(finalColor, diffuse.a), vertexColor);
} }
#endif // SPECULAR #endif // SPECULAR

5
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Sprite-ForwardPass-URP.hlsl
View File

@ -105,7 +105,7 @@ half4 LightweightFragmentPBRSimplified(InputData inputData, half4 texAlbedoAlpha
finalColor += inputData.vertexLighting * brdfData.diffuse; finalColor += inputData.vertexLighting * brdfData.diffuse;
#endif #endif
finalColor += emission; finalColor += emission;
return prepareLitPixelForOutput(half4(finalColor, texAlbedoAlpha.a), vertexColor); return prepareLitPixelForOutput(half4(finalColor, albedo.a), vertexColor);
} }
#else // !SPECULAR #else // !SPECULAR
@ -148,7 +148,7 @@ half4 LightweightFragmentBlinnPhongSimplified(InputData inputData, half4 texDiff
diffuseLighting += emission; diffuseLighting += emission;
//half3 finalColor = diffuseLighting * diffuse + emission; //half3 finalColor = diffuseLighting * diffuse + emission;
half3 finalColor = diffuseLighting * diffuse.rgb; half3 finalColor = diffuseLighting * diffuse.rgb;
return prepareLitPixelForOutput(half4(finalColor, texDiffuseAlpha.a), vertexColor); return prepareLitPixelForOutput(half4(finalColor, diffuse.a), vertexColor);
} }
#endif // SPECULAR #endif // SPECULAR
@ -261,6 +261,7 @@ half4 ForwardPassFragmentSprite(VertexOutputLWRP input) : SV_Target
COLORISE(pixel) COLORISE(pixel)
APPLY_FOG_LWRP(pixel, input.fogFactorAndVertexLight.x) APPLY_FOG_LWRP(pixel, input.fogFactorAndVertexLight.x)
return pixel; return pixel;
} }