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

Fixed color blending.

Browse Source
This commit is contained in:
NathanSweet 2014-10-01 17:26:44 +02:00
parent 5ffee20f53
commit f915a6c777
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spine-cocos2d-iphone/3.0/src/spine/SkeletonRenderer.m
View File

@ -199,12 +199,18 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0};
[self setBlendMode:[CCBlendMode blendModeWithOptions:@{CCBlendFuncSrcColor: @(_blendFunc.src),CCBlendFuncDstColor: @(slot->data->additiveBlending ? GL_ONE : _blendFunc.dst)}]]; [self setBlendMode:[CCBlendMode blendModeWithOptions:@{CCBlendFuncSrcColor: @(_blendFunc.src),CCBlendFuncDstColor: @(slot->data->additiveBlending ? GL_ONE : _blendFunc.dst)}]];
additive = slot->data->additiveBlending; additive = slot->data->additiveBlending;
} }
color.a = _skeleton->a * slot->a * a * 255; if (_premultipliedAlpha) {
float multiplier = _premultipliedAlpha ? color.a : 255; a *= _skeleton->a * slot->a;
color.r = _skeleton->r * slot->r * r * multiplier; r *= _skeleton->r * slot->r * a;
color.g = _skeleton->g * slot->g * g * multiplier; g *= _skeleton->g * slot->g * a;
color.b = _skeleton->b * slot->b * b * multiplier; b *= _skeleton->b * slot->b * a;
self.texture = texture; } else {
a *= _skeleton->a * slot->a;
r *= _skeleton->r * slot->r;
g *= _skeleton->g * slot->g;
b *= _skeleton->b * slot->b;
}
self.texture = texture;
CGSize size = texture.contentSize; CGSize size = texture.contentSize;
GLKVector2 center = GLKVector2Make(size.width / 2.0, size.height / 2.0); GLKVector2 center = GLKVector2Make(size.width / 2.0, size.height / 2.0);
GLKVector2 extents = GLKVector2Make(size.width / 2.0, size.height / 2.0); GLKVector2 extents = GLKVector2Make(size.width / 2.0, size.height / 2.0);
@ -213,7 +219,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0};
for (int i = 0; i * 2 < verticesCount; ++i) { for (int i = 0; i * 2 < verticesCount; ++i) {
CCVertex vertex; CCVertex vertex;
vertex.position = GLKVector4Make(worldVertices[i * 2], worldVertices[i * 2 + 1], 0.0, 1.0); vertex.position = GLKVector4Make(worldVertices[i * 2], worldVertices[i * 2 + 1], 0.0, 1.0);
vertex.color = GLKVector4Make(color.r, color.g, color.b, color.a); vertex.color = GLKVector4Make(r, g, b, a);
vertex.texCoord1 = GLKVector2Make(uvs[i * 2], 1 - uvs[i * 2 + 1]); vertex.texCoord1 = GLKVector2Make(uvs[i * 2], 1 - uvs[i * 2 + 1]);
CCRenderBufferSetVertex(buffer, i, CCVertexApplyTransform(vertex, transform)); CCRenderBufferSetVertex(buffer, i, CCVertexApplyTransform(vertex, transform));
} }