From 18edca9e4381180a29b751bc867946ff45e974a7 Mon Sep 17 00:00:00 2001 From: fgnm Date: Fri, 19 Apr 2024 12:45:00 +0200 Subject: [PATCH] Update Spine support to 4.2 --- CHANGES | 1 + assets/plugins/plugin-tiled-0.1.5.jar | Bin 103056 -> 103123 bytes gradle.properties | 4 ++-- h2d-libgdx-bvb-extension | 2 +- h2d-libgdx-spine-extension | 2 +- h2d-libgdx-talos-extension | 2 +- .../plugin/tiled/view/SpineDrawable.java | 4 ++-- .../view/ui/widget/actors/SpineActor.java | 4 ++-- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 977effdb..125debbe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,5 @@ [0.1.5] +- [BREAK CHANGE] Update Spine runtime support to `4.2.0` - Add Items Tree search filter [0.1.4] diff --git a/assets/plugins/plugin-tiled-0.1.5.jar b/assets/plugins/plugin-tiled-0.1.5.jar index f94f8a6fe44a8da2e15084009a1880550a65d883..823b404bb3ae0905d011993b7b01d4306fd0dca0 100644 GIT binary patch delta 4189 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 delta 4200 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 drawOrder = skeleton.getDrawOrder(); minX = Float.MAX_VALUE; @@ -95,7 +95,7 @@ public class SpineDrawable extends BaseDrawable { @Override public void draw(Batch batch, float x, float y, float width, float height) { - skeleton.updateWorldTransform(); + skeleton.updateWorldTransform(Skeleton.Physics.update); animationState.update(Gdx.graphics.getDeltaTime()); animationState.apply(skeleton); skeleton.setPosition(x, y - 20); diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java b/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java index 776d75df..0642c9eb 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java +++ b/src/main/java/games/rednblack/editor/view/ui/widget/actors/SpineActor.java @@ -39,7 +39,7 @@ public class SpineActor extends Actor { private void computeBoundBox() { skeleton.setPosition(0, 0); - skeleton.updateWorldTransform(); + skeleton.updateWorldTransform(Skeleton.Physics.update); Array drawOrder = skeleton.getDrawOrder(); minX = Float.MAX_VALUE; @@ -130,7 +130,7 @@ public class SpineActor extends Actor { @Override public void act(float delta) { - skeleton.updateWorldTransform(); // + skeleton.updateWorldTransform(Skeleton.Physics.update); // state.update(delta); state.apply(skeleton); super.act(delta);