mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-21 09:46:02 +08:00
[libgdx] Removed last bits of friction.
This commit is contained in:
parent
e894b10802
commit
043a8ea9ae
@ -179,7 +179,7 @@ public class Animation {
|
|||||||
event, drawOrder, //
|
event, drawOrder, //
|
||||||
ikConstraint, transformConstraint, //
|
ikConstraint, transformConstraint, //
|
||||||
pathConstraintPosition, pathConstraintSpacing, pathConstraintMix, //
|
pathConstraintPosition, pathConstraintSpacing, pathConstraintMix, //
|
||||||
physicsConstraintInertia, physicsConstraintStrength, physicsConstraintDamping, physicsConstraintFriction, //
|
physicsConstraintInertia, physicsConstraintStrength, physicsConstraintDamping, //
|
||||||
physicsConstraintMass, physicsConstraintWind, physicsConstraintGravity, physicsConstraintMix, //
|
physicsConstraintMass, physicsConstraintWind, physicsConstraintGravity, physicsConstraintMix, //
|
||||||
sequence
|
sequence
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,7 +35,7 @@ package com.esotericsoftware.spine;
|
|||||||
public class PhysicsConstraintData extends ConstraintData {
|
public class PhysicsConstraintData extends ConstraintData {
|
||||||
BoneData bone;
|
BoneData bone;
|
||||||
boolean x, y, rotate, scaleX, shearX;
|
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) {
|
public PhysicsConstraintData (String name) {
|
||||||
super(name);
|
super(name);
|
||||||
@ -122,14 +122,6 @@ public class PhysicsConstraintData extends ConstraintData {
|
|||||||
this.damping = damping;
|
this.damping = damping;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getFriction () {
|
|
||||||
return friction;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setFriction (float friction) {
|
|
||||||
this.friction = friction;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The inverse of the mass. */
|
/** The inverse of the mass. */
|
||||||
public float getMass () {
|
public float getMass () {
|
||||||
return mass;
|
return mass;
|
||||||
|
|||||||
@ -320,7 +320,6 @@ public class SkeletonBinary extends SkeletonLoader {
|
|||||||
data.inertia = input.readFloat();
|
data.inertia = input.readFloat();
|
||||||
data.strength = input.readFloat();
|
data.strength = input.readFloat();
|
||||||
data.damping = input.readFloat();
|
data.damping = input.readFloat();
|
||||||
data.friction = input.readFloat();
|
|
||||||
data.mass = input.readFloat();
|
data.mass = input.readFloat();
|
||||||
data.wind = input.readFloat();
|
data.wind = input.readFloat();
|
||||||
data.gravity = input.readFloat();
|
data.gravity = input.readFloat();
|
||||||
|
|||||||
@ -268,6 +268,7 @@ public class SkeletonViewer extends ApplicationAdapter {
|
|||||||
delta = Math.min(delta, 0.032f) * ui.speedSlider.getValue();
|
delta = Math.min(delta, 0.032f) * ui.speedSlider.getValue();
|
||||||
state.update(delta);
|
state.update(delta);
|
||||||
state.apply(skeleton);
|
state.apply(skeleton);
|
||||||
|
skeleton.update(delta);
|
||||||
skeleton.updateWorldTransform(Physics.update);
|
skeleton.updateWorldTransform(Physics.update);
|
||||||
|
|
||||||
batch.begin();
|
batch.begin();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user