diff --git a/spine-cpp/tests/HeadlessTest.cpp b/spine-cpp/tests/HeadlessTest.cpp index 7a0c43c32..e0ba67d70 100644 --- a/spine-cpp/tests/HeadlessTest.cpp +++ b/spine-cpp/tests/HeadlessTest.cpp @@ -106,8 +106,6 @@ int main(int argc, char *argv[]) { // Create skeleton instance Skeleton skeleton(*skeletonData); - skeleton.setupPose(); - // Set animation if provided AnimationState *state = nullptr; AnimationStateData *stateData = nullptr; diff --git a/spine-glfw/example/main-c.cpp b/spine-glfw/example/main-c.cpp index ab205a122..577d6f421 100644 --- a/spine-glfw/example/main-c.cpp +++ b/spine-glfw/example/main-c.cpp @@ -97,7 +97,7 @@ int main() { // spine_skeleton_data_result result = spine_skeleton_data_load_binary(atlas, skeleton_bytes, skeleton_length); uint8_t *skeleton_bytes = read_file("data/spineboy-pro.json", &skeleton_length); - spine_skeleton_data_result result2 = spine_skeleton_data_load_json(atlas, (const char *) skeleton_bytes); + spine_skeleton_data_result result2 = spine_skeleton_data_load_json(atlas, (const char *) skeleton_bytes, "data/"); spine_skeleton_data skeleton_data = spine_skeleton_data_result_get_data(result2); // Create a skeleton from the data, set the skeleton's position to the bottom center of diff --git a/spine-glfw/example/main.cpp b/spine-glfw/example/main.cpp index 0cbf8a88b..aba0c4985 100644 --- a/spine-glfw/example/main.cpp +++ b/spine-glfw/example/main.cpp @@ -80,14 +80,16 @@ int main() { skeleton.setPosition(width / 2, height - 100); skeleton.setScaleX(0.3); skeleton.setScaleY(0.3); + skeleton.setupPose(); // Create an AnimationState to drive animations on the skeleton. Set the "portal" animation // on track with index 0. AnimationStateData animationStateData(skeletonData); animationStateData.setDefaultMix(0.2f); AnimationState animationState(&animationStateData); - animationState.setAnimation(0, "portal", true); - animationState.addAnimation(0, "run", true, 0); + // animationState.setAnimation(0, "portal", true); + // animationState.addAnimation(0, "run", true, 0); + animationState.setAnimation(0, "idle", true); // Create the renderer and set the viewport size to match the window size. This sets up a // pixel perfect orthogonal projection for 2D rendering. diff --git a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/HeadlessTest.java b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/HeadlessTest.java index cd16262e1..845a12db3 100644 --- a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/HeadlessTest.java +++ b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/HeadlessTest.java @@ -137,8 +137,6 @@ public class HeadlessTest implements ApplicationListener { // Create skeleton instance Skeleton skeleton = new Skeleton(skeletonData); - skeleton.setupPose(); - // Set animation if provided AnimationState state = null; if (animationName != null) { diff --git a/tests/src/generate-java-serializer.ts b/tests/src/generate-java-serializer.ts index 125136904..b9eda514c 100644 --- a/tests/src/generate-java-serializer.ts +++ b/tests/src/generate-java-serializer.ts @@ -193,7 +193,7 @@ function generateJavaFromIR (ir: SerializerIR): string { javaOutput.push(' json.writeValue(visitedObjects.get(obj));'); javaOutput.push(' return;'); javaOutput.push(' }'); - + // Generate reference string for this object (only when first encountered) // Only use name if there's a proper getName() method returning String const nameGetter = method.properties.find(p => diff --git a/todos/todos.md b/todos/todos.md index 938b572e4..440c78970 100644 --- a/todos/todos.md +++ b/todos/todos.md @@ -1,3 +1,4 @@ +- c++ clipping appears broken, try with portal animation in spine-glfw - spine-c/codegen type extractor should also report typedefs like typedef long long PropertyId; so primitive type to some name, and we need to handle that in the codegen - Generate language bindings in spine-c/codegen - Use CClassOrStruct, CEnum that get generated from spine-cpp-types.json and generate