浏览代码

Minor refactoring.

NathanSweet 11 年之前
父节点
当前提交
72a4ad4cc1
共有 3 个文件被更改,包括 3 次插入5 次删除
  1. 0 1
      spine-c/include/spine/MeshAttachment.h
  2. 3 3
      spine-c/src/spine/MeshAttachment.c
  3. 0 1
      spine-c/src/spine/SkeletonJson.c

+ 0 - 1
spine-c/include/spine/MeshAttachment.h

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

+ 3 - 3
spine-c/src/spine/MeshAttachment.c

@@ -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;
 		}

+ 0 - 1
spine-c/src/spine/SkeletonJson.c

@@ -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;