diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java index 911d480c7..1b2406c17 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -179,7 +179,7 @@ public class Animation { event, drawOrder, // ikConstraint, transformConstraint, // pathConstraintPosition, pathConstraintSpacing, pathConstraintMix, // - physicsConstraintInertia, physicsConstraintStrength, physicsConstraintDamping, physicsConstraintFriction, // + physicsConstraintInertia, physicsConstraintStrength, physicsConstraintDamping, // physicsConstraintMass, physicsConstraintWind, physicsConstraintGravity, physicsConstraintMix, // sequence } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraintData.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraintData.java index 410c8d689..9f2c6d115 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraintData.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraintData.java @@ -35,7 +35,7 @@ package com.esotericsoftware.spine; public class PhysicsConstraintData extends ConstraintData { BoneData bone; boolean x, y, rotate, scaleX, shearX; - float step, inertia, strength, damping, friction, mass, wind, gravity, mix; + float step, inertia, strength, damping, mass, wind, gravity, mix; public PhysicsConstraintData (String name) { super(name); @@ -122,14 +122,6 @@ public class PhysicsConstraintData extends ConstraintData { this.damping = damping; } - public float getFriction () { - return friction; - } - - public void setFriction (float friction) { - this.friction = friction; - } - /** The inverse of the mass. */ public float getMass () { return mass; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java index 782d63ad6..e7d9336f1 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java @@ -320,7 +320,6 @@ public class SkeletonBinary extends SkeletonLoader { data.inertia = input.readFloat(); data.strength = input.readFloat(); data.damping = input.readFloat(); - data.friction = input.readFloat(); data.mass = input.readFloat(); data.wind = input.readFloat(); data.gravity = input.readFloat(); diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java index 6c023d4be..24d16fabc 100644 --- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java +++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java @@ -268,6 +268,7 @@ public class SkeletonViewer extends ApplicationAdapter { delta = Math.min(delta, 0.032f) * ui.speedSlider.getValue(); state.update(delta); state.apply(skeleton); + skeleton.update(delta); skeleton.updateWorldTransform(Physics.update); batch.begin();