From 2e04c98b9ee3160f2a0e16f5be73e379fa10bd9f Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 19 Oct 2016 12:54:47 +0200 Subject: [PATCH] [c] Fixed binary loader --- spine-c/src/spine/SkeletonBinary.c | 8 ++++---- spine-sfml/example/main.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spine-c/src/spine/SkeletonBinary.c b/spine-c/src/spine/SkeletonBinary.c index dcd39a871..9e7a3cd16 100644 --- a/spine-c/src/spine/SkeletonBinary.c +++ b/spine-c/src/spine/SkeletonBinary.c @@ -867,7 +867,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const data->shearX = readFloat(input); data->shearY = readFloat(input); data->length = readFloat(input) * self->scale; - mode = readInt(input); + mode = readVarint(input, 1); switch (mode) { case 0: data->transformMode = SP_TRANSFORMMODE_NORMAL; break; case 1: data->transformMode = SP_TRANSFORMMODE_ONLYTRANSLATION; break; @@ -901,7 +901,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const const char* name = readString(input); /* TODO Avoid copying of name */ spIkConstraintData* data = spIkConstraintData_create(name); - data->order = readInt(input); + data->order = readVarint(input, 1); FREE(name); data->bonesCount = readVarint(input, 1); data->bones = MALLOC(spBoneData*, data->bonesCount); @@ -921,7 +921,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const const char* name = readString(input); /* TODO Avoid copying of name */ spTransformConstraintData* data = spTransformConstraintData_create(name); - data->order = readInt(input); + data->order = readVarint(input, 1); FREE(name); data->bonesCount = readVarint(input, 1); CONST_CAST(spBoneData**, data->bones) = MALLOC(spBoneData*, data->bonesCount); @@ -948,7 +948,7 @@ spSkeletonData* spSkeletonBinary_readSkeletonData (spSkeletonBinary* self, const const char* name = readString(input); /* TODO Avoid copying of name */ spPathConstraintData* data = spPathConstraintData_create(name); - data->order = readInt(input); + data->order = readVarint(input, 1); FREE(name); data->bonesCount = readVarint(input, 1); CONST_CAST(spBoneData**, data->bones) = MALLOC(spBoneData*, data->bonesCount); diff --git a/spine-sfml/example/main.cpp b/spine-sfml/example/main.cpp index 54c771a59..306149b37 100644 --- a/spine-sfml/example/main.cpp +++ b/spine-sfml/example/main.cpp @@ -94,9 +94,9 @@ void testcase (void func(SkeletonData* skeletonData, Atlas* atlas), func(skeletonData, atlas); SkeletonData_dispose(skeletonData); - // skeletonData = readSkeletonBinaryData(binaryName, atlas, scale); - // func(skeletonData, atlas); - // SkeletonData_dispose(skeletonData); + skeletonData = readSkeletonBinaryData(binaryName, atlas, scale); + func(skeletonData, atlas); + SkeletonData_dispose(skeletonData); Atlas_dispose(atlas); }