|
@@ -141,7 +141,8 @@ public class PhysicsConstraint implements Updatable {
|
|
|
reset();
|
|
|
// Fall through.
|
|
|
case update:
|
|
|
- remaining += Math.max(skeleton.time - lastTime, 0);
|
|
|
+ float delta = Math.max(skeleton.time - lastTime, 0);
|
|
|
+ remaining += delta;
|
|
|
lastTime = skeleton.time;
|
|
|
|
|
|
float bx = bone.worldX, by = bone.worldY;
|
|
@@ -150,7 +151,7 @@ public class PhysicsConstraint implements Updatable {
|
|
|
ux = bx;
|
|
|
uy = by;
|
|
|
} else {
|
|
|
- float a = remaining, i = inertia, q = data.limit, t = data.step, f = skeleton.data.referenceScale, d = -1;
|
|
|
+ float a = remaining, i = inertia, q = data.limit * delta, t = data.step, f = skeleton.data.referenceScale, d = -1;
|
|
|
if (x || y) {
|
|
|
if (x) {
|
|
|
float u = (ux - bx) * i;
|
|
@@ -184,11 +185,18 @@ public class PhysicsConstraint implements Updatable {
|
|
|
}
|
|
|
if (rotateOrShearX || scaleX) {
|
|
|
float ca = atan2(bone.c, bone.a), c, s, mr = 0;
|
|
|
+ float dx = cx - bone.worldX, dy = cy - bone.worldY;
|
|
|
+ if (dx > q)
|
|
|
+ dx = q;
|
|
|
+ else if (dx < -q) //
|
|
|
+ dx = -q;
|
|
|
+ if (dy > q)
|
|
|
+ dy = q;
|
|
|
+ else if (dy < -q) //
|
|
|
+ dy = -q;
|
|
|
if (rotateOrShearX) {
|
|
|
mr = (data.rotate + data.shearX) * mix;
|
|
|
- float dx = cx - bone.worldX, dy = cy - bone.worldY;
|
|
|
- float r = atan2((dy > q ? q : dy < -q ? -q : dy) + ty, (dx > q ? q : dx < -q ? -q : dx) + tx) - ca
|
|
|
- - rotateOffset * mr;
|
|
|
+ float r = atan2(dy + ty, dx + tx) - ca - rotateOffset * mr;
|
|
|
rotateOffset += (r - (float)Math.ceil(r * invPI2 - 0.5f) * PI2) * i;
|
|
|
r = rotateOffset * mr + ca;
|
|
|
c = cos(r);
|
|
@@ -201,7 +209,7 @@ public class PhysicsConstraint implements Updatable {
|
|
|
c = cos(ca);
|
|
|
s = sin(ca);
|
|
|
float r = l * bone.getWorldScaleX();
|
|
|
- if (r > 0) scaleOffset += ((cx - bone.worldX) * c + (cy - bone.worldY) * s) * i / r;
|
|
|
+ if (r > 0) scaleOffset += (dx * c + dy * s) * i / r;
|
|
|
}
|
|
|
a = remaining;
|
|
|
if (a >= t) {
|