UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-22 18:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libgdx, c] Avoid relying on NaN behavior.

Browse Source 
#903
This commit is contained in:
NathanSweet 2017-05-24 17:14:33 +02:00
parent 791e955caf
commit d7c9feb0b5
2 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spine-c/spine-c/src/spine/IkConstraint.c
View File

@ -150,9 +150,6 @@ void spIkConstraint_apply2 (spBone* parent, spBone* child, float targetX, float
float aa = a * a, bb = b * b, ll = l1 * l1, dd = tx * tx + ty * ty, ta = ATAN2(ty, tx); float aa = a * a, bb = b * b, ll = l1 * l1, dd = tx * tx + ty * ty, ta = ATAN2(ty, tx);
float c0 = bb * ll + aa * dd - aa * bb, c1 = -2 * bb * l1, c2 = bb - aa; float c0 = bb * ll + aa * dd - aa * bb, c1 = -2 * bb * l1, c2 = bb - aa;
float d = c1 * c1 - 4 * c2 * c0; float d = c1 * c1 - 4 * c2 * c0;
float minAngle = PI, minX = l1 - a, minDist = minX * minX, minY = 0;
float maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
float x = l1 + a, dist = x * x, angle, y;
if (d >= 0) { if (d >= 0) {
float q = SQRT(d), r0, r1; float q = SQRT(d), r0, r1;
if (c1 < 0) q = -q; if (c1 < 0) q = -q;
@ -166,22 +163,28 @@ void spIkConstraint_apply2 (spBone* parent, spBone* child, float targetX, float
goto outer; goto outer;
} }
} }
angle = ACOS(-a * l1 / (aa - bb)); {
x = a * COS(angle) + l1; float minAngle = PI, minX = l1 - a, minDist = minX * minX, minY = 0;
y = b * SIN(angle); float maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
dist = x * x + y * y; c0 = -a * l1 / (aa - bb);
if (dist < minDist) { if (c0 >= -1 && c0 <= 1) {
minAngle = angle; c0 = ACOS(c0);
minDist = dist; x = a * COS(c0) + l1;
y = b * SIN(c0);
d = x * x + y * y;
if (d < minDist) {
minAngle = c0;
minDist = d;
minX = x; minX = x;
minY = y; minY = y;
} }
if (dist > maxDist) { if (d > maxDist) {
maxAngle = angle; maxAngle = c0;
maxDist = dist; maxDist = d;
maxX = x; maxX = x;
maxY = y; maxY = y;
} }
}
if (dd <= (minDist + maxDist) / 2) { if (dd <= (minDist + maxDist) / 2) {
a1 = ta - ATAN2(minY * bendDir, minX); a1 = ta - ATAN2(minY * bendDir, minX);
a2 = minAngle * bendDir; a2 = minAngle * bendDir;
@ -190,6 +193,7 @@ void spIkConstraint_apply2 (spBone* parent, spBone* child, float targetX, float
a2 = maxAngle * bendDir; a2 = maxAngle * bendDir;
} }
} }
}
outer: { outer: {
float os = ATAN2(cy, cx) * s2; float os = ATAN2(cy, cx) * s2;
a1 = (a1 - os) * RAD_DEG + o1 - parent->arotation; a1 = (a1 - os) * RAD_DEG + o1 - parent->arotation;

13
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java
View File

@ -233,22 +233,25 @@ public class IkConstraint implements Constraint {
} }
float minAngle = PI, minX = l1 - a, minDist = minX * minX, minY = 0; float minAngle = PI, minX = l1 - a, minDist = minX * minX, minY = 0;
float maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0; float maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
float angle = (float)Math.acos(-a * l1 / (aa - bb)); c = -a * l1 / (aa - bb);
x = a * cos(angle) + l1; if (c >= -1 && c <= 1) {
y = b * sin(angle); c = (float)Math.acos(c);
x = a * cos(c) + l1;
y = b * sin(c);
d = x * x + y * y; d = x * x + y * y;
if (d < minDist) { if (d < minDist) {
minAngle = angle; minAngle = c;
minDist = d; minDist = d;
minX = x; minX = x;
minY = y; minY = y;
} }
if (d > maxDist) { if (d > maxDist) {
maxAngle = angle; maxAngle = c;
maxDist = d; maxDist = d;
maxX = x; maxX = x;
maxY = y; maxY = y;
} }
}
if (dd <= (minDist + maxDist) / 2) { if (dd <= (minDist + maxDist) / 2) {
a1 = ta - atan2(minY * bendDir, minX); a1 = ta - atan2(minY * bendDir, minX);
a2 = minAngle * bendDir; a2 = minAngle * bendDir;