From 66435fea9e6200ca6e47ad550489ecabfdf5ca40 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Sun, 6 Apr 2025 00:30:39 -0400 Subject: [PATCH] [libgdx] Constraint clean up. --- .../esotericsoftware/spine/IkConstraint.java | 13 ++----------- .../esotericsoftware/spine/PathConstraint.java | 13 ++----------- .../spine/PhysicsConstraint.java | 17 ++--------------- .../spine/TransformConstraint.java | 15 ++------------- 4 files changed, 8 insertions(+), 50 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java index 0a54e3f12..cf91d8c49 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java @@ -61,22 +61,13 @@ public class IkConstraint implements Updatable { target = skeleton.bones.get(data.target.index); - mix = data.mix; - softness = data.softness; - bendDirection = data.bendDirection; - compress = data.compress; - stretch = data.stretch; + setToSetupPose(); } /** Copy constructor. */ public IkConstraint (IkConstraint constraint, Skeleton skeleton) { this(constraint.data, skeleton); - - mix = constraint.mix; - softness = constraint.softness; - bendDirection = constraint.bendDirection; - compress = constraint.compress; - stretch = constraint.stretch; + setToSetupPose(); } public void setToSetupPose () { diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java index 93c43df5e..375faef48 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java @@ -72,22 +72,13 @@ public class PathConstraint implements Updatable { slot = skeleton.slots.get(data.slot.index); - position = data.position; - spacing = data.spacing; - mixRotate = data.mixRotate; - mixX = data.mixX; - mixY = data.mixY; + setToSetupPose(); } /** Copy constructor. */ public PathConstraint (PathConstraint constraint, Skeleton skeleton) { this(constraint.data, skeleton); - - position = constraint.position; - spacing = constraint.spacing; - mixRotate = constraint.mixRotate; - mixX = constraint.mixX; - mixY = constraint.mixY; + setToSetupPose(); } public void setToSetupPose () { diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java index c9d30ce69..e59c7e076 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java @@ -61,26 +61,13 @@ public class PhysicsConstraint implements Updatable { bone = skeleton.bones.get(data.bone.index); - inertia = data.inertia; - strength = data.strength; - damping = data.damping; - massInverse = data.massInverse; - wind = data.wind; - gravity = data.gravity; - mix = data.mix; + setToSetupPose(); } /** Copy constructor. */ public PhysicsConstraint (PhysicsConstraint constraint, Skeleton skeleton) { this(constraint.data, skeleton); - - inertia = constraint.inertia; - strength = constraint.strength; - damping = constraint.damping; - massInverse = constraint.massInverse; - wind = constraint.wind; - gravity = constraint.gravity; - mix = constraint.mix; + setToSetupPose(); } public void reset () { diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java index fca0f15f7..8da1b1d2e 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java @@ -62,24 +62,13 @@ public class TransformConstraint implements Updatable { source = skeleton.bones.get(data.source.index); - mixRotate = data.mixRotate; - mixX = data.mixX; - mixY = data.mixY; - mixScaleX = data.mixScaleX; - mixScaleY = data.mixScaleY; - mixShearY = data.mixShearY; + setToSetupPose(); } /** Copy constructor. */ public TransformConstraint (TransformConstraint constraint, Skeleton skeleton) { this(constraint.data, skeleton); - - mixRotate = constraint.mixRotate; - mixX = constraint.mixX; - mixY = constraint.mixY; - mixScaleX = constraint.mixScaleX; - mixScaleY = constraint.mixScaleY; - mixShearY = constraint.mixShearY; + setToSetupPose(); } public void setToSetupPose () {