diff --git a/examples/export/runtimes.sh b/examples/export/runtimes.sh index 7c7e48532..9450ace69 100755 --- a/examples/export/runtimes.sh +++ b/examples/export/runtimes.sh @@ -275,6 +275,13 @@ cp -f ../spineboy/export/spineboy-pro.json "$ROOT/spine-sdl/data/" cp -f ../spineboy/export/spineboy-pma.atlas "$ROOT/spine-sdl/data/" cp -f ../spineboy/export/spineboy-pma.png "$ROOT/spine-sdl/data/" +echo "spine-glfw" +rm -f "$ROOT/spine-glfw/data/"* +cp -f ../spineboy/export/spineboy-pro.json "$ROOT/spine-glfw/data/" +cp -f ../spineboy/export/spineboy-pro.skel "$ROOT/spine-glfw/data/" +cp -f ../spineboy/export/spineboy-pma.atlas "$ROOT/spine-glfw/data/" +cp -f ../spineboy/export/spineboy-pma.png "$ROOT/spine-glfw/data/" + echo "spine-sfml-c" rm "$ROOT/spine-sfml/c/data/"* cp -f ../coin/export/coin-pro.json "$ROOT/spine-sfml/c/data/" diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index 1fa0871bc..0fe7a0332 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -608,8 +608,8 @@ Attachment *SkeletonBinary::readAttachment(DataInput *input, Skin *skin, int slo setError("Error reading attachment: ", name.buffer()); return NULL; } - readVertices(input, box->getVertices(), box->getBones(), (flags & 16) != 0); - box->setWorldVerticesLength(box->getVertices().size()); + int verticesLength = readVertices(input, box->getVertices(), box->getBones(), (flags & 16) != 0); + box->setWorldVerticesLength(verticesLength); if (nonessential) { readColor(input, box->getColor()); } diff --git a/spine-glfw/data/spineboy-pro.skel b/spine-glfw/data/spineboy-pro.skel new file mode 100644 index 000000000..09e564b7e Binary files /dev/null and b/spine-glfw/data/spineboy-pro.skel differ diff --git a/spine-glfw/example/main.cpp b/spine-glfw/example/main.cpp index 61575d8e6..7210b98fd 100644 --- a/spine-glfw/example/main.cpp +++ b/spine-glfw/example/main.cpp @@ -40,7 +40,7 @@ int main() { GlTextureLoader textureLoader; Atlas *atlas = new Atlas("data/spineboy-pma.atlas", &textureLoader); SkeletonJson json(atlas); - SkeletonData *skeletonData = json.readSkeletonDataFile("data/spineboy-pro.json"); + SkeletonData *skeletonData = json.readSkeletonDataFile("data/spineboy-pro.skel"); // Create a skeleton from the data, set the skeleton's position to the bottom center of // the screen and scale it to make it smaller.