UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-24 02:31:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Fix 1-bone IK, see #1692.

Browse Source
This commit is contained in:
badlogic 2020-06-03 17:27:30 +02:00
parent 85dd60bf57
commit c64e6adbde
13 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spine-ts/build/spine-all.js
View File

@ -2844,10 +2844,12 @@ var spine;
ty = targetY - bone.worldY; ty = targetY - bone.worldY;
break; break;
case spine.TransformMode.NoRotationOrReflection: case spine.TransformMode.NoRotationOrReflection:
rotationIK += Math.atan2(pc, pa) * spine.MathUtils.radDeg; var s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
var ps = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); var sa = pa / bone.skeleton.scaleX;
pb = -pc * ps; var sc = pc / bone.skeleton.scaleY;
pd = pa * ps; pb = -sc * s * bone.skeleton.scaleX;
pd = sa * s * bone.skeleton.scaleY;
rotationIK += Math.atan2(sc, sa) * spine.MathUtils.radDeg;
default: default:
var x = targetX - p.worldX, y = targetY - p.worldY; var x = targetX - p.worldX, y = targetY - p.worldY;
var d = pa * pd - pb * pc; var d = pa * pd - pb * pc;

2
spine-ts/build/spine-all.js.map
View File

File diff suppressed because one or more lines are too long

10
spine-ts/build/spine-canvas.js
View File

@ -2844,10 +2844,12 @@ var spine;
ty = targetY - bone.worldY; ty = targetY - bone.worldY;
break; break;
case spine.TransformMode.NoRotationOrReflection: case spine.TransformMode.NoRotationOrReflection:
rotationIK += Math.atan2(pc, pa) * spine.MathUtils.radDeg; var s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
var ps = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); var sa = pa / bone.skeleton.scaleX;
pb = -pc * ps; var sc = pc / bone.skeleton.scaleY;
pd = pa * ps; pb = -sc * s * bone.skeleton.scaleX;
pd = sa * s * bone.skeleton.scaleY;
rotationIK += Math.atan2(sc, sa) * spine.MathUtils.radDeg;
default: default:
var x = targetX - p.worldX, y = targetY - p.worldY; var x = targetX - p.worldX, y = targetY - p.worldY;
var d = pa * pd - pb * pc; var d = pa * pd - pb * pc;

2
spine-ts/build/spine-canvas.js.map
View File

File diff suppressed because one or more lines are too long

10
spine-ts/build/spine-core.js
View File

@ -2844,10 +2844,12 @@ var spine;
ty = targetY - bone.worldY; ty = targetY - bone.worldY;
break; break;
case spine.TransformMode.NoRotationOrReflection: case spine.TransformMode.NoRotationOrReflection:
rotationIK += Math.atan2(pc, pa) * spine.MathUtils.radDeg; var s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
var ps = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); var sa = pa / bone.skeleton.scaleX;
pb = -pc * ps; var sc = pc / bone.skeleton.scaleY;
pd = pa * ps; pb = -sc * s * bone.skeleton.scaleX;
pd = sa * s * bone.skeleton.scaleY;
rotationIK += Math.atan2(sc, sa) * spine.MathUtils.radDeg;
default: default:
var x = targetX - p.worldX, y = targetY - p.worldY; var x = targetX - p.worldX, y = targetY - p.worldY;
var d = pa * pd - pb * pc; var d = pa * pd - pb * pc;

2
spine-ts/build/spine-core.js.map
View File

File diff suppressed because one or more lines are too long

10
spine-ts/build/spine-player.js
View File

@ -2844,10 +2844,12 @@ var spine;
ty = targetY - bone.worldY; ty = targetY - bone.worldY;
break; break;
case spine.TransformMode.NoRotationOrReflection: case spine.TransformMode.NoRotationOrReflection:
rotationIK += Math.atan2(pc, pa) * spine.MathUtils.radDeg; var s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
var ps = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); var sa = pa / bone.skeleton.scaleX;
pb = -pc * ps; var sc = pc / bone.skeleton.scaleY;
pd = pa * ps; pb = -sc * s * bone.skeleton.scaleX;
pd = sa * s * bone.skeleton.scaleY;
rotationIK += Math.atan2(sc, sa) * spine.MathUtils.radDeg;
default: default:
var x = targetX - p.worldX, y = targetY - p.worldY; var x = targetX - p.worldX, y = targetY - p.worldY;
var d = pa * pd - pb * pc; var d = pa * pd - pb * pc;

2
spine-ts/build/spine-player.js.map
View File

File diff suppressed because one or more lines are too long

10
spine-ts/build/spine-threejs.js
View File

@ -2844,10 +2844,12 @@ var spine;
ty = targetY - bone.worldY; ty = targetY - bone.worldY;
break; break;
case spine.TransformMode.NoRotationOrReflection: case spine.TransformMode.NoRotationOrReflection:
rotationIK += Math.atan2(pc, pa) * spine.MathUtils.radDeg; var s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
var ps = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); var sa = pa / bone.skeleton.scaleX;
pb = -pc * ps; var sc = pc / bone.skeleton.scaleY;
pd = pa * ps; pb = -sc * s * bone.skeleton.scaleX;
pd = sa * s * bone.skeleton.scaleY;
rotationIK += Math.atan2(sc, sa) * spine.MathUtils.radDeg;
default: default:
var x = targetX - p.worldX, y = targetY - p.worldY; var x = targetX - p.worldX, y = targetY - p.worldY;
var d = pa * pd - pb * pc; var d = pa * pd - pb * pc;

2
spine-ts/build/spine-threejs.js.map
View File

File diff suppressed because one or more lines are too long

10
spine-ts/build/spine-webgl.js
View File

@ -2844,10 +2844,12 @@ var spine;
ty = targetY - bone.worldY; ty = targetY - bone.worldY;
break; break;
case spine.TransformMode.NoRotationOrReflection: case spine.TransformMode.NoRotationOrReflection:
rotationIK += Math.atan2(pc, pa) * spine.MathUtils.radDeg; var s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
var ps = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); var sa = pa / bone.skeleton.scaleX;
pb = -pc * ps; var sc = pc / bone.skeleton.scaleY;
pd = pa * ps; pb = -sc * s * bone.skeleton.scaleX;
pd = sa * s * bone.skeleton.scaleY;
rotationIK += Math.atan2(sc, sa) * spine.MathUtils.radDeg;
default: default:
var x = targetX - p.worldX, y = targetY - p.worldY; var x = targetX - p.worldX, y = targetY - p.worldY;
var d = pa * pd - pb * pc; var d = pa * pd - pb * pc;

2
spine-ts/build/spine-webgl.js.map
View File

File diff suppressed because one or more lines are too long

10
spine-ts/core/src/IkConstraint.ts
View File

@ -112,10 +112,12 @@ module spine {
ty = targetY - bone.worldY; ty = targetY - bone.worldY;
break; break;
case TransformMode.NoRotationOrReflection: case TransformMode.NoRotationOrReflection:
rotationIK += Math.atan2(pc, pa) * MathUtils.radDeg; let s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
let ps = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); let sa = pa / bone.skeleton.scaleX;
pb = -pc * ps; let sc = pc / bone.skeleton.scaleY;
pd = pa * ps; pb = -sc * s * bone.skeleton.scaleX;
pd = sa * s * bone.skeleton.scaleY;
rotationIK += Math.atan2(sc, sa) * MathUtils.radDeg;
// Fall through // Fall through
default: default:
let x = targetX - p.worldX, y = targetY - p.worldY; let x = targetX - p.worldX, y = targetY - p.worldY;