Skip to content

Commit 0846e9a

Browse files
author
pandamicro
committed
Fix skeleton webgl render command
1 parent 1d856ef commit 0846e9a

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

Diff for: extensions/spine/CCSkeletonWebGLRenderCmd.js

+5-11
Original file line numberDiff line numberDiff line change
@@ -191,17 +191,11 @@
191191
proto._updateRegionAttachmentQuad = function(self, slot, quad, premultipliedAlpha) {
192192
var vertices = {};
193193
self.computeVertices(slot.bone.skeleton.x, slot.bone.skeleton.y, slot.bone, vertices);
194-
var r = slot.bone.skeleton.r * slot.r * 255;
195-
var g = slot.bone.skeleton.g * slot.g * 255;
196-
var b = slot.bone.skeleton.b * slot.b * 255;
197-
var normalizedAlpha = slot.bone.skeleton.a * slot.a;
198-
199-
if (premultipliedAlpha) {
200-
r *= normalizedAlpha;
201-
g *= normalizedAlpha;
202-
b *= normalizedAlpha;
203-
}
204-
var a = normalizedAlpha * 255;
194+
var a = slot.bone.skeleton.a * slot.a * attachment.a * 255;
195+
var multiplier = premultipliedAlpha ? a : 255;
196+
var r = slot.bone.skeleton.r * slot.r * attachment.r * multiplier;
197+
var g = slot.bone.skeleton.g * slot.g * attachment.g * multiplier;
198+
var b = slot.bone.skeleton.b * slot.b * attachment.b * multiplier;
205199

206200
quad.bl.colors.r = quad.tl.colors.r = quad.tr.colors.r = quad.br.colors.r = r;
207201
quad.bl.colors.g = quad.tl.colors.g = quad.tr.colors.g = quad.br.colors.g = g;

0 commit comments

Comments
 (0)