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 cocos2d texture atlas usage.

Browse Source 
Super cool API you got going there, cocos2d... :|
This commit is contained in:
NathanSweet 2013-04-18 19:08:11 +02:00
parent 10f3142720
commit 7193122908
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-c/src/spine/Atlas.c
View File

@ -31,10 +31,6 @@
namespace spine { namespace spine {
#endif #endif
typedef struct _AtlasPageVtable {
void (*dispose) (AtlasPage* self);
} _AtlasPageVtable;
AtlasPage* AtlasPage_create (const char* name) { AtlasPage* AtlasPage_create (const char* name) {
AtlasPage* self = NEW(AtlasPage); AtlasPage* self = NEW(AtlasPage);
MALLOC_STR(self->name, name); MALLOC_STR(self->name, name);

37
spine-cocos2d-iphone/src/spine/spine-cocos2d-iphone.m
View File

@ -74,15 +74,14 @@ void RegionAttachment_updateQuad (RegionAttachment* self, Slot* slot, ccV3F_C4B_
quad->br.colors.b = b; quad->br.colors.b = b;
quad->br.colors.a = a; quad->br.colors.a = a;
float* offset = self->offset; quad->bl.vertices.x = self->vertices[VERTEX_X1];
quad->bl.vertices.x = offset[VERTEX_X1] * slot->bone->m00 + offset[VERTEX_Y1] * slot->bone->m01 + slot->bone->worldX; quad->bl.vertices.y = self->vertices[VERTEX_Y1];
quad->bl.vertices.y = offset[VERTEX_X1] * slot->bone->m10 + offset[VERTEX_Y1] * slot->bone->m11 + slot->bone->worldY; quad->tl.vertices.x = self->vertices[VERTEX_X2];
quad->tl.vertices.x = offset[VERTEX_X2] * slot->bone->m00 + offset[VERTEX_Y2] * slot->bone->m01 + slot->bone->worldX; quad->tl.vertices.y = self->vertices[VERTEX_Y2];
quad->tl.vertices.y = offset[VERTEX_X2] * slot->bone->m10 + offset[VERTEX_Y2] * slot->bone->m11 + slot->bone->worldY; quad->tr.vertices.x = self->vertices[VERTEX_X3];
quad->tr.vertices.x = offset[VERTEX_X3] * slot->bone->m00 + offset[VERTEX_Y3] * slot->bone->m01 + slot->bone->worldX; quad->tr.vertices.y = self->vertices[VERTEX_Y3];
quad->tr.vertices.y = offset[VERTEX_X3] * slot->bone->m10 + offset[VERTEX_Y3] * slot->bone->m11 + slot->bone->worldY; quad->br.vertices.x = self->vertices[VERTEX_X4];
quad->br.vertices.x = offset[VERTEX_X4] * slot->bone->m00 + offset[VERTEX_Y4] * slot->bone->m01 + slot->bone->worldX; quad->br.vertices.y = self->vertices[VERTEX_Y4];
quad->br.vertices.y = offset[VERTEX_X4] * slot->bone->m10 + offset[VERTEX_Y4] * slot->bone->m11 + slot->bone->worldY;
if (self->region->rotate) { if (self->region->rotate) {
quad->tl.texCoords.u = self->region->u; quad->tl.texCoords.u = self->region->u;
@ -223,7 +222,11 @@ void RegionAttachment_updateQuad (RegionAttachment* self, Slot* slot, ccV3F_C4B_
skeleton->a = self.opacity / (float)255; skeleton->a = self.opacity / (float)255;
CCTextureAtlas* textureAtlas = 0; CCTextureAtlas* textureAtlas = 0;
int quadCount = 0; ccV3F_C4B_T2F_Quad quad;
quad.tl.vertices.z = 0;
quad.tr.vertices.z = 0;
quad.bl.vertices.z = 0;
quad.br.vertices.z = 0;
for (int i = 0, n = skeleton->slotCount; i < n; i++) { for (int i = 0, n = skeleton->slotCount; i < n; i++) {
Slot* slot = skeleton->slots[i]; Slot* slot = skeleton->slots[i];
if (!slot->attachment || slot->attachment->type != ATTACHMENT_REGION) continue; if (!slot->attachment || slot->attachment->type != ATTACHMENT_REGION) continue;
@ -231,17 +234,19 @@ void RegionAttachment_updateQuad (RegionAttachment* self, Slot* slot, ccV3F_C4B_
CCTextureAtlas* regionTextureAtlas = (CCTextureAtlas*)attachment->region->page->texture; CCTextureAtlas* regionTextureAtlas = (CCTextureAtlas*)attachment->region->page->texture;
if (regionTextureAtlas != textureAtlas) { if (regionTextureAtlas != textureAtlas) {
if (textureAtlas) { if (textureAtlas) {
[textureAtlas drawNumberOfQuads:quadCount]; [textureAtlas drawQuads];
quadCount = 0; [textureAtlas removeAllQuads];
} }
} }
textureAtlas = regionTextureAtlas; textureAtlas = regionTextureAtlas;
if (textureAtlas.capacity == quadCount && ![textureAtlas resizeCapacity:quadCount * 2]) return; if (textureAtlas.capacity == textureAtlas.totalQuads &&
RegionAttachment_updateQuad(attachment, slot, &textureAtlas.quads[quadCount++]); ![textureAtlas resizeCapacity:textureAtlas.capacity * 2]) return;
RegionAttachment_updateQuad(attachment, slot, &quad);
[textureAtlas updateQuad:&quad atIndex:textureAtlas.totalQuads];
} }
if (textureAtlas) { if (textureAtlas) {
[textureAtlas drawNumberOfQuads:quadCount]; [textureAtlas drawQuads];
quadCount = 0; [textureAtlas removeAllQuads];
} }
if (debugSlots) { if (debugSlots) {

37
spine-cocos2dx/src/spine/spine-cocos2dx.cpp
View File

@ -78,15 +78,14 @@ void RegionAttachment_updateQuad (RegionAttachment* self, Slot* slot, ccV3F_C4B_
quad->br.colors.b = b; quad->br.colors.b = b;
quad->br.colors.a = a; quad->br.colors.a = a;
float* offset = self->offset; quad->bl.vertices.x = self->vertices[VERTEX_X1];
quad->bl.vertices.x = offset[VERTEX_X1] * slot->bone->m00 + offset[VERTEX_Y1] * slot->bone->m01 + slot->bone->worldX; quad->bl.vertices.y = self->vertices[VERTEX_Y1];
quad->bl.vertices.y = offset[VERTEX_X1] * slot->bone->m10 + offset[VERTEX_Y1] * slot->bone->m11 + slot->bone->worldY; quad->tl.vertices.x = self->vertices[VERTEX_X2];
quad->tl.vertices.x = offset[VERTEX_X2] * slot->bone->m00 + offset[VERTEX_Y2] * slot->bone->m01 + slot->bone->worldX; quad->tl.vertices.y = self->vertices[VERTEX_Y2];
quad->tl.vertices.y = offset[VERTEX_X2] * slot->bone->m10 + offset[VERTEX_Y2] * slot->bone->m11 + slot->bone->worldY; quad->tr.vertices.x = self->vertices[VERTEX_X3];
quad->tr.vertices.x = offset[VERTEX_X3] * slot->bone->m00 + offset[VERTEX_Y3] * slot->bone->m01 + slot->bone->worldX; quad->tr.vertices.y = self->vertices[VERTEX_Y3];
quad->tr.vertices.y = offset[VERTEX_X3] * slot->bone->m10 + offset[VERTEX_Y3] * slot->bone->m11 + slot->bone->worldY; quad->br.vertices.x = self->vertices[VERTEX_X4];
quad->br.vertices.x = offset[VERTEX_X4] * slot->bone->m00 + offset[VERTEX_Y4] * slot->bone->m01 + slot->bone->worldX; quad->br.vertices.y = self->vertices[VERTEX_Y4];
quad->br.vertices.y = offset[VERTEX_X4] * slot->bone->m10 + offset[VERTEX_Y4] * slot->bone->m11 + slot->bone->worldY;
if (self->region->rotate) { if (self->region->rotate) {
quad->tl.texCoords.u = self->region->u; quad->tl.texCoords.u = self->region->u;
@ -189,7 +188,11 @@ void CCSkeleton::draw () {
skeleton->a = getOpacity() / (float)255; skeleton->a = getOpacity() / (float)255;
CCTextureAtlas* textureAtlas = 0; CCTextureAtlas* textureAtlas = 0;
int quadCount = 0; ccV3F_C4B_T2F_Quad quad;
quad.tl.vertices.z = 0;
quad.tr.vertices.z = 0;
quad.bl.vertices.z = 0;
quad.br.vertices.z = 0;
for (int i = 0, n = skeleton->slotCount; i < n; i++) { for (int i = 0, n = skeleton->slotCount; i < n; i++) {
Slot* slot = skeleton->slots[i]; Slot* slot = skeleton->slots[i];
if (!slot->attachment || slot->attachment->type != ATTACHMENT_REGION) continue; if (!slot->attachment || slot->attachment->type != ATTACHMENT_REGION) continue;
@ -197,17 +200,19 @@ void CCSkeleton::draw () {
CCTextureAtlas* regionTextureAtlas = (CCTextureAtlas*)attachment->region->page->texture; CCTextureAtlas* regionTextureAtlas = (CCTextureAtlas*)attachment->region->page->texture;
if (regionTextureAtlas != textureAtlas) { if (regionTextureAtlas != textureAtlas) {
if (textureAtlas) { if (textureAtlas) {
textureAtlas->drawNumberOfQuads(quadCount); textureAtlas->drawQuads();
quadCount = 0; textureAtlas->removeAllQuads();
} }
} }
textureAtlas = regionTextureAtlas; textureAtlas = regionTextureAtlas;
if (textureAtlas->getCapacity() == quadCount && !textureAtlas->resizeCapacity(quadCount * 2)) return; if (textureAtlas->getCapacity() == textureAtlas->getTotalQuads() &&
RegionAttachment_updateQuad(attachment, slot, &textureAtlas->getQuads()[quadCount++]); !textureAtlas->resizeCapacity(textureAtlas->getCapacity() * 2)) return;
RegionAttachment_updateQuad(attachment, slot, &quad);
textureAtlas->updateQuad(&quad, textureAtlas->getTotalQuads());
} }
if (textureAtlas) { if (textureAtlas) {
textureAtlas->drawNumberOfQuads(quadCount); textureAtlas->drawQuads();
quadCount = 0; textureAtlas->removeAllQuads();
} }
if (debugSlots) { if (debugSlots) {