[c] Fixed binary loader

This commit is contained in:
badlogic 2016-10-19 12:54:47 +02:00
parent fc373f9791
commit 2e04c98b9e
2 changed files with 7 additions and 7 deletions

View File

@ -867,7 +867,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const
data->shearX = readFloat(input); data->shearX = readFloat(input);
data->shearY = readFloat(input); data->shearY = readFloat(input);
data->length = readFloat(input) * self->scale; data->length = readFloat(input) * self->scale;
mode = readInt(input); mode = readVarint(input, 1);
switch (mode) { switch (mode) {
case 0: data->transformMode = SP_TRANSFORMMODE_NORMAL; break; case 0: data->transformMode = SP_TRANSFORMMODE_NORMAL; break;
case 1: data->transformMode = SP_TRANSFORMMODE_ONLYTRANSLATION; break; case 1: data->transformMode = SP_TRANSFORMMODE_ONLYTRANSLATION; break;
@ -901,7 +901,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const
const char* name = readString(input); const char* name = readString(input);
/* TODO Avoid copying of name */ /* TODO Avoid copying of name */
spIkConstraintData* data = spIkConstraintData_create(name); spIkConstraintData* data = spIkConstraintData_create(name);
data->order = readInt(input); data->order = readVarint(input, 1);
FREE(name); FREE(name);
data->bonesCount = readVarint(input, 1); data->bonesCount = readVarint(input, 1);
data->bones = MALLOC(spBoneData*, data->bonesCount); data->bones = MALLOC(spBoneData*, data->bonesCount);
@ -921,7 +921,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const
const char* name = readString(input); const char* name = readString(input);
/* TODO Avoid copying of name */ /* TODO Avoid copying of name */
spTransformConstraintData* data = spTransformConstraintData_create(name); spTransformConstraintData* data = spTransformConstraintData_create(name);
data->order = readInt(input); data->order = readVarint(input, 1);
FREE(name); FREE(name);
data->bonesCount = readVarint(input, 1); data->bonesCount = readVarint(input, 1);
CONST_CAST(spBoneData**, data->bones) = MALLOC(spBoneData*, data->bonesCount); CONST_CAST(spBoneData**, data->bones) = MALLOC(spBoneData*, data->bonesCount);
@ -948,7 +948,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const
const char* name = readString(input); const char* name = readString(input);
/* TODO Avoid copying of name */ /* TODO Avoid copying of name */
spPathConstraintData* data = spPathConstraintData_create(name); spPathConstraintData* data = spPathConstraintData_create(name);
data->order = readInt(input); data->order = readVarint(input, 1);
FREE(name); FREE(name);
data->bonesCount = readVarint(input, 1); data->bonesCount = readVarint(input, 1);
CONST_CAST(spBoneData**, data->bones) = MALLOC(spBoneData*, data->bonesCount); CONST_CAST(spBoneData**, data->bones) = MALLOC(spBoneData*, data->bonesCount);

View File

@ -94,9 +94,9 @@ void testcase (void func(SkeletonData* skeletonData, Atlas* atlas),
func(skeletonData, atlas); func(skeletonData, atlas);
SkeletonData_dispose(skeletonData); SkeletonData_dispose(skeletonData);
// skeletonData = readSkeletonBinaryData(binaryName, atlas, scale); skeletonData = readSkeletonBinaryData(binaryName, atlas, scale);
// func(skeletonData, atlas); func(skeletonData, atlas);
// SkeletonData_dispose(skeletonData); SkeletonData_dispose(skeletonData);
Atlas_dispose(atlas); Atlas_dispose(atlas);
} }