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

fix dark in both pma and non-pma (#993)

Browse Source
This commit is contained in:
Ivan Popelyshev 2017-09-28 12:22:48 +03:00 committed by Mario Zechner
parent 69923111b9
commit 8506e16f2d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-ts/webgl/src/Shader.ts
View File

@ -253,9 +253,8 @@ module spine.webgl {
void main () { void main () {
vec4 texColor = texture2D(u_texture, v_texCoords); vec4 texColor = texture2D(u_texture, v_texCoords);
float alpha = texColor.a * v_light.a; gl_FragColor.a = texColor.a * v_light.a;
gl_FragColor.a = alpha; gl_FragColor.rgb = ((texColor.a - 1.0) * v_dark.a + 1.0 - texColor.rgb) * v_dark.rgb + texColor.rgb * v_light.rgb;
gl_FragColor.rgb = (1.0 - texColor.rgb) * v_dark.rgb * alpha + texColor.rgb * v_light.rgb;
} }
`; `;

14
spine-ts/webgl/src/SkeletonRenderer.ts
View File

@ -122,8 +122,18 @@ module spine.webgl {
finalColor.b *= finalColor.a; finalColor.b *= finalColor.a;
} }
let darkColor = this.tempColor2; let darkColor = this.tempColor2;
if (slot.darkColor == null) darkColor.set(0, 0, 0, 1); if (slot.darkColor == null)
else darkColor.setFromColor(slot.darkColor); darkColor.set(0, 0, 0, 1.0);
else {
if (premultipliedAlpha) {
darkColor.r = slot.darkColor.r * finalColor.a;
darkColor.g = slot.darkColor.g * finalColor.a;
darkColor.b = slot.darkColor.b * finalColor.a;
} else {
darkColor.setFromColor(slot.darkColor);
}
darkColor.a = premultipliedAlpha ? 1.0 : 0.0;
}
let slotBlendMode = slot.data.blendMode; let slotBlendMode = slot.data.blendMode;
if (slotBlendMode != blendMode) { if (slotBlendMode != blendMode) {