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

[c][cpp] Port of commit e04e7b5. Adjusted fix for IK constraint NaN when parent has zero scale.

Browse Source
This commit is contained in:
Mario Zechner 2023-04-06 13:25:13 +02:00
parent 9382265484
commit 1fb89b6e89
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,10 +94,13 @@ void spIkConstraint_apply1(spBone *bone, float targetX, float targetY, int /*boo
default: { default: {
float x = targetX - p->worldX, y = targetY - p->worldY; float x = targetX - p->worldX, y = targetY - p->worldY;
float d = pa * pd - pb * pc; float d = pa * pd - pb * pc;
if (d > 0) d = MAX(0.0001f, d); if (ABS(d) <= 0.0001f) {
else d = MIN(-0.0001f, d); tx = 0;
tx = (x * pd - y * pb) / d - bone->ax; ty = 0;
ty = (y * pa - x * pc) / d - bone->ay; } else {
tx = (x * pd - y * pb) / d - bone->ax;
ty = (y * pa - x * pc) / d - bone->ay;
}
} }
} }
rotationIK += ATAN2(ty, tx) * RAD_DEG; rotationIK += ATAN2(ty, tx) * RAD_DEG;
@ -180,8 +183,7 @@ void spIkConstraint_apply2(spBone *parent, spBone *child, float targetX, float t
c = pp->c; c = pp->c;
d = pp->d; d = pp->d;
id = a * d - b * c; id = a * d - b * c;
if (id > 0) id = 1 / MAX(0.0001f, id); id = ABS(id) <= 0.0001f ? 0 : 1 / id;
else id = 1 / MIN(-0.0001f, id);
x = cwx - pp->worldX; x = cwx - pp->worldX;
y = cwy - pp->worldY; y = cwy - pp->worldY;
dx = (x * d - y * b) * id - px; dx = (x * d - y * b) * id - px;

14
spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
View File

@ -61,10 +61,13 @@ void IkConstraint::apply(Bone &bone, float targetX, float targetY, bool compress
default: default:
float x = targetX - p->_worldX, y = targetY - p->_worldY; float x = targetX - p->_worldX, y = targetY - p->_worldY;
float d = pa * pd - pb * pc; float d = pa * pd - pb * pc;
if (d > 0) d = MathUtil::max(0.0001f, d); if (MathUtil::abs(d) <= 0.0001f) {
d = MathUtil::min(-0.0001f, d); tx = 0;
tx = (x * pd - y * pb) / d - bone._ax; ty = 0;
ty = (y * pa - x * pc) / d - bone._ay; } else {
tx = (x * pd - y * pb) / d - bone._ax;
ty = (y * pa - x * pc) / d - bone._ay;
}
} }
rotationIK += MathUtil::atan2(ty, tx) * MathUtil::Rad_Deg; rotationIK += MathUtil::atan2(ty, tx) * MathUtil::Rad_Deg;
if (bone._ascaleX < 0) rotationIK += 180; if (bone._ascaleX < 0) rotationIK += 180;
@ -143,8 +146,7 @@ void IkConstraint::apply(Bone &parent, Bone &child, float targetX, float targetY
c = pp->_c; c = pp->_c;
d = pp->_d; d = pp->_d;
id = a * d - b * c; id = a * d - b * c;
if (id > 0) MathUtil::max(0.0001f, id); id = MathUtil::abs(id) <= 0.0001f ? 0 : 1 / id;
else MathUtil::min(-0.0001f, id);
x = cwx - pp->_worldX; x = cwx - pp->_worldX;
y = cwy - pp->_worldY; y = cwy - pp->_worldY;
dx = (x * d - y * b) * id - px; dx = (x * d - y * b) * id - px;