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

[ts] Fix PathConstraint length spacing for zero length bones. See #1023.

Browse Source
This commit is contained in:
badlogic 2017-10-20 11:09:42 +02:00
parent bdb97a023f
commit bcc7da56d2
19 changed files with 100 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-ts/build/spine-all.d.ts vendored
View File

@ -752,6 +752,7 @@ declare module spine {
static NONE: number; static NONE: number;
static BEFORE: number; static BEFORE: number;
static AFTER: number; static AFTER: number;
static epsilon: number;
data: PathConstraintData; data: PathConstraintData;
bones: Array<Bone>; bones: Array<Bone>;
target: Slot; target: Slot;

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

@ -3290,8 +3290,12 @@ var spine;
for (var i = 0, n = spacesCount - 1; i < n;) { for (var i = 0, n = spacesCount - 1; i < n;) {
var bone = bones[i]; var bone = bones[i];
var setupLength = bone.data.length; var setupLength = bone.data.length;
if (setupLength == 0) if (setupLength < PathConstraint.epsilon) {
setupLength = 0.0000001; if (scale)
lengths[i] = 0;
spaces[++i] = 0;
}
else {
var x = setupLength * bone.a, y = setupLength * bone.c; var x = setupLength * bone.a, y = setupLength * bone.c;
var length_1 = Math.sqrt(x * x + y * y); var length_1 = Math.sqrt(x * x + y * y);
if (scale) if (scale)
@ -3299,6 +3303,7 @@ var spine;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
} }
} }
}
else { else {
for (var i = 1; i < spacesCount; i++) for (var i = 1; i < spacesCount; i++)
spaces[i] = spacing; spaces[i] = spacing;
@ -3602,6 +3607,7 @@ var spine;
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001;
return PathConstraint; return PathConstraint;
}()); }());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;

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

File diff suppressed because one or more lines are too long

1
spine-ts/build/spine-canvas.d.ts vendored
View File

@ -752,6 +752,7 @@ declare module spine {
static NONE: number; static NONE: number;
static BEFORE: number; static BEFORE: number;
static AFTER: number; static AFTER: number;
static epsilon: number;
data: PathConstraintData; data: PathConstraintData;
bones: Array<Bone>; bones: Array<Bone>;
target: Slot; target: Slot;

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

@ -3290,8 +3290,12 @@ var spine;
for (var i = 0, n = spacesCount - 1; i < n;) { for (var i = 0, n = spacesCount - 1; i < n;) {
var bone = bones[i]; var bone = bones[i];
var setupLength = bone.data.length; var setupLength = bone.data.length;
if (setupLength == 0) if (setupLength < PathConstraint.epsilon) {
setupLength = 0.0000001; if (scale)
lengths[i] = 0;
spaces[++i] = 0;
}
else {
var x = setupLength * bone.a, y = setupLength * bone.c; var x = setupLength * bone.a, y = setupLength * bone.c;
var length_1 = Math.sqrt(x * x + y * y); var length_1 = Math.sqrt(x * x + y * y);
if (scale) if (scale)
@ -3299,6 +3303,7 @@ var spine;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
} }
} }
}
else { else {
for (var i = 1; i < spacesCount; i++) for (var i = 1; i < spacesCount; i++)
spaces[i] = spacing; spaces[i] = spacing;
@ -3602,6 +3607,7 @@ var spine;
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001;
return PathConstraint; return PathConstraint;
}()); }());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;

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

File diff suppressed because one or more lines are too long

1
spine-ts/build/spine-core.d.ts vendored
View File

@ -681,6 +681,7 @@ declare module spine {
static NONE: number; static NONE: number;
static BEFORE: number; static BEFORE: number;
static AFTER: number; static AFTER: number;
static epsilon: number;
data: PathConstraintData; data: PathConstraintData;
bones: Array<Bone>; bones: Array<Bone>;
target: Slot; target: Slot;

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

@ -2969,8 +2969,12 @@ var spine;
for (var i = 0, n = spacesCount - 1; i < n;) { for (var i = 0, n = spacesCount - 1; i < n;) {
var bone = bones[i]; var bone = bones[i];
var setupLength = bone.data.length; var setupLength = bone.data.length;
if (setupLength == 0) if (setupLength < PathConstraint.epsilon) {
setupLength = 0.0000001; if (scale)
lengths[i] = 0;
spaces[++i] = 0;
}
else {
var x = setupLength * bone.a, y = setupLength * bone.c; var x = setupLength * bone.a, y = setupLength * bone.c;
var length_1 = Math.sqrt(x * x + y * y); var length_1 = Math.sqrt(x * x + y * y);
if (scale) if (scale)
@ -2978,6 +2982,7 @@ var spine;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
} }
} }
}
else { else {
for (var i = 1; i < spacesCount; i++) for (var i = 1; i < spacesCount; i++)
spaces[i] = spacing; spaces[i] = spacing;
@ -3281,6 +3286,7 @@ var spine;
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001;
return PathConstraint; return PathConstraint;
}()); }());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;

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

File diff suppressed because one or more lines are too long

1
spine-ts/build/spine-threejs.d.ts vendored
View File

@ -681,6 +681,7 @@ declare module spine {
static NONE: number; static NONE: number;
static BEFORE: number; static BEFORE: number;
static AFTER: number; static AFTER: number;
static epsilon: number;
data: PathConstraintData; data: PathConstraintData;
bones: Array<Bone>; bones: Array<Bone>;
target: Slot; target: Slot;

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

@ -2969,8 +2969,12 @@ var spine;
for (var i = 0, n = spacesCount - 1; i < n;) { for (var i = 0, n = spacesCount - 1; i < n;) {
var bone = bones[i]; var bone = bones[i];
var setupLength = bone.data.length; var setupLength = bone.data.length;
if (setupLength == 0) if (setupLength < PathConstraint.epsilon) {
setupLength = 0.0000001; if (scale)
lengths[i] = 0;
spaces[++i] = 0;
}
else {
var x = setupLength * bone.a, y = setupLength * bone.c; var x = setupLength * bone.a, y = setupLength * bone.c;
var length_1 = Math.sqrt(x * x + y * y); var length_1 = Math.sqrt(x * x + y * y);
if (scale) if (scale)
@ -2978,6 +2982,7 @@ var spine;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
} }
} }
}
else { else {
for (var i = 1; i < spacesCount; i++) for (var i = 1; i < spacesCount; i++)
spaces[i] = spacing; spaces[i] = spacing;
@ -3281,6 +3286,7 @@ var spine;
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001;
return PathConstraint; return PathConstraint;
}()); }());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;

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

File diff suppressed because one or more lines are too long

1
spine-ts/build/spine-webgl.d.ts vendored
View File

@ -681,6 +681,7 @@ declare module spine {
static NONE: number; static NONE: number;
static BEFORE: number; static BEFORE: number;
static AFTER: number; static AFTER: number;
static epsilon: number;
data: PathConstraintData; data: PathConstraintData;
bones: Array<Bone>; bones: Array<Bone>;
target: Slot; target: Slot;

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

@ -2969,8 +2969,12 @@ var spine;
for (var i = 0, n = spacesCount - 1; i < n;) { for (var i = 0, n = spacesCount - 1; i < n;) {
var bone = bones[i]; var bone = bones[i];
var setupLength = bone.data.length; var setupLength = bone.data.length;
if (setupLength == 0) if (setupLength < PathConstraint.epsilon) {
setupLength = 0.0000001; if (scale)
lengths[i] = 0;
spaces[++i] = 0;
}
else {
var x = setupLength * bone.a, y = setupLength * bone.c; var x = setupLength * bone.a, y = setupLength * bone.c;
var length_1 = Math.sqrt(x * x + y * y); var length_1 = Math.sqrt(x * x + y * y);
if (scale) if (scale)
@ -2978,6 +2982,7 @@ var spine;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
} }
} }
}
else { else {
for (var i = 1; i < spacesCount; i++) for (var i = 1; i < spacesCount; i++)
spaces[i] = spacing; spaces[i] = spacing;
@ -3281,6 +3286,7 @@ var spine;
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001;
return PathConstraint; return PathConstraint;
}()); }());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;

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

File diff suppressed because one or more lines are too long

1
spine-ts/build/spine-widget.d.ts vendored
View File

@ -681,6 +681,7 @@ declare module spine {
static NONE: number; static NONE: number;
static BEFORE: number; static BEFORE: number;
static AFTER: number; static AFTER: number;
static epsilon: number;
data: PathConstraintData; data: PathConstraintData;
bones: Array<Bone>; bones: Array<Bone>;
target: Slot; target: Slot;

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

@ -2969,8 +2969,12 @@ var spine;
for (var i = 0, n = spacesCount - 1; i < n;) { for (var i = 0, n = spacesCount - 1; i < n;) {
var bone = bones[i]; var bone = bones[i];
var setupLength = bone.data.length; var setupLength = bone.data.length;
if (setupLength == 0) if (setupLength < PathConstraint.epsilon) {
setupLength = 0.0000001; if (scale)
lengths[i] = 0;
spaces[++i] = 0;
}
else {
var x = setupLength * bone.a, y = setupLength * bone.c; var x = setupLength * bone.a, y = setupLength * bone.c;
var length_1 = Math.sqrt(x * x + y * y); var length_1 = Math.sqrt(x * x + y * y);
if (scale) if (scale)
@ -2978,6 +2982,7 @@ var spine;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
} }
} }
}
else { else {
for (var i = 1; i < spacesCount; i++) for (var i = 1; i < spacesCount; i++)
spaces[i] = spacing; spaces[i] = spacing;
@ -3281,6 +3286,7 @@ var spine;
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001;
return PathConstraint; return PathConstraint;
}()); }());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;

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

File diff suppressed because one or more lines are too long

7
spine-ts/core/src/PathConstraint.ts
View File

@ -31,6 +31,7 @@
module spine { module spine {
export class PathConstraint implements Constraint { export class PathConstraint implements Constraint {
static NONE = -1; static BEFORE = -2; static AFTER = -3; static NONE = -1; static BEFORE = -2; static AFTER = -3;
static epsilon = 0.00001;
data: PathConstraintData; data: PathConstraintData;
bones: Array<Bone>; bones: Array<Bone>;
@ -81,12 +82,16 @@ module spine {
for (let i = 0, n = spacesCount - 1; i < n;) { for (let i = 0, n = spacesCount - 1; i < n;) {
let bone = bones[i]; let bone = bones[i];
let setupLength = bone.data.length; let setupLength = bone.data.length;
if (setupLength == 0) setupLength = 0.0000001; if (setupLength < PathConstraint.epsilon) {
if (scale) lengths[i] = 0;
spaces[++i] = 0;
} else {
let x = setupLength * bone.a, y = setupLength * bone.c; let x = setupLength * bone.a, y = setupLength * bone.c;
let length = Math.sqrt(x * x + y * y); let length = Math.sqrt(x * x + y * y);
if (scale) lengths[i] = length; if (scale) lengths[i] = length;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length / setupLength;
} }
}
} else { } else {
for (let i = 1; i < spacesCount; i++) for (let i = 1; i < spacesCount; i++)
spaces[i] = spacing; spaces[i] = spacing;