Minor refactoring.

This commit is contained in:
NathanSweet 2014-05-14 21:49:15 +02:00
parent 1a06c9fdde
commit 72a4ad4cc1
3 changed files with 3 additions and 5 deletions

View File

@ -48,7 +48,6 @@ struct spMeshAttachment {
float* vertices;
int hullLength;
int uvsCount;
float* regionUVs;
float* uvs;

View File

@ -57,14 +57,14 @@ void spMeshAttachment_updateUVs (spMeshAttachment* self) {
int i;
float width = self->regionU2 - self->regionU, height = self->regionV2 - self->regionV;
FREE(self->uvs);
self->uvs = MALLOC(float, self->uvsCount);
self->uvs = MALLOC(float, self->verticesCount);
if (self->regionRotate) {
for (i = 0; i < self->uvsCount; i += 2) {
for (i = 0; i < self->verticesCount; i += 2) {
self->uvs[i] = self->regionU + self->regionUVs[i + 1] * width;
self->uvs[i + 1] = self->regionV + height - self->regionUVs[i] * height;
}
} else {
for (i = 0; i < self->uvsCount; i += 2) {
for (i = 0; i < self->verticesCount; i += 2) {
self->uvs[i] = self->regionU + self->regionUVs[i] * width;
self->uvs[i + 1] = self->regionV + self->regionUVs[i + 1] * height;
}

View File

@ -549,7 +549,6 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
mesh->triangles[i] = entry->valueInt;
entry = Json_getItem(attachmentMap, "uvs");
mesh->uvsCount = entry->size;
mesh->regionUVs = MALLOC(float, entry->size);
for (entry = entry->child, i = 0; entry; entry = entry->next, ++i)
mesh->regionUVs[i] = entry->valueFloat;