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] Fixes completion event firing for 0 duration animations. See #1112.

Browse Source
This commit is contained in:
badlogic 2018-05-16 11:33:18 +02:00
parent 3d8e55d909
commit ca15f5e64f
19 changed files with 1032 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,9 +589,6 @@ declare module spine {
ChainScale = 2, ChainScale = 2,
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
class SharedAssetManager implements Disposable { class SharedAssetManager implements Disposable {
private pathPrefix; private pathPrefix;
@ -1000,6 +997,7 @@ declare module spine {
static newShortArray(size: number): ArrayLike<number>; static newShortArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): number[] | Float32Array; static toFloatArray(array: Array<number>): number[] | Float32Array;
static toSinglePrecision(value: number): number; static toSinglePrecision(value: number): number;
static webkit602BugfixHelper(alpha: number, pose: MixPose): void;
} }
class DebugUtils { class DebugUtils {
static logBones(skeleton: Skeleton): void; static logBones(skeleton: Skeleton): void;
@ -1054,6 +1052,9 @@ declare module spine {
end(): void; end(): void;
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
abstract class Attachment { abstract class Attachment {
name: string; name: string;

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

@ -162,12 +162,12 @@ var spine;
var y = curves[i - 1]; var y = curves[i - 1];
return y + (1 - y) * (percent - x) / (1 - x); return y + (1 - y) * (percent - x) / (1 - x);
}; };
return CurveTimeline;
}());
CurveTimeline.LINEAR = 0; CurveTimeline.LINEAR = 0;
CurveTimeline.STEPPED = 1; CurveTimeline.STEPPED = 1;
CurveTimeline.BEZIER = 2; CurveTimeline.BEZIER = 2;
CurveTimeline.BEZIER_SIZE = 10 * 2 - 1; CurveTimeline.BEZIER_SIZE = 10 * 2 - 1;
return CurveTimeline;
}());
spine.CurveTimeline = CurveTimeline; spine.CurveTimeline = CurveTimeline;
var RotateTimeline = (function (_super) { var RotateTimeline = (function (_super) {
__extends(RotateTimeline, _super); __extends(RotateTimeline, _super);
@ -226,12 +226,12 @@ var spine;
bone.rotation += r * alpha; bone.rotation += r * alpha;
} }
}; };
return RotateTimeline;
}(CurveTimeline));
RotateTimeline.ENTRIES = 2; RotateTimeline.ENTRIES = 2;
RotateTimeline.PREV_TIME = -2; RotateTimeline.PREV_TIME = -2;
RotateTimeline.PREV_ROTATION = -1; RotateTimeline.PREV_ROTATION = -1;
RotateTimeline.ROTATION = 1; RotateTimeline.ROTATION = 1;
return RotateTimeline;
}(CurveTimeline));
spine.RotateTimeline = RotateTimeline; spine.RotateTimeline = RotateTimeline;
var TranslateTimeline = (function (_super) { var TranslateTimeline = (function (_super) {
__extends(TranslateTimeline, _super); __extends(TranslateTimeline, _super);
@ -287,14 +287,14 @@ var spine;
bone.y += (bone.data.y + y - bone.y) * alpha; bone.y += (bone.data.y + y - bone.y) * alpha;
} }
}; };
return TranslateTimeline;
}(CurveTimeline));
TranslateTimeline.ENTRIES = 3; TranslateTimeline.ENTRIES = 3;
TranslateTimeline.PREV_TIME = -3; TranslateTimeline.PREV_TIME = -3;
TranslateTimeline.PREV_X = -2; TranslateTimeline.PREV_X = -2;
TranslateTimeline.PREV_Y = -1; TranslateTimeline.PREV_Y = -1;
TranslateTimeline.X = 1; TranslateTimeline.X = 1;
TranslateTimeline.Y = 2; TranslateTimeline.Y = 2;
return TranslateTimeline;
}(CurveTimeline));
spine.TranslateTimeline = TranslateTimeline; spine.TranslateTimeline = TranslateTimeline;
var ScaleTimeline = (function (_super) { var ScaleTimeline = (function (_super) {
__extends(ScaleTimeline, _super); __extends(ScaleTimeline, _super);
@ -473,8 +473,6 @@ var spine;
color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha); color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha);
} }
}; };
return ColorTimeline;
}(CurveTimeline));
ColorTimeline.ENTRIES = 5; ColorTimeline.ENTRIES = 5;
ColorTimeline.PREV_TIME = -5; ColorTimeline.PREV_TIME = -5;
ColorTimeline.PREV_R = -4; ColorTimeline.PREV_R = -4;
@ -485,6 +483,8 @@ var spine;
ColorTimeline.G = 2; ColorTimeline.G = 2;
ColorTimeline.B = 3; ColorTimeline.B = 3;
ColorTimeline.A = 4; ColorTimeline.A = 4;
return ColorTimeline;
}(CurveTimeline));
spine.ColorTimeline = ColorTimeline; spine.ColorTimeline = ColorTimeline;
var TwoColorTimeline = (function (_super) { var TwoColorTimeline = (function (_super) {
__extends(TwoColorTimeline, _super); __extends(TwoColorTimeline, _super);
@ -567,8 +567,6 @@ var spine;
dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0); dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0);
} }
}; };
return TwoColorTimeline;
}(CurveTimeline));
TwoColorTimeline.ENTRIES = 8; TwoColorTimeline.ENTRIES = 8;
TwoColorTimeline.PREV_TIME = -8; TwoColorTimeline.PREV_TIME = -8;
TwoColorTimeline.PREV_R = -7; TwoColorTimeline.PREV_R = -7;
@ -585,6 +583,8 @@ var spine;
TwoColorTimeline.R2 = 5; TwoColorTimeline.R2 = 5;
TwoColorTimeline.G2 = 6; TwoColorTimeline.G2 = 6;
TwoColorTimeline.B2 = 7; TwoColorTimeline.B2 = 7;
return TwoColorTimeline;
}(CurveTimeline));
spine.TwoColorTimeline = TwoColorTimeline; spine.TwoColorTimeline = TwoColorTimeline;
var AttachmentTimeline = (function () { var AttachmentTimeline = (function () {
function AttachmentTimeline(frameCount) { function AttachmentTimeline(frameCount) {
@ -893,14 +893,14 @@ var spine;
constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION]; constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
} }
}; };
return IkConstraintTimeline;
}(CurveTimeline));
IkConstraintTimeline.ENTRIES = 3; IkConstraintTimeline.ENTRIES = 3;
IkConstraintTimeline.PREV_TIME = -3; IkConstraintTimeline.PREV_TIME = -3;
IkConstraintTimeline.PREV_MIX = -2; IkConstraintTimeline.PREV_MIX = -2;
IkConstraintTimeline.PREV_BEND_DIRECTION = -1; IkConstraintTimeline.PREV_BEND_DIRECTION = -1;
IkConstraintTimeline.MIX = 1; IkConstraintTimeline.MIX = 1;
IkConstraintTimeline.BEND_DIRECTION = 2; IkConstraintTimeline.BEND_DIRECTION = 2;
return IkConstraintTimeline;
}(CurveTimeline));
spine.IkConstraintTimeline = IkConstraintTimeline; spine.IkConstraintTimeline = IkConstraintTimeline;
var TransformConstraintTimeline = (function (_super) { var TransformConstraintTimeline = (function (_super) {
__extends(TransformConstraintTimeline, _super); __extends(TransformConstraintTimeline, _super);
@ -975,8 +975,6 @@ var spine;
constraint.shearMix += (shear - constraint.shearMix) * alpha; constraint.shearMix += (shear - constraint.shearMix) * alpha;
} }
}; };
return TransformConstraintTimeline;
}(CurveTimeline));
TransformConstraintTimeline.ENTRIES = 5; TransformConstraintTimeline.ENTRIES = 5;
TransformConstraintTimeline.PREV_TIME = -5; TransformConstraintTimeline.PREV_TIME = -5;
TransformConstraintTimeline.PREV_ROTATE = -4; TransformConstraintTimeline.PREV_ROTATE = -4;
@ -987,6 +985,8 @@ var spine;
TransformConstraintTimeline.TRANSLATE = 2; TransformConstraintTimeline.TRANSLATE = 2;
TransformConstraintTimeline.SCALE = 3; TransformConstraintTimeline.SCALE = 3;
TransformConstraintTimeline.SHEAR = 4; TransformConstraintTimeline.SHEAR = 4;
return TransformConstraintTimeline;
}(CurveTimeline));
spine.TransformConstraintTimeline = TransformConstraintTimeline; spine.TransformConstraintTimeline = TransformConstraintTimeline;
var PathConstraintPositionTimeline = (function (_super) { var PathConstraintPositionTimeline = (function (_super) {
__extends(PathConstraintPositionTimeline, _super); __extends(PathConstraintPositionTimeline, _super);
@ -1031,12 +1031,12 @@ var spine;
else else
constraint.position += (position - constraint.position) * alpha; constraint.position += (position - constraint.position) * alpha;
}; };
return PathConstraintPositionTimeline;
}(CurveTimeline));
PathConstraintPositionTimeline.ENTRIES = 2; PathConstraintPositionTimeline.ENTRIES = 2;
PathConstraintPositionTimeline.PREV_TIME = -2; PathConstraintPositionTimeline.PREV_TIME = -2;
PathConstraintPositionTimeline.PREV_VALUE = -1; PathConstraintPositionTimeline.PREV_VALUE = -1;
PathConstraintPositionTimeline.VALUE = 1; PathConstraintPositionTimeline.VALUE = 1;
return PathConstraintPositionTimeline;
}(CurveTimeline));
spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline; spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline;
var PathConstraintSpacingTimeline = (function (_super) { var PathConstraintSpacingTimeline = (function (_super) {
__extends(PathConstraintSpacingTimeline, _super); __extends(PathConstraintSpacingTimeline, _super);
@ -1131,14 +1131,14 @@ var spine;
constraint.translateMix += (translate - constraint.translateMix) * alpha; constraint.translateMix += (translate - constraint.translateMix) * alpha;
} }
}; };
return PathConstraintMixTimeline;
}(CurveTimeline));
PathConstraintMixTimeline.ENTRIES = 3; PathConstraintMixTimeline.ENTRIES = 3;
PathConstraintMixTimeline.PREV_TIME = -3; PathConstraintMixTimeline.PREV_TIME = -3;
PathConstraintMixTimeline.PREV_ROTATE = -2; PathConstraintMixTimeline.PREV_ROTATE = -2;
PathConstraintMixTimeline.PREV_TRANSLATE = -1; PathConstraintMixTimeline.PREV_TRANSLATE = -1;
PathConstraintMixTimeline.ROTATE = 1; PathConstraintMixTimeline.ROTATE = 1;
PathConstraintMixTimeline.TRANSLATE = 2; PathConstraintMixTimeline.TRANSLATE = 2;
return PathConstraintMixTimeline;
}(CurveTimeline));
spine.PathConstraintMixTimeline = PathConstraintMixTimeline; spine.PathConstraintMixTimeline = PathConstraintMixTimeline;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -1263,10 +1263,12 @@ var spine;
if (timeline instanceof spine.RotateTimeline) { if (timeline instanceof spine.RotateTimeline) {
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame);
} }
else else {
spine.Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]); timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]);
} }
} }
}
this.queueEvents(current, animationTime); this.queueEvents(current, animationTime);
events.length = 0; events.length = 0;
current.nextAnimationLast = animationTime; current.nextAnimationLast = animationTime;
@ -1333,6 +1335,7 @@ var spine;
if (timeline instanceof spine.RotateTimeline) if (timeline instanceof spine.RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame);
else { else {
spine.Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out); timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out);
} }
} }
@ -1416,10 +1419,13 @@ var spine;
continue; continue;
this.queue.event(entry, event_1); this.queue.event(entry, event_1);
} }
if (entry.loop ? (trackLastWrapped > entry.trackTime % duration) var complete = false;
: (animationTime >= animationEnd && entry.animationLast < animationEnd)) { if (entry.loop)
complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
else
complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
if (complete)
this.queue.complete(entry); this.queue.complete(entry);
}
for (; i < n; i++) { for (; i < n; i++) {
var event_2 = events[i]; var event_2 = events[i];
if (event_2.time < animationStart) if (event_2.time < animationStart)
@ -1631,13 +1637,13 @@ var spine;
AnimationState.prototype.clearListenerNotifications = function () { AnimationState.prototype.clearListenerNotifications = function () {
this.queue.clear(); this.queue.clear();
}; };
return AnimationState;
}());
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.DIP = 2; AnimationState.DIP = 2;
AnimationState.DIP_MIX = 3; AnimationState.DIP_MIX = 3;
return AnimationState;
}());
spine.AnimationState = AnimationState; spine.AnimationState = AnimationState;
var TrackEntry = (function () { var TrackEntry = (function () {
function TrackEntry() { function TrackEntry() {
@ -3058,12 +3064,12 @@ var spine;
PathConstraint.prototype.getOrder = function () { PathConstraint.prototype.getOrder = function () {
return this.data.order; return this.data.order;
}; };
return PathConstraint;
}());
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001; PathConstraint.epsilon = 0.00001;
return PathConstraint;
}());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -3095,15 +3101,6 @@ var spine;
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale"; RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
})(RotateMode = spine.RotateMode || (spine.RotateMode = {})); })(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Assets = (function () { var Assets = (function () {
@ -5874,13 +5871,13 @@ var spine;
this.a = 1; this.a = 1;
return this; return this;
}; };
return Color;
}());
Color.WHITE = new Color(1, 1, 1, 1); Color.WHITE = new Color(1, 1, 1, 1);
Color.RED = new Color(1, 0, 0, 1); Color.RED = new Color(1, 0, 0, 1);
Color.GREEN = new Color(0, 1, 0, 1); Color.GREEN = new Color(0, 1, 0, 1);
Color.BLUE = new Color(0, 0, 1, 1); Color.BLUE = new Color(0, 0, 1, 1);
Color.MAGENTA = new Color(1, 0, 1, 1); Color.MAGENTA = new Color(1, 0, 1, 1);
return Color;
}());
spine.Color = Color; spine.Color = Color;
var MathUtils = (function () { var MathUtils = (function () {
function MathUtils() { function MathUtils() {
@ -5918,14 +5915,14 @@ var spine;
return min + Math.sqrt(u * d * (mode - min)); return min + Math.sqrt(u * d * (mode - min));
return max - Math.sqrt((1 - u) * d * (max - mode)); return max - Math.sqrt((1 - u) * d * (max - mode));
}; };
return MathUtils;
}());
MathUtils.PI = 3.1415927; MathUtils.PI = 3.1415927;
MathUtils.PI2 = MathUtils.PI * 2; MathUtils.PI2 = MathUtils.PI * 2;
MathUtils.radiansToDegrees = 180 / MathUtils.PI; MathUtils.radiansToDegrees = 180 / MathUtils.PI;
MathUtils.radDeg = MathUtils.radiansToDegrees; MathUtils.radDeg = MathUtils.radiansToDegrees;
MathUtils.degreesToRadians = MathUtils.PI / 180; MathUtils.degreesToRadians = MathUtils.PI / 180;
MathUtils.degRad = MathUtils.degreesToRadians; MathUtils.degRad = MathUtils.degreesToRadians;
return MathUtils;
}());
spine.MathUtils = MathUtils; spine.MathUtils = MathUtils;
var Interpolation = (function () { var Interpolation = (function () {
function Interpolation() { function Interpolation() {
@ -6023,9 +6020,11 @@ var spine;
Utils.toSinglePrecision = function (value) { Utils.toSinglePrecision = function (value) {
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value; return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
}; };
Utils.webkit602BugfixHelper = function (alpha, pose) {
};
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
return Utils; return Utils;
}()); }());
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
spine.Utils = Utils; spine.Utils = Utils;
var DebugUtils = (function () { var DebugUtils = (function () {
function DebugUtils() { function DebugUtils() {
@ -6161,6 +6160,15 @@ var spine;
}()); }());
spine.WindowedMean = WindowedMean; spine.WindowedMean = WindowedMean;
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Attachment = (function () { var Attachment = (function () {
@ -6242,9 +6250,9 @@ var spine;
VertexAttachment.prototype.applyDeform = function (sourceAttachment) { VertexAttachment.prototype.applyDeform = function (sourceAttachment) {
return this == sourceAttachment; return this == sourceAttachment;
}; };
VertexAttachment.nextID = 0;
return VertexAttachment; return VertexAttachment;
}(Attachment)); }(Attachment));
VertexAttachment.nextID = 0;
spine.VertexAttachment = VertexAttachment; spine.VertexAttachment = VertexAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6482,8 +6490,6 @@ var spine;
worldVertices[offset] = offsetX * a + offsetY * b + x; worldVertices[offset] = offsetX * a + offsetY * b + x;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
return RegionAttachment;
}(spine.Attachment));
RegionAttachment.OX1 = 0; RegionAttachment.OX1 = 0;
RegionAttachment.OY1 = 1; RegionAttachment.OY1 = 1;
RegionAttachment.OX2 = 2; RegionAttachment.OX2 = 2;
@ -6524,6 +6530,8 @@ var spine;
RegionAttachment.C4A = 29; RegionAttachment.C4A = 29;
RegionAttachment.U4 = 30; RegionAttachment.U4 = 30;
RegionAttachment.V4 = 31; RegionAttachment.V4 = 31;
return RegionAttachment;
}(spine.Attachment));
spine.RegionAttachment = RegionAttachment; spine.RegionAttachment = RegionAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6578,9 +6586,9 @@ var spine;
}; };
SwirlEffect.prototype.end = function () { SwirlEffect.prototype.end = function () {
}; };
SwirlEffect.interpolation = new spine.PowOut(2);
return SwirlEffect; return SwirlEffect;
}()); }());
SwirlEffect.interpolation = new spine.PowOut(2);
spine.SwirlEffect = SwirlEffect; spine.SwirlEffect = SwirlEffect;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6831,10 +6839,10 @@ var spine;
} }
return vertices; return vertices;
}; };
return SkeletonRenderer;
}());
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0]; SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4; SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4;
return SkeletonRenderer;
}());
canvas.SkeletonRenderer = SkeletonRenderer; canvas.SkeletonRenderer = SkeletonRenderer;
})(canvas = spine.canvas || (spine.canvas = {})); })(canvas = spine.canvas || (spine.canvas = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -7248,14 +7256,14 @@ var spine;
renderer.end(); renderer.end();
renderer.camera.position.set(oldX, oldY, 0); renderer.camera.position.set(oldX, oldY, 0);
}; };
return LoadingScreen;
}());
LoadingScreen.FADE_SECONDS = 1; LoadingScreen.FADE_SECONDS = 1;
LoadingScreen.loaded = 0; LoadingScreen.loaded = 0;
LoadingScreen.spinnerImg = null; LoadingScreen.spinnerImg = null;
LoadingScreen.logoImg = null; LoadingScreen.logoImg = null;
LoadingScreen.SPINNER_DATA = "data:image/png;base64,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"; LoadingScreen.SPINNER_DATA = "data:image/png;base64,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";
LoadingScreen.SPINE_LOGO_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFIAAAAZCAYAAACis3k0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtNJREFUaN7tmT2I1EAUxwN+oWgRT0HFKo0WCkJ6ObmAWFwZbCxsXGysLNJaiCyIoDaSwk4ETzvhmnBaCRbBWoQ01ho4PwotjP8cE337mMy8TLK757mBH3fLTWbe/PbN53neNniqZW8FvAVvQAqugwvgDDgO9niLRyTyJagM/ACPF6bsIl9ZRDac/Cc6tLn5xQdRQ496QlKPLxD5QCDxO9jtGM8QfYoIgUlgCipGCRJL5VvlyOdCU09iEXkCfLSIfCrs7Fab6nOsiafu06iDwES9w/uU1QnDC+ekkVS9vEaDsgVeB0d+z1VDtOGxRaYPboP3Gokb4GgXkZp4chZPJKgvZ3U0XkriK/TIt9YUDllFgTAjGwoaoHqfBhMI58yD4BQ4V6/aHYdfxToftvw9F2SiVroawU2/Cv5C4Thv0KB9S5nxlOd4STxjwUjzSdYlgrYijw2BsEfgsaFcM09lhiys94xXQQwugcvgJrgFLjrEE7WUiTuWCQzt/ZXN7FfqGwuGClyVy2xZAFmfDQvNtwFFSspMDGsD+UTWqu1KoVmVooFEJgKRXw0if85RpISEzwsjzeqWzkjkC4PIJ3MUmQgITAHlQwTFhnZhELkEntfZRwR+AvfAgXmJHOqU02XligWT8ppg67NXbdCXeq7afUQ6L8C2DalEZNt2YyQ94Qy8/ekjMpBMbfyl5iTjG7YAI8cNecROAb4kJmTjaXAF3AGvwQewOiuRxEtlSaT4j2h2lMsUueQEoMlIKpTvAmKhxPMtC876jEX6rE8l8TNx/KVbn6xlWU9NWcSDUsO4NGWpQOTZFpHPOooMXcswmW2XFk3ixb2v0Nq+XVKP00QNaffBLyWwBI/AkTlfMYZDXMf12kc6yjwEjoFdO/5me5oi/6tnyhlZX6OtgmX1c2Uh0k3khmbB2b9TRfpd/jfTUeRDJvHdYg5wE7kPXAN3wQ1weDvH+xufEgpi5qIl3QAAAABJRU5ErkJggg=="; LoadingScreen.SPINE_LOGO_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFIAAAAZCAYAAACis3k0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtNJREFUaN7tmT2I1EAUxwN+oWgRT0HFKo0WCkJ6ObmAWFwZbCxsXGysLNJaiCyIoDaSwk4ETzvhmnBaCRbBWoQ01ho4PwotjP8cE337mMy8TLK757mBH3fLTWbe/PbN53neNniqZW8FvAVvQAqugwvgDDgO9niLRyTyJagM/ACPF6bsIl9ZRDac/Cc6tLn5xQdRQ496QlKPLxD5QCDxO9jtGM8QfYoIgUlgCipGCRJL5VvlyOdCU09iEXkCfLSIfCrs7Fab6nOsiafu06iDwES9w/uU1QnDC+ekkVS9vEaDsgVeB0d+z1VDtOGxRaYPboP3Gokb4GgXkZp4chZPJKgvZ3U0XkriK/TIt9YUDllFgTAjGwoaoHqfBhMI58yD4BQ4V6/aHYdfxToftvw9F2SiVroawU2/Cv5C4Thv0KB9S5nxlOd4STxjwUjzSdYlgrYijw2BsEfgsaFcM09lhiys94xXQQwugcvgJrgFLjrEE7WUiTuWCQzt/ZXN7FfqGwuGClyVy2xZAFmfDQvNtwFFSspMDGsD+UTWqu1KoVmVooFEJgKRXw0if85RpISEzwsjzeqWzkjkC4PIJ3MUmQgITAHlQwTFhnZhELkEntfZRwR+AvfAgXmJHOqU02XligWT8ppg67NXbdCXeq7afUQ6L8C2DalEZNt2YyQ94Qy8/ekjMpBMbfyl5iTjG7YAI8cNecROAb4kJmTjaXAF3AGvwQewOiuRxEtlSaT4j2h2lMsUueQEoMlIKpTvAmKhxPMtC876jEX6rE8l8TNx/KVbn6xlWU9NWcSDUsO4NGWpQOTZFpHPOooMXcswmW2XFk3ixb2v0Nq+XVKP00QNaffBLyWwBI/AkTlfMYZDXMf12kc6yjwEjoFdO/5me5oi/6tnyhlZX6OtgmX1c2Uh0k3khmbB2b9TRfpd/jfTUeRDJvHdYg5wE7kPXAN3wQ1weDvH+xufEgpi5qIl3QAAAABJRU5ErkJggg==";
return LoadingScreen;
}());
webgl.LoadingScreen = LoadingScreen; webgl.LoadingScreen = LoadingScreen;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -7550,12 +7558,12 @@ var spine;
if (Matrix4.zAxis === null) if (Matrix4.zAxis === null)
Matrix4.zAxis = new webgl.Vector3(); Matrix4.zAxis = new webgl.Vector3();
}; };
return Matrix4;
}());
Matrix4.xAxis = null; Matrix4.xAxis = null;
Matrix4.yAxis = null; Matrix4.yAxis = null;
Matrix4.zAxis = null; Matrix4.zAxis = null;
Matrix4.tmpMatrix = new Matrix4(); Matrix4.tmpMatrix = new Matrix4();
return Matrix4;
}());
webgl.Matrix4 = Matrix4; webgl.Matrix4 = Matrix4;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -8469,14 +8477,14 @@ var spine;
var fs = "\n\t\t\t\t#ifdef GL_ES\n\t\t\t\t\t#define LOWP lowp\n\t\t\t\t\tprecision mediump float;\n\t\t\t\t#else\n\t\t\t\t\t#define LOWP\n\t\t\t\t#endif\n\t\t\t\tvarying LOWP vec4 v_color;\n\n\t\t\t\tvoid main () {\n\t\t\t\t\tgl_FragColor = v_color;\n\t\t\t\t}\n\t\t\t"; var fs = "\n\t\t\t\t#ifdef GL_ES\n\t\t\t\t\t#define LOWP lowp\n\t\t\t\t\tprecision mediump float;\n\t\t\t\t#else\n\t\t\t\t\t#define LOWP\n\t\t\t\t#endif\n\t\t\t\tvarying LOWP vec4 v_color;\n\n\t\t\t\tvoid main () {\n\t\t\t\t\tgl_FragColor = v_color;\n\t\t\t\t}\n\t\t\t";
return new Shader(context, vs, fs); return new Shader(context, vs, fs);
}; };
return Shader;
}());
Shader.MVP_MATRIX = "u_projTrans"; Shader.MVP_MATRIX = "u_projTrans";
Shader.POSITION = "a_position"; Shader.POSITION = "a_position";
Shader.COLOR = "a_color"; Shader.COLOR = "a_color";
Shader.COLOR2 = "a_color2"; Shader.COLOR2 = "a_color2";
Shader.TEXCOORDS = "a_texCoords"; Shader.TEXCOORDS = "a_texCoords";
Shader.SAMPLER = "u_texture"; Shader.SAMPLER = "u_texture";
return Shader;
}());
webgl.Shader = Shader; webgl.Shader = Shader;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -8989,10 +8997,10 @@ var spine;
}; };
SkeletonDebugRenderer.prototype.dispose = function () { SkeletonDebugRenderer.prototype.dispose = function () {
}; };
return SkeletonDebugRenderer;
}());
SkeletonDebugRenderer.LIGHT_GRAY = new spine.Color(192 / 255, 192 / 255, 192 / 255, 1); SkeletonDebugRenderer.LIGHT_GRAY = new spine.Color(192 / 255, 192 / 255, 192 / 255, 1);
SkeletonDebugRenderer.GREEN = new spine.Color(0, 1, 0, 1); SkeletonDebugRenderer.GREEN = new spine.Color(0, 1, 0, 1);
return SkeletonDebugRenderer;
}());
webgl.SkeletonDebugRenderer = SkeletonDebugRenderer; webgl.SkeletonDebugRenderer = SkeletonDebugRenderer;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9261,9 +9269,9 @@ var spine;
} }
clipper.clipEnd(); clipper.clipEnd();
}; };
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
return SkeletonRenderer; return SkeletonRenderer;
}()); }());
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
webgl.SkeletonRenderer = SkeletonRenderer; webgl.SkeletonRenderer = SkeletonRenderer;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9415,8 +9423,6 @@ var spine;
default: throw new Error("Unknown blend mode: " + blendMode); default: throw new Error("Unknown blend mode: " + blendMode);
} }
}; };
return WebGLBlendModeConverter;
}());
WebGLBlendModeConverter.ZERO = 0; WebGLBlendModeConverter.ZERO = 0;
WebGLBlendModeConverter.ONE = 1; WebGLBlendModeConverter.ONE = 1;
WebGLBlendModeConverter.SRC_COLOR = 0x0300; WebGLBlendModeConverter.SRC_COLOR = 0x0300;
@ -9426,6 +9432,8 @@ var spine;
WebGLBlendModeConverter.DST_ALPHA = 0x0304; WebGLBlendModeConverter.DST_ALPHA = 0x0304;
WebGLBlendModeConverter.ONE_MINUS_DST_ALPHA = 0x0305; WebGLBlendModeConverter.ONE_MINUS_DST_ALPHA = 0x0305;
WebGLBlendModeConverter.DST_COLOR = 0x0306; WebGLBlendModeConverter.DST_COLOR = 0x0306;
return WebGLBlendModeConverter;
}());
webgl.WebGLBlendModeConverter = WebGLBlendModeConverter; webgl.WebGLBlendModeConverter = WebGLBlendModeConverter;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9526,9 +9534,9 @@ var spine;
geo.drawRange.start = 0; geo.drawRange.start = 0;
geo.drawRange.count = this.indicesLength; geo.drawRange.count = this.indicesLength;
}; };
MeshBatcher.VERTEX_SIZE = 9;
return MeshBatcher; return MeshBatcher;
}(THREE.Mesh)); }(THREE.Mesh));
MeshBatcher.VERTEX_SIZE = 9;
threejs.MeshBatcher = MeshBatcher; threejs.MeshBatcher = MeshBatcher;
})(threejs = spine.threejs || (spine.threejs = {})); })(threejs = spine.threejs || (spine.threejs = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9764,10 +9772,10 @@ var spine;
clipper.clipEnd(); clipper.clipEnd();
batch.end(); batch.end();
}; };
return SkeletonMesh;
}(THREE.Object3D));
SkeletonMesh.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0]; SkeletonMesh.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
SkeletonMesh.VERTEX_SIZE = 2 + 2 + 4; SkeletonMesh.VERTEX_SIZE = 2 + 2 + 4;
return SkeletonMesh;
}(THREE.Object3D));
threejs.SkeletonMesh = SkeletonMesh; threejs.SkeletonMesh = SkeletonMesh;
})(threejs = spine.threejs || (spine.threejs = {})); })(threejs = spine.threejs || (spine.threejs = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -10136,9 +10144,9 @@ var spine;
window.attachEvent("onload", SpineWidget.ready); window.attachEvent("onload", SpineWidget.ready);
} }
}; };
SpineWidget.pageLoaded = false;
return SpineWidget; return SpineWidget;
}()); }());
SpineWidget.pageLoaded = false;
spine.SpineWidget = SpineWidget; spine.SpineWidget = SpineWidget;
var SpineWidgetConfig = (function () { var SpineWidgetConfig = (function () {
function SpineWidgetConfig() { function SpineWidgetConfig() {

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

File diff suppressed because one or more lines are too long

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

@ -589,9 +589,6 @@ declare module spine {
ChainScale = 2, ChainScale = 2,
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
class SharedAssetManager implements Disposable { class SharedAssetManager implements Disposable {
private pathPrefix; private pathPrefix;
@ -1000,6 +997,7 @@ declare module spine {
static newShortArray(size: number): ArrayLike<number>; static newShortArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): number[] | Float32Array; static toFloatArray(array: Array<number>): number[] | Float32Array;
static toSinglePrecision(value: number): number; static toSinglePrecision(value: number): number;
static webkit602BugfixHelper(alpha: number, pose: MixPose): void;
} }
class DebugUtils { class DebugUtils {
static logBones(skeleton: Skeleton): void; static logBones(skeleton: Skeleton): void;
@ -1054,6 +1052,9 @@ declare module spine {
end(): void; end(): void;
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
abstract class Attachment { abstract class Attachment {
name: string; name: string;

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

@ -162,12 +162,12 @@ var spine;
var y = curves[i - 1]; var y = curves[i - 1];
return y + (1 - y) * (percent - x) / (1 - x); return y + (1 - y) * (percent - x) / (1 - x);
}; };
return CurveTimeline;
}());
CurveTimeline.LINEAR = 0; CurveTimeline.LINEAR = 0;
CurveTimeline.STEPPED = 1; CurveTimeline.STEPPED = 1;
CurveTimeline.BEZIER = 2; CurveTimeline.BEZIER = 2;
CurveTimeline.BEZIER_SIZE = 10 * 2 - 1; CurveTimeline.BEZIER_SIZE = 10 * 2 - 1;
return CurveTimeline;
}());
spine.CurveTimeline = CurveTimeline; spine.CurveTimeline = CurveTimeline;
var RotateTimeline = (function (_super) { var RotateTimeline = (function (_super) {
__extends(RotateTimeline, _super); __extends(RotateTimeline, _super);
@ -226,12 +226,12 @@ var spine;
bone.rotation += r * alpha; bone.rotation += r * alpha;
} }
}; };
return RotateTimeline;
}(CurveTimeline));
RotateTimeline.ENTRIES = 2; RotateTimeline.ENTRIES = 2;
RotateTimeline.PREV_TIME = -2; RotateTimeline.PREV_TIME = -2;
RotateTimeline.PREV_ROTATION = -1; RotateTimeline.PREV_ROTATION = -1;
RotateTimeline.ROTATION = 1; RotateTimeline.ROTATION = 1;
return RotateTimeline;
}(CurveTimeline));
spine.RotateTimeline = RotateTimeline; spine.RotateTimeline = RotateTimeline;
var TranslateTimeline = (function (_super) { var TranslateTimeline = (function (_super) {
__extends(TranslateTimeline, _super); __extends(TranslateTimeline, _super);
@ -287,14 +287,14 @@ var spine;
bone.y += (bone.data.y + y - bone.y) * alpha; bone.y += (bone.data.y + y - bone.y) * alpha;
} }
}; };
return TranslateTimeline;
}(CurveTimeline));
TranslateTimeline.ENTRIES = 3; TranslateTimeline.ENTRIES = 3;
TranslateTimeline.PREV_TIME = -3; TranslateTimeline.PREV_TIME = -3;
TranslateTimeline.PREV_X = -2; TranslateTimeline.PREV_X = -2;
TranslateTimeline.PREV_Y = -1; TranslateTimeline.PREV_Y = -1;
TranslateTimeline.X = 1; TranslateTimeline.X = 1;
TranslateTimeline.Y = 2; TranslateTimeline.Y = 2;
return TranslateTimeline;
}(CurveTimeline));
spine.TranslateTimeline = TranslateTimeline; spine.TranslateTimeline = TranslateTimeline;
var ScaleTimeline = (function (_super) { var ScaleTimeline = (function (_super) {
__extends(ScaleTimeline, _super); __extends(ScaleTimeline, _super);
@ -473,8 +473,6 @@ var spine;
color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha); color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha);
} }
}; };
return ColorTimeline;
}(CurveTimeline));
ColorTimeline.ENTRIES = 5; ColorTimeline.ENTRIES = 5;
ColorTimeline.PREV_TIME = -5; ColorTimeline.PREV_TIME = -5;
ColorTimeline.PREV_R = -4; ColorTimeline.PREV_R = -4;
@ -485,6 +483,8 @@ var spine;
ColorTimeline.G = 2; ColorTimeline.G = 2;
ColorTimeline.B = 3; ColorTimeline.B = 3;
ColorTimeline.A = 4; ColorTimeline.A = 4;
return ColorTimeline;
}(CurveTimeline));
spine.ColorTimeline = ColorTimeline; spine.ColorTimeline = ColorTimeline;
var TwoColorTimeline = (function (_super) { var TwoColorTimeline = (function (_super) {
__extends(TwoColorTimeline, _super); __extends(TwoColorTimeline, _super);
@ -567,8 +567,6 @@ var spine;
dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0); dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0);
} }
}; };
return TwoColorTimeline;
}(CurveTimeline));
TwoColorTimeline.ENTRIES = 8; TwoColorTimeline.ENTRIES = 8;
TwoColorTimeline.PREV_TIME = -8; TwoColorTimeline.PREV_TIME = -8;
TwoColorTimeline.PREV_R = -7; TwoColorTimeline.PREV_R = -7;
@ -585,6 +583,8 @@ var spine;
TwoColorTimeline.R2 = 5; TwoColorTimeline.R2 = 5;
TwoColorTimeline.G2 = 6; TwoColorTimeline.G2 = 6;
TwoColorTimeline.B2 = 7; TwoColorTimeline.B2 = 7;
return TwoColorTimeline;
}(CurveTimeline));
spine.TwoColorTimeline = TwoColorTimeline; spine.TwoColorTimeline = TwoColorTimeline;
var AttachmentTimeline = (function () { var AttachmentTimeline = (function () {
function AttachmentTimeline(frameCount) { function AttachmentTimeline(frameCount) {
@ -893,14 +893,14 @@ var spine;
constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION]; constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
} }
}; };
return IkConstraintTimeline;
}(CurveTimeline));
IkConstraintTimeline.ENTRIES = 3; IkConstraintTimeline.ENTRIES = 3;
IkConstraintTimeline.PREV_TIME = -3; IkConstraintTimeline.PREV_TIME = -3;
IkConstraintTimeline.PREV_MIX = -2; IkConstraintTimeline.PREV_MIX = -2;
IkConstraintTimeline.PREV_BEND_DIRECTION = -1; IkConstraintTimeline.PREV_BEND_DIRECTION = -1;
IkConstraintTimeline.MIX = 1; IkConstraintTimeline.MIX = 1;
IkConstraintTimeline.BEND_DIRECTION = 2; IkConstraintTimeline.BEND_DIRECTION = 2;
return IkConstraintTimeline;
}(CurveTimeline));
spine.IkConstraintTimeline = IkConstraintTimeline; spine.IkConstraintTimeline = IkConstraintTimeline;
var TransformConstraintTimeline = (function (_super) { var TransformConstraintTimeline = (function (_super) {
__extends(TransformConstraintTimeline, _super); __extends(TransformConstraintTimeline, _super);
@ -975,8 +975,6 @@ var spine;
constraint.shearMix += (shear - constraint.shearMix) * alpha; constraint.shearMix += (shear - constraint.shearMix) * alpha;
} }
}; };
return TransformConstraintTimeline;
}(CurveTimeline));
TransformConstraintTimeline.ENTRIES = 5; TransformConstraintTimeline.ENTRIES = 5;
TransformConstraintTimeline.PREV_TIME = -5; TransformConstraintTimeline.PREV_TIME = -5;
TransformConstraintTimeline.PREV_ROTATE = -4; TransformConstraintTimeline.PREV_ROTATE = -4;
@ -987,6 +985,8 @@ var spine;
TransformConstraintTimeline.TRANSLATE = 2; TransformConstraintTimeline.TRANSLATE = 2;
TransformConstraintTimeline.SCALE = 3; TransformConstraintTimeline.SCALE = 3;
TransformConstraintTimeline.SHEAR = 4; TransformConstraintTimeline.SHEAR = 4;
return TransformConstraintTimeline;
}(CurveTimeline));
spine.TransformConstraintTimeline = TransformConstraintTimeline; spine.TransformConstraintTimeline = TransformConstraintTimeline;
var PathConstraintPositionTimeline = (function (_super) { var PathConstraintPositionTimeline = (function (_super) {
__extends(PathConstraintPositionTimeline, _super); __extends(PathConstraintPositionTimeline, _super);
@ -1031,12 +1031,12 @@ var spine;
else else
constraint.position += (position - constraint.position) * alpha; constraint.position += (position - constraint.position) * alpha;
}; };
return PathConstraintPositionTimeline;
}(CurveTimeline));
PathConstraintPositionTimeline.ENTRIES = 2; PathConstraintPositionTimeline.ENTRIES = 2;
PathConstraintPositionTimeline.PREV_TIME = -2; PathConstraintPositionTimeline.PREV_TIME = -2;
PathConstraintPositionTimeline.PREV_VALUE = -1; PathConstraintPositionTimeline.PREV_VALUE = -1;
PathConstraintPositionTimeline.VALUE = 1; PathConstraintPositionTimeline.VALUE = 1;
return PathConstraintPositionTimeline;
}(CurveTimeline));
spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline; spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline;
var PathConstraintSpacingTimeline = (function (_super) { var PathConstraintSpacingTimeline = (function (_super) {
__extends(PathConstraintSpacingTimeline, _super); __extends(PathConstraintSpacingTimeline, _super);
@ -1131,14 +1131,14 @@ var spine;
constraint.translateMix += (translate - constraint.translateMix) * alpha; constraint.translateMix += (translate - constraint.translateMix) * alpha;
} }
}; };
return PathConstraintMixTimeline;
}(CurveTimeline));
PathConstraintMixTimeline.ENTRIES = 3; PathConstraintMixTimeline.ENTRIES = 3;
PathConstraintMixTimeline.PREV_TIME = -3; PathConstraintMixTimeline.PREV_TIME = -3;
PathConstraintMixTimeline.PREV_ROTATE = -2; PathConstraintMixTimeline.PREV_ROTATE = -2;
PathConstraintMixTimeline.PREV_TRANSLATE = -1; PathConstraintMixTimeline.PREV_TRANSLATE = -1;
PathConstraintMixTimeline.ROTATE = 1; PathConstraintMixTimeline.ROTATE = 1;
PathConstraintMixTimeline.TRANSLATE = 2; PathConstraintMixTimeline.TRANSLATE = 2;
return PathConstraintMixTimeline;
}(CurveTimeline));
spine.PathConstraintMixTimeline = PathConstraintMixTimeline; spine.PathConstraintMixTimeline = PathConstraintMixTimeline;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -1263,10 +1263,12 @@ var spine;
if (timeline instanceof spine.RotateTimeline) { if (timeline instanceof spine.RotateTimeline) {
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame);
} }
else else {
spine.Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]); timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]);
} }
} }
}
this.queueEvents(current, animationTime); this.queueEvents(current, animationTime);
events.length = 0; events.length = 0;
current.nextAnimationLast = animationTime; current.nextAnimationLast = animationTime;
@ -1333,6 +1335,7 @@ var spine;
if (timeline instanceof spine.RotateTimeline) if (timeline instanceof spine.RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame);
else { else {
spine.Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out); timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out);
} }
} }
@ -1416,10 +1419,13 @@ var spine;
continue; continue;
this.queue.event(entry, event_1); this.queue.event(entry, event_1);
} }
if (entry.loop ? (trackLastWrapped > entry.trackTime % duration) var complete = false;
: (animationTime >= animationEnd && entry.animationLast < animationEnd)) { if (entry.loop)
complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
else
complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
if (complete)
this.queue.complete(entry); this.queue.complete(entry);
}
for (; i < n; i++) { for (; i < n; i++) {
var event_2 = events[i]; var event_2 = events[i];
if (event_2.time < animationStart) if (event_2.time < animationStart)
@ -1631,13 +1637,13 @@ var spine;
AnimationState.prototype.clearListenerNotifications = function () { AnimationState.prototype.clearListenerNotifications = function () {
this.queue.clear(); this.queue.clear();
}; };
return AnimationState;
}());
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.DIP = 2; AnimationState.DIP = 2;
AnimationState.DIP_MIX = 3; AnimationState.DIP_MIX = 3;
return AnimationState;
}());
spine.AnimationState = AnimationState; spine.AnimationState = AnimationState;
var TrackEntry = (function () { var TrackEntry = (function () {
function TrackEntry() { function TrackEntry() {
@ -3058,12 +3064,12 @@ var spine;
PathConstraint.prototype.getOrder = function () { PathConstraint.prototype.getOrder = function () {
return this.data.order; return this.data.order;
}; };
return PathConstraint;
}());
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001; PathConstraint.epsilon = 0.00001;
return PathConstraint;
}());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -3095,15 +3101,6 @@ var spine;
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale"; RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
})(RotateMode = spine.RotateMode || (spine.RotateMode = {})); })(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Assets = (function () { var Assets = (function () {
@ -5874,13 +5871,13 @@ var spine;
this.a = 1; this.a = 1;
return this; return this;
}; };
return Color;
}());
Color.WHITE = new Color(1, 1, 1, 1); Color.WHITE = new Color(1, 1, 1, 1);
Color.RED = new Color(1, 0, 0, 1); Color.RED = new Color(1, 0, 0, 1);
Color.GREEN = new Color(0, 1, 0, 1); Color.GREEN = new Color(0, 1, 0, 1);
Color.BLUE = new Color(0, 0, 1, 1); Color.BLUE = new Color(0, 0, 1, 1);
Color.MAGENTA = new Color(1, 0, 1, 1); Color.MAGENTA = new Color(1, 0, 1, 1);
return Color;
}());
spine.Color = Color; spine.Color = Color;
var MathUtils = (function () { var MathUtils = (function () {
function MathUtils() { function MathUtils() {
@ -5918,14 +5915,14 @@ var spine;
return min + Math.sqrt(u * d * (mode - min)); return min + Math.sqrt(u * d * (mode - min));
return max - Math.sqrt((1 - u) * d * (max - mode)); return max - Math.sqrt((1 - u) * d * (max - mode));
}; };
return MathUtils;
}());
MathUtils.PI = 3.1415927; MathUtils.PI = 3.1415927;
MathUtils.PI2 = MathUtils.PI * 2; MathUtils.PI2 = MathUtils.PI * 2;
MathUtils.radiansToDegrees = 180 / MathUtils.PI; MathUtils.radiansToDegrees = 180 / MathUtils.PI;
MathUtils.radDeg = MathUtils.radiansToDegrees; MathUtils.radDeg = MathUtils.radiansToDegrees;
MathUtils.degreesToRadians = MathUtils.PI / 180; MathUtils.degreesToRadians = MathUtils.PI / 180;
MathUtils.degRad = MathUtils.degreesToRadians; MathUtils.degRad = MathUtils.degreesToRadians;
return MathUtils;
}());
spine.MathUtils = MathUtils; spine.MathUtils = MathUtils;
var Interpolation = (function () { var Interpolation = (function () {
function Interpolation() { function Interpolation() {
@ -6023,9 +6020,11 @@ var spine;
Utils.toSinglePrecision = function (value) { Utils.toSinglePrecision = function (value) {
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value; return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
}; };
Utils.webkit602BugfixHelper = function (alpha, pose) {
};
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
return Utils; return Utils;
}()); }());
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
spine.Utils = Utils; spine.Utils = Utils;
var DebugUtils = (function () { var DebugUtils = (function () {
function DebugUtils() { function DebugUtils() {
@ -6161,6 +6160,15 @@ var spine;
}()); }());
spine.WindowedMean = WindowedMean; spine.WindowedMean = WindowedMean;
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Attachment = (function () { var Attachment = (function () {
@ -6242,9 +6250,9 @@ var spine;
VertexAttachment.prototype.applyDeform = function (sourceAttachment) { VertexAttachment.prototype.applyDeform = function (sourceAttachment) {
return this == sourceAttachment; return this == sourceAttachment;
}; };
VertexAttachment.nextID = 0;
return VertexAttachment; return VertexAttachment;
}(Attachment)); }(Attachment));
VertexAttachment.nextID = 0;
spine.VertexAttachment = VertexAttachment; spine.VertexAttachment = VertexAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6482,8 +6490,6 @@ var spine;
worldVertices[offset] = offsetX * a + offsetY * b + x; worldVertices[offset] = offsetX * a + offsetY * b + x;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
return RegionAttachment;
}(spine.Attachment));
RegionAttachment.OX1 = 0; RegionAttachment.OX1 = 0;
RegionAttachment.OY1 = 1; RegionAttachment.OY1 = 1;
RegionAttachment.OX2 = 2; RegionAttachment.OX2 = 2;
@ -6524,6 +6530,8 @@ var spine;
RegionAttachment.C4A = 29; RegionAttachment.C4A = 29;
RegionAttachment.U4 = 30; RegionAttachment.U4 = 30;
RegionAttachment.V4 = 31; RegionAttachment.V4 = 31;
return RegionAttachment;
}(spine.Attachment));
spine.RegionAttachment = RegionAttachment; spine.RegionAttachment = RegionAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6578,9 +6586,9 @@ var spine;
}; };
SwirlEffect.prototype.end = function () { SwirlEffect.prototype.end = function () {
}; };
SwirlEffect.interpolation = new spine.PowOut(2);
return SwirlEffect; return SwirlEffect;
}()); }());
SwirlEffect.interpolation = new spine.PowOut(2);
spine.SwirlEffect = SwirlEffect; spine.SwirlEffect = SwirlEffect;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6831,10 +6839,10 @@ var spine;
} }
return vertices; return vertices;
}; };
return SkeletonRenderer;
}());
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0]; SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4; SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4;
return SkeletonRenderer;
}());
canvas.SkeletonRenderer = SkeletonRenderer; canvas.SkeletonRenderer = SkeletonRenderer;
})(canvas = spine.canvas || (spine.canvas = {})); })(canvas = spine.canvas || (spine.canvas = {}));
})(spine || (spine = {})); })(spine || (spine = {}));

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

File diff suppressed because one or more lines are too long

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

@ -589,9 +589,6 @@ declare module spine {
ChainScale = 2, ChainScale = 2,
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
class SharedAssetManager implements Disposable { class SharedAssetManager implements Disposable {
private pathPrefix; private pathPrefix;
@ -1000,6 +997,7 @@ declare module spine {
static newShortArray(size: number): ArrayLike<number>; static newShortArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): number[] | Float32Array; static toFloatArray(array: Array<number>): number[] | Float32Array;
static toSinglePrecision(value: number): number; static toSinglePrecision(value: number): number;
static webkit602BugfixHelper(alpha: number, pose: MixPose): void;
} }
class DebugUtils { class DebugUtils {
static logBones(skeleton: Skeleton): void; static logBones(skeleton: Skeleton): void;
@ -1054,6 +1052,9 @@ declare module spine {
end(): void; end(): void;
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
abstract class Attachment { abstract class Attachment {
name: string; name: string;

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

@ -162,12 +162,12 @@ var spine;
var y = curves[i - 1]; var y = curves[i - 1];
return y + (1 - y) * (percent - x) / (1 - x); return y + (1 - y) * (percent - x) / (1 - x);
}; };
return CurveTimeline;
}());
CurveTimeline.LINEAR = 0; CurveTimeline.LINEAR = 0;
CurveTimeline.STEPPED = 1; CurveTimeline.STEPPED = 1;
CurveTimeline.BEZIER = 2; CurveTimeline.BEZIER = 2;
CurveTimeline.BEZIER_SIZE = 10 * 2 - 1; CurveTimeline.BEZIER_SIZE = 10 * 2 - 1;
return CurveTimeline;
}());
spine.CurveTimeline = CurveTimeline; spine.CurveTimeline = CurveTimeline;
var RotateTimeline = (function (_super) { var RotateTimeline = (function (_super) {
__extends(RotateTimeline, _super); __extends(RotateTimeline, _super);
@ -226,12 +226,12 @@ var spine;
bone.rotation += r * alpha; bone.rotation += r * alpha;
} }
}; };
return RotateTimeline;
}(CurveTimeline));
RotateTimeline.ENTRIES = 2; RotateTimeline.ENTRIES = 2;
RotateTimeline.PREV_TIME = -2; RotateTimeline.PREV_TIME = -2;
RotateTimeline.PREV_ROTATION = -1; RotateTimeline.PREV_ROTATION = -1;
RotateTimeline.ROTATION = 1; RotateTimeline.ROTATION = 1;
return RotateTimeline;
}(CurveTimeline));
spine.RotateTimeline = RotateTimeline; spine.RotateTimeline = RotateTimeline;
var TranslateTimeline = (function (_super) { var TranslateTimeline = (function (_super) {
__extends(TranslateTimeline, _super); __extends(TranslateTimeline, _super);
@ -287,14 +287,14 @@ var spine;
bone.y += (bone.data.y + y - bone.y) * alpha; bone.y += (bone.data.y + y - bone.y) * alpha;
} }
}; };
return TranslateTimeline;
}(CurveTimeline));
TranslateTimeline.ENTRIES = 3; TranslateTimeline.ENTRIES = 3;
TranslateTimeline.PREV_TIME = -3; TranslateTimeline.PREV_TIME = -3;
TranslateTimeline.PREV_X = -2; TranslateTimeline.PREV_X = -2;
TranslateTimeline.PREV_Y = -1; TranslateTimeline.PREV_Y = -1;
TranslateTimeline.X = 1; TranslateTimeline.X = 1;
TranslateTimeline.Y = 2; TranslateTimeline.Y = 2;
return TranslateTimeline;
}(CurveTimeline));
spine.TranslateTimeline = TranslateTimeline; spine.TranslateTimeline = TranslateTimeline;
var ScaleTimeline = (function (_super) { var ScaleTimeline = (function (_super) {
__extends(ScaleTimeline, _super); __extends(ScaleTimeline, _super);
@ -473,8 +473,6 @@ var spine;
color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha); color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha);
} }
}; };
return ColorTimeline;
}(CurveTimeline));
ColorTimeline.ENTRIES = 5; ColorTimeline.ENTRIES = 5;
ColorTimeline.PREV_TIME = -5; ColorTimeline.PREV_TIME = -5;
ColorTimeline.PREV_R = -4; ColorTimeline.PREV_R = -4;
@ -485,6 +483,8 @@ var spine;
ColorTimeline.G = 2; ColorTimeline.G = 2;
ColorTimeline.B = 3; ColorTimeline.B = 3;
ColorTimeline.A = 4; ColorTimeline.A = 4;
return ColorTimeline;
}(CurveTimeline));
spine.ColorTimeline = ColorTimeline; spine.ColorTimeline = ColorTimeline;
var TwoColorTimeline = (function (_super) { var TwoColorTimeline = (function (_super) {
__extends(TwoColorTimeline, _super); __extends(TwoColorTimeline, _super);
@ -567,8 +567,6 @@ var spine;
dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0); dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0);
} }
}; };
return TwoColorTimeline;
}(CurveTimeline));
TwoColorTimeline.ENTRIES = 8; TwoColorTimeline.ENTRIES = 8;
TwoColorTimeline.PREV_TIME = -8; TwoColorTimeline.PREV_TIME = -8;
TwoColorTimeline.PREV_R = -7; TwoColorTimeline.PREV_R = -7;
@ -585,6 +583,8 @@ var spine;
TwoColorTimeline.R2 = 5; TwoColorTimeline.R2 = 5;
TwoColorTimeline.G2 = 6; TwoColorTimeline.G2 = 6;
TwoColorTimeline.B2 = 7; TwoColorTimeline.B2 = 7;
return TwoColorTimeline;
}(CurveTimeline));
spine.TwoColorTimeline = TwoColorTimeline; spine.TwoColorTimeline = TwoColorTimeline;
var AttachmentTimeline = (function () { var AttachmentTimeline = (function () {
function AttachmentTimeline(frameCount) { function AttachmentTimeline(frameCount) {
@ -893,14 +893,14 @@ var spine;
constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION]; constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
} }
}; };
return IkConstraintTimeline;
}(CurveTimeline));
IkConstraintTimeline.ENTRIES = 3; IkConstraintTimeline.ENTRIES = 3;
IkConstraintTimeline.PREV_TIME = -3; IkConstraintTimeline.PREV_TIME = -3;
IkConstraintTimeline.PREV_MIX = -2; IkConstraintTimeline.PREV_MIX = -2;
IkConstraintTimeline.PREV_BEND_DIRECTION = -1; IkConstraintTimeline.PREV_BEND_DIRECTION = -1;
IkConstraintTimeline.MIX = 1; IkConstraintTimeline.MIX = 1;
IkConstraintTimeline.BEND_DIRECTION = 2; IkConstraintTimeline.BEND_DIRECTION = 2;
return IkConstraintTimeline;
}(CurveTimeline));
spine.IkConstraintTimeline = IkConstraintTimeline; spine.IkConstraintTimeline = IkConstraintTimeline;
var TransformConstraintTimeline = (function (_super) { var TransformConstraintTimeline = (function (_super) {
__extends(TransformConstraintTimeline, _super); __extends(TransformConstraintTimeline, _super);
@ -975,8 +975,6 @@ var spine;
constraint.shearMix += (shear - constraint.shearMix) * alpha; constraint.shearMix += (shear - constraint.shearMix) * alpha;
} }
}; };
return TransformConstraintTimeline;
}(CurveTimeline));
TransformConstraintTimeline.ENTRIES = 5; TransformConstraintTimeline.ENTRIES = 5;
TransformConstraintTimeline.PREV_TIME = -5; TransformConstraintTimeline.PREV_TIME = -5;
TransformConstraintTimeline.PREV_ROTATE = -4; TransformConstraintTimeline.PREV_ROTATE = -4;
@ -987,6 +985,8 @@ var spine;
TransformConstraintTimeline.TRANSLATE = 2; TransformConstraintTimeline.TRANSLATE = 2;
TransformConstraintTimeline.SCALE = 3; TransformConstraintTimeline.SCALE = 3;
TransformConstraintTimeline.SHEAR = 4; TransformConstraintTimeline.SHEAR = 4;
return TransformConstraintTimeline;
}(CurveTimeline));
spine.TransformConstraintTimeline = TransformConstraintTimeline; spine.TransformConstraintTimeline = TransformConstraintTimeline;
var PathConstraintPositionTimeline = (function (_super) { var PathConstraintPositionTimeline = (function (_super) {
__extends(PathConstraintPositionTimeline, _super); __extends(PathConstraintPositionTimeline, _super);
@ -1031,12 +1031,12 @@ var spine;
else else
constraint.position += (position - constraint.position) * alpha; constraint.position += (position - constraint.position) * alpha;
}; };
return PathConstraintPositionTimeline;
}(CurveTimeline));
PathConstraintPositionTimeline.ENTRIES = 2; PathConstraintPositionTimeline.ENTRIES = 2;
PathConstraintPositionTimeline.PREV_TIME = -2; PathConstraintPositionTimeline.PREV_TIME = -2;
PathConstraintPositionTimeline.PREV_VALUE = -1; PathConstraintPositionTimeline.PREV_VALUE = -1;
PathConstraintPositionTimeline.VALUE = 1; PathConstraintPositionTimeline.VALUE = 1;
return PathConstraintPositionTimeline;
}(CurveTimeline));
spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline; spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline;
var PathConstraintSpacingTimeline = (function (_super) { var PathConstraintSpacingTimeline = (function (_super) {
__extends(PathConstraintSpacingTimeline, _super); __extends(PathConstraintSpacingTimeline, _super);
@ -1131,14 +1131,14 @@ var spine;
constraint.translateMix += (translate - constraint.translateMix) * alpha; constraint.translateMix += (translate - constraint.translateMix) * alpha;
} }
}; };
return PathConstraintMixTimeline;
}(CurveTimeline));
PathConstraintMixTimeline.ENTRIES = 3; PathConstraintMixTimeline.ENTRIES = 3;
PathConstraintMixTimeline.PREV_TIME = -3; PathConstraintMixTimeline.PREV_TIME = -3;
PathConstraintMixTimeline.PREV_ROTATE = -2; PathConstraintMixTimeline.PREV_ROTATE = -2;
PathConstraintMixTimeline.PREV_TRANSLATE = -1; PathConstraintMixTimeline.PREV_TRANSLATE = -1;
PathConstraintMixTimeline.ROTATE = 1; PathConstraintMixTimeline.ROTATE = 1;
PathConstraintMixTimeline.TRANSLATE = 2; PathConstraintMixTimeline.TRANSLATE = 2;
return PathConstraintMixTimeline;
}(CurveTimeline));
spine.PathConstraintMixTimeline = PathConstraintMixTimeline; spine.PathConstraintMixTimeline = PathConstraintMixTimeline;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -1263,10 +1263,12 @@ var spine;
if (timeline instanceof spine.RotateTimeline) { if (timeline instanceof spine.RotateTimeline) {
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame);
} }
else else {
spine.Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]); timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]);
} }
} }
}
this.queueEvents(current, animationTime); this.queueEvents(current, animationTime);
events.length = 0; events.length = 0;
current.nextAnimationLast = animationTime; current.nextAnimationLast = animationTime;
@ -1333,6 +1335,7 @@ var spine;
if (timeline instanceof spine.RotateTimeline) if (timeline instanceof spine.RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame);
else { else {
spine.Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out); timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out);
} }
} }
@ -1416,10 +1419,13 @@ var spine;
continue; continue;
this.queue.event(entry, event_1); this.queue.event(entry, event_1);
} }
if (entry.loop ? (trackLastWrapped > entry.trackTime % duration) var complete = false;
: (animationTime >= animationEnd && entry.animationLast < animationEnd)) { if (entry.loop)
complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
else
complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
if (complete)
this.queue.complete(entry); this.queue.complete(entry);
}
for (; i < n; i++) { for (; i < n; i++) {
var event_2 = events[i]; var event_2 = events[i];
if (event_2.time < animationStart) if (event_2.time < animationStart)
@ -1631,13 +1637,13 @@ var spine;
AnimationState.prototype.clearListenerNotifications = function () { AnimationState.prototype.clearListenerNotifications = function () {
this.queue.clear(); this.queue.clear();
}; };
return AnimationState;
}());
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.DIP = 2; AnimationState.DIP = 2;
AnimationState.DIP_MIX = 3; AnimationState.DIP_MIX = 3;
return AnimationState;
}());
spine.AnimationState = AnimationState; spine.AnimationState = AnimationState;
var TrackEntry = (function () { var TrackEntry = (function () {
function TrackEntry() { function TrackEntry() {
@ -3058,12 +3064,12 @@ var spine;
PathConstraint.prototype.getOrder = function () { PathConstraint.prototype.getOrder = function () {
return this.data.order; return this.data.order;
}; };
return PathConstraint;
}());
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001; PathConstraint.epsilon = 0.00001;
return PathConstraint;
}());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -3095,15 +3101,6 @@ var spine;
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale"; RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
})(RotateMode = spine.RotateMode || (spine.RotateMode = {})); })(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Assets = (function () { var Assets = (function () {
@ -5874,13 +5871,13 @@ var spine;
this.a = 1; this.a = 1;
return this; return this;
}; };
return Color;
}());
Color.WHITE = new Color(1, 1, 1, 1); Color.WHITE = new Color(1, 1, 1, 1);
Color.RED = new Color(1, 0, 0, 1); Color.RED = new Color(1, 0, 0, 1);
Color.GREEN = new Color(0, 1, 0, 1); Color.GREEN = new Color(0, 1, 0, 1);
Color.BLUE = new Color(0, 0, 1, 1); Color.BLUE = new Color(0, 0, 1, 1);
Color.MAGENTA = new Color(1, 0, 1, 1); Color.MAGENTA = new Color(1, 0, 1, 1);
return Color;
}());
spine.Color = Color; spine.Color = Color;
var MathUtils = (function () { var MathUtils = (function () {
function MathUtils() { function MathUtils() {
@ -5918,14 +5915,14 @@ var spine;
return min + Math.sqrt(u * d * (mode - min)); return min + Math.sqrt(u * d * (mode - min));
return max - Math.sqrt((1 - u) * d * (max - mode)); return max - Math.sqrt((1 - u) * d * (max - mode));
}; };
return MathUtils;
}());
MathUtils.PI = 3.1415927; MathUtils.PI = 3.1415927;
MathUtils.PI2 = MathUtils.PI * 2; MathUtils.PI2 = MathUtils.PI * 2;
MathUtils.radiansToDegrees = 180 / MathUtils.PI; MathUtils.radiansToDegrees = 180 / MathUtils.PI;
MathUtils.radDeg = MathUtils.radiansToDegrees; MathUtils.radDeg = MathUtils.radiansToDegrees;
MathUtils.degreesToRadians = MathUtils.PI / 180; MathUtils.degreesToRadians = MathUtils.PI / 180;
MathUtils.degRad = MathUtils.degreesToRadians; MathUtils.degRad = MathUtils.degreesToRadians;
return MathUtils;
}());
spine.MathUtils = MathUtils; spine.MathUtils = MathUtils;
var Interpolation = (function () { var Interpolation = (function () {
function Interpolation() { function Interpolation() {
@ -6023,9 +6020,11 @@ var spine;
Utils.toSinglePrecision = function (value) { Utils.toSinglePrecision = function (value) {
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value; return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
}; };
Utils.webkit602BugfixHelper = function (alpha, pose) {
};
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
return Utils; return Utils;
}()); }());
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
spine.Utils = Utils; spine.Utils = Utils;
var DebugUtils = (function () { var DebugUtils = (function () {
function DebugUtils() { function DebugUtils() {
@ -6161,6 +6160,15 @@ var spine;
}()); }());
spine.WindowedMean = WindowedMean; spine.WindowedMean = WindowedMean;
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Attachment = (function () { var Attachment = (function () {
@ -6242,9 +6250,9 @@ var spine;
VertexAttachment.prototype.applyDeform = function (sourceAttachment) { VertexAttachment.prototype.applyDeform = function (sourceAttachment) {
return this == sourceAttachment; return this == sourceAttachment;
}; };
VertexAttachment.nextID = 0;
return VertexAttachment; return VertexAttachment;
}(Attachment)); }(Attachment));
VertexAttachment.nextID = 0;
spine.VertexAttachment = VertexAttachment; spine.VertexAttachment = VertexAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6482,8 +6490,6 @@ var spine;
worldVertices[offset] = offsetX * a + offsetY * b + x; worldVertices[offset] = offsetX * a + offsetY * b + x;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
return RegionAttachment;
}(spine.Attachment));
RegionAttachment.OX1 = 0; RegionAttachment.OX1 = 0;
RegionAttachment.OY1 = 1; RegionAttachment.OY1 = 1;
RegionAttachment.OX2 = 2; RegionAttachment.OX2 = 2;
@ -6524,6 +6530,8 @@ var spine;
RegionAttachment.C4A = 29; RegionAttachment.C4A = 29;
RegionAttachment.U4 = 30; RegionAttachment.U4 = 30;
RegionAttachment.V4 = 31; RegionAttachment.V4 = 31;
return RegionAttachment;
}(spine.Attachment));
spine.RegionAttachment = RegionAttachment; spine.RegionAttachment = RegionAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6578,9 +6586,9 @@ var spine;
}; };
SwirlEffect.prototype.end = function () { SwirlEffect.prototype.end = function () {
}; };
SwirlEffect.interpolation = new spine.PowOut(2);
return SwirlEffect; return SwirlEffect;
}()); }());
SwirlEffect.interpolation = new spine.PowOut(2);
spine.SwirlEffect = SwirlEffect; spine.SwirlEffect = SwirlEffect;
})(spine || (spine = {})); })(spine || (spine = {}));
//# sourceMappingURL=spine-core.js.map //# sourceMappingURL=spine-core.js.map

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

File diff suppressed because one or more lines are too long

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

@ -589,9 +589,6 @@ declare module spine {
ChainScale = 2, ChainScale = 2,
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
class SharedAssetManager implements Disposable { class SharedAssetManager implements Disposable {
private pathPrefix; private pathPrefix;
@ -1000,6 +997,7 @@ declare module spine {
static newShortArray(size: number): ArrayLike<number>; static newShortArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): number[] | Float32Array; static toFloatArray(array: Array<number>): number[] | Float32Array;
static toSinglePrecision(value: number): number; static toSinglePrecision(value: number): number;
static webkit602BugfixHelper(alpha: number, pose: MixPose): void;
} }
class DebugUtils { class DebugUtils {
static logBones(skeleton: Skeleton): void; static logBones(skeleton: Skeleton): void;
@ -1054,6 +1052,9 @@ declare module spine {
end(): void; end(): void;
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
abstract class Attachment { abstract class Attachment {
name: string; name: string;

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

@ -162,12 +162,12 @@ var spine;
var y = curves[i - 1]; var y = curves[i - 1];
return y + (1 - y) * (percent - x) / (1 - x); return y + (1 - y) * (percent - x) / (1 - x);
}; };
return CurveTimeline;
}());
CurveTimeline.LINEAR = 0; CurveTimeline.LINEAR = 0;
CurveTimeline.STEPPED = 1; CurveTimeline.STEPPED = 1;
CurveTimeline.BEZIER = 2; CurveTimeline.BEZIER = 2;
CurveTimeline.BEZIER_SIZE = 10 * 2 - 1; CurveTimeline.BEZIER_SIZE = 10 * 2 - 1;
return CurveTimeline;
}());
spine.CurveTimeline = CurveTimeline; spine.CurveTimeline = CurveTimeline;
var RotateTimeline = (function (_super) { var RotateTimeline = (function (_super) {
__extends(RotateTimeline, _super); __extends(RotateTimeline, _super);
@ -226,12 +226,12 @@ var spine;
bone.rotation += r * alpha; bone.rotation += r * alpha;
} }
}; };
return RotateTimeline;
}(CurveTimeline));
RotateTimeline.ENTRIES = 2; RotateTimeline.ENTRIES = 2;
RotateTimeline.PREV_TIME = -2; RotateTimeline.PREV_TIME = -2;
RotateTimeline.PREV_ROTATION = -1; RotateTimeline.PREV_ROTATION = -1;
RotateTimeline.ROTATION = 1; RotateTimeline.ROTATION = 1;
return RotateTimeline;
}(CurveTimeline));
spine.RotateTimeline = RotateTimeline; spine.RotateTimeline = RotateTimeline;
var TranslateTimeline = (function (_super) { var TranslateTimeline = (function (_super) {
__extends(TranslateTimeline, _super); __extends(TranslateTimeline, _super);
@ -287,14 +287,14 @@ var spine;
bone.y += (bone.data.y + y - bone.y) * alpha; bone.y += (bone.data.y + y - bone.y) * alpha;
} }
}; };
return TranslateTimeline;
}(CurveTimeline));
TranslateTimeline.ENTRIES = 3; TranslateTimeline.ENTRIES = 3;
TranslateTimeline.PREV_TIME = -3; TranslateTimeline.PREV_TIME = -3;
TranslateTimeline.PREV_X = -2; TranslateTimeline.PREV_X = -2;
TranslateTimeline.PREV_Y = -1; TranslateTimeline.PREV_Y = -1;
TranslateTimeline.X = 1; TranslateTimeline.X = 1;
TranslateTimeline.Y = 2; TranslateTimeline.Y = 2;
return TranslateTimeline;
}(CurveTimeline));
spine.TranslateTimeline = TranslateTimeline; spine.TranslateTimeline = TranslateTimeline;
var ScaleTimeline = (function (_super) { var ScaleTimeline = (function (_super) {
__extends(ScaleTimeline, _super); __extends(ScaleTimeline, _super);
@ -473,8 +473,6 @@ var spine;
color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha); color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha);
} }
}; };
return ColorTimeline;
}(CurveTimeline));
ColorTimeline.ENTRIES = 5; ColorTimeline.ENTRIES = 5;
ColorTimeline.PREV_TIME = -5; ColorTimeline.PREV_TIME = -5;
ColorTimeline.PREV_R = -4; ColorTimeline.PREV_R = -4;
@ -485,6 +483,8 @@ var spine;
ColorTimeline.G = 2; ColorTimeline.G = 2;
ColorTimeline.B = 3; ColorTimeline.B = 3;
ColorTimeline.A = 4; ColorTimeline.A = 4;
return ColorTimeline;
}(CurveTimeline));
spine.ColorTimeline = ColorTimeline; spine.ColorTimeline = ColorTimeline;
var TwoColorTimeline = (function (_super) { var TwoColorTimeline = (function (_super) {
__extends(TwoColorTimeline, _super); __extends(TwoColorTimeline, _super);
@ -567,8 +567,6 @@ var spine;
dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0); dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0);
} }
}; };
return TwoColorTimeline;
}(CurveTimeline));
TwoColorTimeline.ENTRIES = 8; TwoColorTimeline.ENTRIES = 8;
TwoColorTimeline.PREV_TIME = -8; TwoColorTimeline.PREV_TIME = -8;
TwoColorTimeline.PREV_R = -7; TwoColorTimeline.PREV_R = -7;
@ -585,6 +583,8 @@ var spine;
TwoColorTimeline.R2 = 5; TwoColorTimeline.R2 = 5;
TwoColorTimeline.G2 = 6; TwoColorTimeline.G2 = 6;
TwoColorTimeline.B2 = 7; TwoColorTimeline.B2 = 7;
return TwoColorTimeline;
}(CurveTimeline));
spine.TwoColorTimeline = TwoColorTimeline; spine.TwoColorTimeline = TwoColorTimeline;
var AttachmentTimeline = (function () { var AttachmentTimeline = (function () {
function AttachmentTimeline(frameCount) { function AttachmentTimeline(frameCount) {
@ -893,14 +893,14 @@ var spine;
constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION]; constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
} }
}; };
return IkConstraintTimeline;
}(CurveTimeline));
IkConstraintTimeline.ENTRIES = 3; IkConstraintTimeline.ENTRIES = 3;
IkConstraintTimeline.PREV_TIME = -3; IkConstraintTimeline.PREV_TIME = -3;
IkConstraintTimeline.PREV_MIX = -2; IkConstraintTimeline.PREV_MIX = -2;
IkConstraintTimeline.PREV_BEND_DIRECTION = -1; IkConstraintTimeline.PREV_BEND_DIRECTION = -1;
IkConstraintTimeline.MIX = 1; IkConstraintTimeline.MIX = 1;
IkConstraintTimeline.BEND_DIRECTION = 2; IkConstraintTimeline.BEND_DIRECTION = 2;
return IkConstraintTimeline;
}(CurveTimeline));
spine.IkConstraintTimeline = IkConstraintTimeline; spine.IkConstraintTimeline = IkConstraintTimeline;
var TransformConstraintTimeline = (function (_super) { var TransformConstraintTimeline = (function (_super) {
__extends(TransformConstraintTimeline, _super); __extends(TransformConstraintTimeline, _super);
@ -975,8 +975,6 @@ var spine;
constraint.shearMix += (shear - constraint.shearMix) * alpha; constraint.shearMix += (shear - constraint.shearMix) * alpha;
} }
}; };
return TransformConstraintTimeline;
}(CurveTimeline));
TransformConstraintTimeline.ENTRIES = 5; TransformConstraintTimeline.ENTRIES = 5;
TransformConstraintTimeline.PREV_TIME = -5; TransformConstraintTimeline.PREV_TIME = -5;
TransformConstraintTimeline.PREV_ROTATE = -4; TransformConstraintTimeline.PREV_ROTATE = -4;
@ -987,6 +985,8 @@ var spine;
TransformConstraintTimeline.TRANSLATE = 2; TransformConstraintTimeline.TRANSLATE = 2;
TransformConstraintTimeline.SCALE = 3; TransformConstraintTimeline.SCALE = 3;
TransformConstraintTimeline.SHEAR = 4; TransformConstraintTimeline.SHEAR = 4;
return TransformConstraintTimeline;
}(CurveTimeline));
spine.TransformConstraintTimeline = TransformConstraintTimeline; spine.TransformConstraintTimeline = TransformConstraintTimeline;
var PathConstraintPositionTimeline = (function (_super) { var PathConstraintPositionTimeline = (function (_super) {
__extends(PathConstraintPositionTimeline, _super); __extends(PathConstraintPositionTimeline, _super);
@ -1031,12 +1031,12 @@ var spine;
else else
constraint.position += (position - constraint.position) * alpha; constraint.position += (position - constraint.position) * alpha;
}; };
return PathConstraintPositionTimeline;
}(CurveTimeline));
PathConstraintPositionTimeline.ENTRIES = 2; PathConstraintPositionTimeline.ENTRIES = 2;
PathConstraintPositionTimeline.PREV_TIME = -2; PathConstraintPositionTimeline.PREV_TIME = -2;
PathConstraintPositionTimeline.PREV_VALUE = -1; PathConstraintPositionTimeline.PREV_VALUE = -1;
PathConstraintPositionTimeline.VALUE = 1; PathConstraintPositionTimeline.VALUE = 1;
return PathConstraintPositionTimeline;
}(CurveTimeline));
spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline; spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline;
var PathConstraintSpacingTimeline = (function (_super) { var PathConstraintSpacingTimeline = (function (_super) {
__extends(PathConstraintSpacingTimeline, _super); __extends(PathConstraintSpacingTimeline, _super);
@ -1131,14 +1131,14 @@ var spine;
constraint.translateMix += (translate - constraint.translateMix) * alpha; constraint.translateMix += (translate - constraint.translateMix) * alpha;
} }
}; };
return PathConstraintMixTimeline;
}(CurveTimeline));
PathConstraintMixTimeline.ENTRIES = 3; PathConstraintMixTimeline.ENTRIES = 3;
PathConstraintMixTimeline.PREV_TIME = -3; PathConstraintMixTimeline.PREV_TIME = -3;
PathConstraintMixTimeline.PREV_ROTATE = -2; PathConstraintMixTimeline.PREV_ROTATE = -2;
PathConstraintMixTimeline.PREV_TRANSLATE = -1; PathConstraintMixTimeline.PREV_TRANSLATE = -1;
PathConstraintMixTimeline.ROTATE = 1; PathConstraintMixTimeline.ROTATE = 1;
PathConstraintMixTimeline.TRANSLATE = 2; PathConstraintMixTimeline.TRANSLATE = 2;
return PathConstraintMixTimeline;
}(CurveTimeline));
spine.PathConstraintMixTimeline = PathConstraintMixTimeline; spine.PathConstraintMixTimeline = PathConstraintMixTimeline;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -1263,10 +1263,12 @@ var spine;
if (timeline instanceof spine.RotateTimeline) { if (timeline instanceof spine.RotateTimeline) {
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame);
} }
else else {
spine.Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]); timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]);
} }
} }
}
this.queueEvents(current, animationTime); this.queueEvents(current, animationTime);
events.length = 0; events.length = 0;
current.nextAnimationLast = animationTime; current.nextAnimationLast = animationTime;
@ -1333,6 +1335,7 @@ var spine;
if (timeline instanceof spine.RotateTimeline) if (timeline instanceof spine.RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame);
else { else {
spine.Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out); timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out);
} }
} }
@ -1416,10 +1419,13 @@ var spine;
continue; continue;
this.queue.event(entry, event_1); this.queue.event(entry, event_1);
} }
if (entry.loop ? (trackLastWrapped > entry.trackTime % duration) var complete = false;
: (animationTime >= animationEnd && entry.animationLast < animationEnd)) { if (entry.loop)
complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
else
complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
if (complete)
this.queue.complete(entry); this.queue.complete(entry);
}
for (; i < n; i++) { for (; i < n; i++) {
var event_2 = events[i]; var event_2 = events[i];
if (event_2.time < animationStart) if (event_2.time < animationStart)
@ -1631,13 +1637,13 @@ var spine;
AnimationState.prototype.clearListenerNotifications = function () { AnimationState.prototype.clearListenerNotifications = function () {
this.queue.clear(); this.queue.clear();
}; };
return AnimationState;
}());
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.DIP = 2; AnimationState.DIP = 2;
AnimationState.DIP_MIX = 3; AnimationState.DIP_MIX = 3;
return AnimationState;
}());
spine.AnimationState = AnimationState; spine.AnimationState = AnimationState;
var TrackEntry = (function () { var TrackEntry = (function () {
function TrackEntry() { function TrackEntry() {
@ -3058,12 +3064,12 @@ var spine;
PathConstraint.prototype.getOrder = function () { PathConstraint.prototype.getOrder = function () {
return this.data.order; return this.data.order;
}; };
return PathConstraint;
}());
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001; PathConstraint.epsilon = 0.00001;
return PathConstraint;
}());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -3095,15 +3101,6 @@ var spine;
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale"; RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
})(RotateMode = spine.RotateMode || (spine.RotateMode = {})); })(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Assets = (function () { var Assets = (function () {
@ -5874,13 +5871,13 @@ var spine;
this.a = 1; this.a = 1;
return this; return this;
}; };
return Color;
}());
Color.WHITE = new Color(1, 1, 1, 1); Color.WHITE = new Color(1, 1, 1, 1);
Color.RED = new Color(1, 0, 0, 1); Color.RED = new Color(1, 0, 0, 1);
Color.GREEN = new Color(0, 1, 0, 1); Color.GREEN = new Color(0, 1, 0, 1);
Color.BLUE = new Color(0, 0, 1, 1); Color.BLUE = new Color(0, 0, 1, 1);
Color.MAGENTA = new Color(1, 0, 1, 1); Color.MAGENTA = new Color(1, 0, 1, 1);
return Color;
}());
spine.Color = Color; spine.Color = Color;
var MathUtils = (function () { var MathUtils = (function () {
function MathUtils() { function MathUtils() {
@ -5918,14 +5915,14 @@ var spine;
return min + Math.sqrt(u * d * (mode - min)); return min + Math.sqrt(u * d * (mode - min));
return max - Math.sqrt((1 - u) * d * (max - mode)); return max - Math.sqrt((1 - u) * d * (max - mode));
}; };
return MathUtils;
}());
MathUtils.PI = 3.1415927; MathUtils.PI = 3.1415927;
MathUtils.PI2 = MathUtils.PI * 2; MathUtils.PI2 = MathUtils.PI * 2;
MathUtils.radiansToDegrees = 180 / MathUtils.PI; MathUtils.radiansToDegrees = 180 / MathUtils.PI;
MathUtils.radDeg = MathUtils.radiansToDegrees; MathUtils.radDeg = MathUtils.radiansToDegrees;
MathUtils.degreesToRadians = MathUtils.PI / 180; MathUtils.degreesToRadians = MathUtils.PI / 180;
MathUtils.degRad = MathUtils.degreesToRadians; MathUtils.degRad = MathUtils.degreesToRadians;
return MathUtils;
}());
spine.MathUtils = MathUtils; spine.MathUtils = MathUtils;
var Interpolation = (function () { var Interpolation = (function () {
function Interpolation() { function Interpolation() {
@ -6023,9 +6020,11 @@ var spine;
Utils.toSinglePrecision = function (value) { Utils.toSinglePrecision = function (value) {
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value; return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
}; };
Utils.webkit602BugfixHelper = function (alpha, pose) {
};
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
return Utils; return Utils;
}()); }());
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
spine.Utils = Utils; spine.Utils = Utils;
var DebugUtils = (function () { var DebugUtils = (function () {
function DebugUtils() { function DebugUtils() {
@ -6161,6 +6160,15 @@ var spine;
}()); }());
spine.WindowedMean = WindowedMean; spine.WindowedMean = WindowedMean;
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Attachment = (function () { var Attachment = (function () {
@ -6242,9 +6250,9 @@ var spine;
VertexAttachment.prototype.applyDeform = function (sourceAttachment) { VertexAttachment.prototype.applyDeform = function (sourceAttachment) {
return this == sourceAttachment; return this == sourceAttachment;
}; };
VertexAttachment.nextID = 0;
return VertexAttachment; return VertexAttachment;
}(Attachment)); }(Attachment));
VertexAttachment.nextID = 0;
spine.VertexAttachment = VertexAttachment; spine.VertexAttachment = VertexAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6482,8 +6490,6 @@ var spine;
worldVertices[offset] = offsetX * a + offsetY * b + x; worldVertices[offset] = offsetX * a + offsetY * b + x;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
return RegionAttachment;
}(spine.Attachment));
RegionAttachment.OX1 = 0; RegionAttachment.OX1 = 0;
RegionAttachment.OY1 = 1; RegionAttachment.OY1 = 1;
RegionAttachment.OX2 = 2; RegionAttachment.OX2 = 2;
@ -6524,6 +6530,8 @@ var spine;
RegionAttachment.C4A = 29; RegionAttachment.C4A = 29;
RegionAttachment.U4 = 30; RegionAttachment.U4 = 30;
RegionAttachment.V4 = 31; RegionAttachment.V4 = 31;
return RegionAttachment;
}(spine.Attachment));
spine.RegionAttachment = RegionAttachment; spine.RegionAttachment = RegionAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6578,9 +6586,9 @@ var spine;
}; };
SwirlEffect.prototype.end = function () { SwirlEffect.prototype.end = function () {
}; };
SwirlEffect.interpolation = new spine.PowOut(2);
return SwirlEffect; return SwirlEffect;
}()); }());
SwirlEffect.interpolation = new spine.PowOut(2);
spine.SwirlEffect = SwirlEffect; spine.SwirlEffect = SwirlEffect;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6680,9 +6688,9 @@ var spine;
geo.drawRange.start = 0; geo.drawRange.start = 0;
geo.drawRange.count = this.indicesLength; geo.drawRange.count = this.indicesLength;
}; };
MeshBatcher.VERTEX_SIZE = 9;
return MeshBatcher; return MeshBatcher;
}(THREE.Mesh)); }(THREE.Mesh));
MeshBatcher.VERTEX_SIZE = 9;
threejs.MeshBatcher = MeshBatcher; threejs.MeshBatcher = MeshBatcher;
})(threejs = spine.threejs || (spine.threejs = {})); })(threejs = spine.threejs || (spine.threejs = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -6918,10 +6926,10 @@ var spine;
clipper.clipEnd(); clipper.clipEnd();
batch.end(); batch.end();
}; };
return SkeletonMesh;
}(THREE.Object3D));
SkeletonMesh.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0]; SkeletonMesh.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
SkeletonMesh.VERTEX_SIZE = 2 + 2 + 4; SkeletonMesh.VERTEX_SIZE = 2 + 2 + 4;
return SkeletonMesh;
}(THREE.Object3D));
threejs.SkeletonMesh = SkeletonMesh; threejs.SkeletonMesh = SkeletonMesh;
})(threejs = spine.threejs || (spine.threejs = {})); })(threejs = spine.threejs || (spine.threejs = {}));
})(spine || (spine = {})); })(spine || (spine = {}));

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

File diff suppressed because one or more lines are too long

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

@ -589,9 +589,6 @@ declare module spine {
ChainScale = 2, ChainScale = 2,
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
class SharedAssetManager implements Disposable { class SharedAssetManager implements Disposable {
private pathPrefix; private pathPrefix;
@ -1000,6 +997,7 @@ declare module spine {
static newShortArray(size: number): ArrayLike<number>; static newShortArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): number[] | Float32Array; static toFloatArray(array: Array<number>): number[] | Float32Array;
static toSinglePrecision(value: number): number; static toSinglePrecision(value: number): number;
static webkit602BugfixHelper(alpha: number, pose: MixPose): void;
} }
class DebugUtils { class DebugUtils {
static logBones(skeleton: Skeleton): void; static logBones(skeleton: Skeleton): void;
@ -1054,6 +1052,9 @@ declare module spine {
end(): void; end(): void;
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
abstract class Attachment { abstract class Attachment {
name: string; name: string;

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

@ -162,12 +162,12 @@ var spine;
var y = curves[i - 1]; var y = curves[i - 1];
return y + (1 - y) * (percent - x) / (1 - x); return y + (1 - y) * (percent - x) / (1 - x);
}; };
return CurveTimeline;
}());
CurveTimeline.LINEAR = 0; CurveTimeline.LINEAR = 0;
CurveTimeline.STEPPED = 1; CurveTimeline.STEPPED = 1;
CurveTimeline.BEZIER = 2; CurveTimeline.BEZIER = 2;
CurveTimeline.BEZIER_SIZE = 10 * 2 - 1; CurveTimeline.BEZIER_SIZE = 10 * 2 - 1;
return CurveTimeline;
}());
spine.CurveTimeline = CurveTimeline; spine.CurveTimeline = CurveTimeline;
var RotateTimeline = (function (_super) { var RotateTimeline = (function (_super) {
__extends(RotateTimeline, _super); __extends(RotateTimeline, _super);
@ -226,12 +226,12 @@ var spine;
bone.rotation += r * alpha; bone.rotation += r * alpha;
} }
}; };
return RotateTimeline;
}(CurveTimeline));
RotateTimeline.ENTRIES = 2; RotateTimeline.ENTRIES = 2;
RotateTimeline.PREV_TIME = -2; RotateTimeline.PREV_TIME = -2;
RotateTimeline.PREV_ROTATION = -1; RotateTimeline.PREV_ROTATION = -1;
RotateTimeline.ROTATION = 1; RotateTimeline.ROTATION = 1;
return RotateTimeline;
}(CurveTimeline));
spine.RotateTimeline = RotateTimeline; spine.RotateTimeline = RotateTimeline;
var TranslateTimeline = (function (_super) { var TranslateTimeline = (function (_super) {
__extends(TranslateTimeline, _super); __extends(TranslateTimeline, _super);
@ -287,14 +287,14 @@ var spine;
bone.y += (bone.data.y + y - bone.y) * alpha; bone.y += (bone.data.y + y - bone.y) * alpha;
} }
}; };
return TranslateTimeline;
}(CurveTimeline));
TranslateTimeline.ENTRIES = 3; TranslateTimeline.ENTRIES = 3;
TranslateTimeline.PREV_TIME = -3; TranslateTimeline.PREV_TIME = -3;
TranslateTimeline.PREV_X = -2; TranslateTimeline.PREV_X = -2;
TranslateTimeline.PREV_Y = -1; TranslateTimeline.PREV_Y = -1;
TranslateTimeline.X = 1; TranslateTimeline.X = 1;
TranslateTimeline.Y = 2; TranslateTimeline.Y = 2;
return TranslateTimeline;
}(CurveTimeline));
spine.TranslateTimeline = TranslateTimeline; spine.TranslateTimeline = TranslateTimeline;
var ScaleTimeline = (function (_super) { var ScaleTimeline = (function (_super) {
__extends(ScaleTimeline, _super); __extends(ScaleTimeline, _super);
@ -473,8 +473,6 @@ var spine;
color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha); color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha);
} }
}; };
return ColorTimeline;
}(CurveTimeline));
ColorTimeline.ENTRIES = 5; ColorTimeline.ENTRIES = 5;
ColorTimeline.PREV_TIME = -5; ColorTimeline.PREV_TIME = -5;
ColorTimeline.PREV_R = -4; ColorTimeline.PREV_R = -4;
@ -485,6 +483,8 @@ var spine;
ColorTimeline.G = 2; ColorTimeline.G = 2;
ColorTimeline.B = 3; ColorTimeline.B = 3;
ColorTimeline.A = 4; ColorTimeline.A = 4;
return ColorTimeline;
}(CurveTimeline));
spine.ColorTimeline = ColorTimeline; spine.ColorTimeline = ColorTimeline;
var TwoColorTimeline = (function (_super) { var TwoColorTimeline = (function (_super) {
__extends(TwoColorTimeline, _super); __extends(TwoColorTimeline, _super);
@ -567,8 +567,6 @@ var spine;
dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0); dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0);
} }
}; };
return TwoColorTimeline;
}(CurveTimeline));
TwoColorTimeline.ENTRIES = 8; TwoColorTimeline.ENTRIES = 8;
TwoColorTimeline.PREV_TIME = -8; TwoColorTimeline.PREV_TIME = -8;
TwoColorTimeline.PREV_R = -7; TwoColorTimeline.PREV_R = -7;
@ -585,6 +583,8 @@ var spine;
TwoColorTimeline.R2 = 5; TwoColorTimeline.R2 = 5;
TwoColorTimeline.G2 = 6; TwoColorTimeline.G2 = 6;
TwoColorTimeline.B2 = 7; TwoColorTimeline.B2 = 7;
return TwoColorTimeline;
}(CurveTimeline));
spine.TwoColorTimeline = TwoColorTimeline; spine.TwoColorTimeline = TwoColorTimeline;
var AttachmentTimeline = (function () { var AttachmentTimeline = (function () {
function AttachmentTimeline(frameCount) { function AttachmentTimeline(frameCount) {
@ -893,14 +893,14 @@ var spine;
constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION]; constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
} }
}; };
return IkConstraintTimeline;
}(CurveTimeline));
IkConstraintTimeline.ENTRIES = 3; IkConstraintTimeline.ENTRIES = 3;
IkConstraintTimeline.PREV_TIME = -3; IkConstraintTimeline.PREV_TIME = -3;
IkConstraintTimeline.PREV_MIX = -2; IkConstraintTimeline.PREV_MIX = -2;
IkConstraintTimeline.PREV_BEND_DIRECTION = -1; IkConstraintTimeline.PREV_BEND_DIRECTION = -1;
IkConstraintTimeline.MIX = 1; IkConstraintTimeline.MIX = 1;
IkConstraintTimeline.BEND_DIRECTION = 2; IkConstraintTimeline.BEND_DIRECTION = 2;
return IkConstraintTimeline;
}(CurveTimeline));
spine.IkConstraintTimeline = IkConstraintTimeline; spine.IkConstraintTimeline = IkConstraintTimeline;
var TransformConstraintTimeline = (function (_super) { var TransformConstraintTimeline = (function (_super) {
__extends(TransformConstraintTimeline, _super); __extends(TransformConstraintTimeline, _super);
@ -975,8 +975,6 @@ var spine;
constraint.shearMix += (shear - constraint.shearMix) * alpha; constraint.shearMix += (shear - constraint.shearMix) * alpha;
} }
}; };
return TransformConstraintTimeline;
}(CurveTimeline));
TransformConstraintTimeline.ENTRIES = 5; TransformConstraintTimeline.ENTRIES = 5;
TransformConstraintTimeline.PREV_TIME = -5; TransformConstraintTimeline.PREV_TIME = -5;
TransformConstraintTimeline.PREV_ROTATE = -4; TransformConstraintTimeline.PREV_ROTATE = -4;
@ -987,6 +985,8 @@ var spine;
TransformConstraintTimeline.TRANSLATE = 2; TransformConstraintTimeline.TRANSLATE = 2;
TransformConstraintTimeline.SCALE = 3; TransformConstraintTimeline.SCALE = 3;
TransformConstraintTimeline.SHEAR = 4; TransformConstraintTimeline.SHEAR = 4;
return TransformConstraintTimeline;
}(CurveTimeline));
spine.TransformConstraintTimeline = TransformConstraintTimeline; spine.TransformConstraintTimeline = TransformConstraintTimeline;
var PathConstraintPositionTimeline = (function (_super) { var PathConstraintPositionTimeline = (function (_super) {
__extends(PathConstraintPositionTimeline, _super); __extends(PathConstraintPositionTimeline, _super);
@ -1031,12 +1031,12 @@ var spine;
else else
constraint.position += (position - constraint.position) * alpha; constraint.position += (position - constraint.position) * alpha;
}; };
return PathConstraintPositionTimeline;
}(CurveTimeline));
PathConstraintPositionTimeline.ENTRIES = 2; PathConstraintPositionTimeline.ENTRIES = 2;
PathConstraintPositionTimeline.PREV_TIME = -2; PathConstraintPositionTimeline.PREV_TIME = -2;
PathConstraintPositionTimeline.PREV_VALUE = -1; PathConstraintPositionTimeline.PREV_VALUE = -1;
PathConstraintPositionTimeline.VALUE = 1; PathConstraintPositionTimeline.VALUE = 1;
return PathConstraintPositionTimeline;
}(CurveTimeline));
spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline; spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline;
var PathConstraintSpacingTimeline = (function (_super) { var PathConstraintSpacingTimeline = (function (_super) {
__extends(PathConstraintSpacingTimeline, _super); __extends(PathConstraintSpacingTimeline, _super);
@ -1131,14 +1131,14 @@ var spine;
constraint.translateMix += (translate - constraint.translateMix) * alpha; constraint.translateMix += (translate - constraint.translateMix) * alpha;
} }
}; };
return PathConstraintMixTimeline;
}(CurveTimeline));
PathConstraintMixTimeline.ENTRIES = 3; PathConstraintMixTimeline.ENTRIES = 3;
PathConstraintMixTimeline.PREV_TIME = -3; PathConstraintMixTimeline.PREV_TIME = -3;
PathConstraintMixTimeline.PREV_ROTATE = -2; PathConstraintMixTimeline.PREV_ROTATE = -2;
PathConstraintMixTimeline.PREV_TRANSLATE = -1; PathConstraintMixTimeline.PREV_TRANSLATE = -1;
PathConstraintMixTimeline.ROTATE = 1; PathConstraintMixTimeline.ROTATE = 1;
PathConstraintMixTimeline.TRANSLATE = 2; PathConstraintMixTimeline.TRANSLATE = 2;
return PathConstraintMixTimeline;
}(CurveTimeline));
spine.PathConstraintMixTimeline = PathConstraintMixTimeline; spine.PathConstraintMixTimeline = PathConstraintMixTimeline;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -1263,10 +1263,12 @@ var spine;
if (timeline instanceof spine.RotateTimeline) { if (timeline instanceof spine.RotateTimeline) {
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame);
} }
else else {
spine.Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]); timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]);
} }
} }
}
this.queueEvents(current, animationTime); this.queueEvents(current, animationTime);
events.length = 0; events.length = 0;
current.nextAnimationLast = animationTime; current.nextAnimationLast = animationTime;
@ -1333,6 +1335,7 @@ var spine;
if (timeline instanceof spine.RotateTimeline) if (timeline instanceof spine.RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame);
else { else {
spine.Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out); timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out);
} }
} }
@ -1416,10 +1419,13 @@ var spine;
continue; continue;
this.queue.event(entry, event_1); this.queue.event(entry, event_1);
} }
if (entry.loop ? (trackLastWrapped > entry.trackTime % duration) var complete = false;
: (animationTime >= animationEnd && entry.animationLast < animationEnd)) { if (entry.loop)
complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
else
complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
if (complete)
this.queue.complete(entry); this.queue.complete(entry);
}
for (; i < n; i++) { for (; i < n; i++) {
var event_2 = events[i]; var event_2 = events[i];
if (event_2.time < animationStart) if (event_2.time < animationStart)
@ -1631,13 +1637,13 @@ var spine;
AnimationState.prototype.clearListenerNotifications = function () { AnimationState.prototype.clearListenerNotifications = function () {
this.queue.clear(); this.queue.clear();
}; };
return AnimationState;
}());
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.DIP = 2; AnimationState.DIP = 2;
AnimationState.DIP_MIX = 3; AnimationState.DIP_MIX = 3;
return AnimationState;
}());
spine.AnimationState = AnimationState; spine.AnimationState = AnimationState;
var TrackEntry = (function () { var TrackEntry = (function () {
function TrackEntry() { function TrackEntry() {
@ -3058,12 +3064,12 @@ var spine;
PathConstraint.prototype.getOrder = function () { PathConstraint.prototype.getOrder = function () {
return this.data.order; return this.data.order;
}; };
return PathConstraint;
}());
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001; PathConstraint.epsilon = 0.00001;
return PathConstraint;
}());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -3095,15 +3101,6 @@ var spine;
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale"; RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
})(RotateMode = spine.RotateMode || (spine.RotateMode = {})); })(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Assets = (function () { var Assets = (function () {
@ -5874,13 +5871,13 @@ var spine;
this.a = 1; this.a = 1;
return this; return this;
}; };
return Color;
}());
Color.WHITE = new Color(1, 1, 1, 1); Color.WHITE = new Color(1, 1, 1, 1);
Color.RED = new Color(1, 0, 0, 1); Color.RED = new Color(1, 0, 0, 1);
Color.GREEN = new Color(0, 1, 0, 1); Color.GREEN = new Color(0, 1, 0, 1);
Color.BLUE = new Color(0, 0, 1, 1); Color.BLUE = new Color(0, 0, 1, 1);
Color.MAGENTA = new Color(1, 0, 1, 1); Color.MAGENTA = new Color(1, 0, 1, 1);
return Color;
}());
spine.Color = Color; spine.Color = Color;
var MathUtils = (function () { var MathUtils = (function () {
function MathUtils() { function MathUtils() {
@ -5918,14 +5915,14 @@ var spine;
return min + Math.sqrt(u * d * (mode - min)); return min + Math.sqrt(u * d * (mode - min));
return max - Math.sqrt((1 - u) * d * (max - mode)); return max - Math.sqrt((1 - u) * d * (max - mode));
}; };
return MathUtils;
}());
MathUtils.PI = 3.1415927; MathUtils.PI = 3.1415927;
MathUtils.PI2 = MathUtils.PI * 2; MathUtils.PI2 = MathUtils.PI * 2;
MathUtils.radiansToDegrees = 180 / MathUtils.PI; MathUtils.radiansToDegrees = 180 / MathUtils.PI;
MathUtils.radDeg = MathUtils.radiansToDegrees; MathUtils.radDeg = MathUtils.radiansToDegrees;
MathUtils.degreesToRadians = MathUtils.PI / 180; MathUtils.degreesToRadians = MathUtils.PI / 180;
MathUtils.degRad = MathUtils.degreesToRadians; MathUtils.degRad = MathUtils.degreesToRadians;
return MathUtils;
}());
spine.MathUtils = MathUtils; spine.MathUtils = MathUtils;
var Interpolation = (function () { var Interpolation = (function () {
function Interpolation() { function Interpolation() {
@ -6023,9 +6020,11 @@ var spine;
Utils.toSinglePrecision = function (value) { Utils.toSinglePrecision = function (value) {
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value; return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
}; };
Utils.webkit602BugfixHelper = function (alpha, pose) {
};
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
return Utils; return Utils;
}()); }());
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
spine.Utils = Utils; spine.Utils = Utils;
var DebugUtils = (function () { var DebugUtils = (function () {
function DebugUtils() { function DebugUtils() {
@ -6161,6 +6160,15 @@ var spine;
}()); }());
spine.WindowedMean = WindowedMean; spine.WindowedMean = WindowedMean;
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Attachment = (function () { var Attachment = (function () {
@ -6242,9 +6250,9 @@ var spine;
VertexAttachment.prototype.applyDeform = function (sourceAttachment) { VertexAttachment.prototype.applyDeform = function (sourceAttachment) {
return this == sourceAttachment; return this == sourceAttachment;
}; };
VertexAttachment.nextID = 0;
return VertexAttachment; return VertexAttachment;
}(Attachment)); }(Attachment));
VertexAttachment.nextID = 0;
spine.VertexAttachment = VertexAttachment; spine.VertexAttachment = VertexAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6482,8 +6490,6 @@ var spine;
worldVertices[offset] = offsetX * a + offsetY * b + x; worldVertices[offset] = offsetX * a + offsetY * b + x;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
return RegionAttachment;
}(spine.Attachment));
RegionAttachment.OX1 = 0; RegionAttachment.OX1 = 0;
RegionAttachment.OY1 = 1; RegionAttachment.OY1 = 1;
RegionAttachment.OX2 = 2; RegionAttachment.OX2 = 2;
@ -6524,6 +6530,8 @@ var spine;
RegionAttachment.C4A = 29; RegionAttachment.C4A = 29;
RegionAttachment.U4 = 30; RegionAttachment.U4 = 30;
RegionAttachment.V4 = 31; RegionAttachment.V4 = 31;
return RegionAttachment;
}(spine.Attachment));
spine.RegionAttachment = RegionAttachment; spine.RegionAttachment = RegionAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6578,9 +6586,9 @@ var spine;
}; };
SwirlEffect.prototype.end = function () { SwirlEffect.prototype.end = function () {
}; };
SwirlEffect.interpolation = new spine.PowOut(2);
return SwirlEffect; return SwirlEffect;
}()); }());
SwirlEffect.interpolation = new spine.PowOut(2);
spine.SwirlEffect = SwirlEffect; spine.SwirlEffect = SwirlEffect;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6993,14 +7001,14 @@ var spine;
renderer.end(); renderer.end();
renderer.camera.position.set(oldX, oldY, 0); renderer.camera.position.set(oldX, oldY, 0);
}; };
return LoadingScreen;
}());
LoadingScreen.FADE_SECONDS = 1; LoadingScreen.FADE_SECONDS = 1;
LoadingScreen.loaded = 0; LoadingScreen.loaded = 0;
LoadingScreen.spinnerImg = null; LoadingScreen.spinnerImg = null;
LoadingScreen.logoImg = null; LoadingScreen.logoImg = null;
LoadingScreen.SPINNER_DATA = "data:image/png;base64,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"; LoadingScreen.SPINNER_DATA = "data:image/png;base64,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";
LoadingScreen.SPINE_LOGO_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFIAAAAZCAYAAACis3k0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtNJREFUaN7tmT2I1EAUxwN+oWgRT0HFKo0WCkJ6ObmAWFwZbCxsXGysLNJaiCyIoDaSwk4ETzvhmnBaCRbBWoQ01ho4PwotjP8cE337mMy8TLK757mBH3fLTWbe/PbN53neNniqZW8FvAVvQAqugwvgDDgO9niLRyTyJagM/ACPF6bsIl9ZRDac/Cc6tLn5xQdRQ496QlKPLxD5QCDxO9jtGM8QfYoIgUlgCipGCRJL5VvlyOdCU09iEXkCfLSIfCrs7Fab6nOsiafu06iDwES9w/uU1QnDC+ekkVS9vEaDsgVeB0d+z1VDtOGxRaYPboP3Gokb4GgXkZp4chZPJKgvZ3U0XkriK/TIt9YUDllFgTAjGwoaoHqfBhMI58yD4BQ4V6/aHYdfxToftvw9F2SiVroawU2/Cv5C4Thv0KB9S5nxlOd4STxjwUjzSdYlgrYijw2BsEfgsaFcM09lhiys94xXQQwugcvgJrgFLjrEE7WUiTuWCQzt/ZXN7FfqGwuGClyVy2xZAFmfDQvNtwFFSspMDGsD+UTWqu1KoVmVooFEJgKRXw0if85RpISEzwsjzeqWzkjkC4PIJ3MUmQgITAHlQwTFhnZhELkEntfZRwR+AvfAgXmJHOqU02XligWT8ppg67NXbdCXeq7afUQ6L8C2DalEZNt2YyQ94Qy8/ekjMpBMbfyl5iTjG7YAI8cNecROAb4kJmTjaXAF3AGvwQewOiuRxEtlSaT4j2h2lMsUueQEoMlIKpTvAmKhxPMtC876jEX6rE8l8TNx/KVbn6xlWU9NWcSDUsO4NGWpQOTZFpHPOooMXcswmW2XFk3ixb2v0Nq+XVKP00QNaffBLyWwBI/AkTlfMYZDXMf12kc6yjwEjoFdO/5me5oi/6tnyhlZX6OtgmX1c2Uh0k3khmbB2b9TRfpd/jfTUeRDJvHdYg5wE7kPXAN3wQ1weDvH+xufEgpi5qIl3QAAAABJRU5ErkJggg=="; LoadingScreen.SPINE_LOGO_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFIAAAAZCAYAAACis3k0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtNJREFUaN7tmT2I1EAUxwN+oWgRT0HFKo0WCkJ6ObmAWFwZbCxsXGysLNJaiCyIoDaSwk4ETzvhmnBaCRbBWoQ01ho4PwotjP8cE337mMy8TLK757mBH3fLTWbe/PbN53neNniqZW8FvAVvQAqugwvgDDgO9niLRyTyJagM/ACPF6bsIl9ZRDac/Cc6tLn5xQdRQ496QlKPLxD5QCDxO9jtGM8QfYoIgUlgCipGCRJL5VvlyOdCU09iEXkCfLSIfCrs7Fab6nOsiafu06iDwES9w/uU1QnDC+ekkVS9vEaDsgVeB0d+z1VDtOGxRaYPboP3Gokb4GgXkZp4chZPJKgvZ3U0XkriK/TIt9YUDllFgTAjGwoaoHqfBhMI58yD4BQ4V6/aHYdfxToftvw9F2SiVroawU2/Cv5C4Thv0KB9S5nxlOd4STxjwUjzSdYlgrYijw2BsEfgsaFcM09lhiys94xXQQwugcvgJrgFLjrEE7WUiTuWCQzt/ZXN7FfqGwuGClyVy2xZAFmfDQvNtwFFSspMDGsD+UTWqu1KoVmVooFEJgKRXw0if85RpISEzwsjzeqWzkjkC4PIJ3MUmQgITAHlQwTFhnZhELkEntfZRwR+AvfAgXmJHOqU02XligWT8ppg67NXbdCXeq7afUQ6L8C2DalEZNt2YyQ94Qy8/ekjMpBMbfyl5iTjG7YAI8cNecROAb4kJmTjaXAF3AGvwQewOiuRxEtlSaT4j2h2lMsUueQEoMlIKpTvAmKhxPMtC876jEX6rE8l8TNx/KVbn6xlWU9NWcSDUsO4NGWpQOTZFpHPOooMXcswmW2XFk3ixb2v0Nq+XVKP00QNaffBLyWwBI/AkTlfMYZDXMf12kc6yjwEjoFdO/5me5oi/6tnyhlZX6OtgmX1c2Uh0k3khmbB2b9TRfpd/jfTUeRDJvHdYg5wE7kPXAN3wQ1weDvH+xufEgpi5qIl3QAAAABJRU5ErkJggg==";
return LoadingScreen;
}());
webgl.LoadingScreen = LoadingScreen; webgl.LoadingScreen = LoadingScreen;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -7295,12 +7303,12 @@ var spine;
if (Matrix4.zAxis === null) if (Matrix4.zAxis === null)
Matrix4.zAxis = new webgl.Vector3(); Matrix4.zAxis = new webgl.Vector3();
}; };
return Matrix4;
}());
Matrix4.xAxis = null; Matrix4.xAxis = null;
Matrix4.yAxis = null; Matrix4.yAxis = null;
Matrix4.zAxis = null; Matrix4.zAxis = null;
Matrix4.tmpMatrix = new Matrix4(); Matrix4.tmpMatrix = new Matrix4();
return Matrix4;
}());
webgl.Matrix4 = Matrix4; webgl.Matrix4 = Matrix4;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -8214,14 +8222,14 @@ var spine;
var fs = "\n\t\t\t\t#ifdef GL_ES\n\t\t\t\t\t#define LOWP lowp\n\t\t\t\t\tprecision mediump float;\n\t\t\t\t#else\n\t\t\t\t\t#define LOWP\n\t\t\t\t#endif\n\t\t\t\tvarying LOWP vec4 v_color;\n\n\t\t\t\tvoid main () {\n\t\t\t\t\tgl_FragColor = v_color;\n\t\t\t\t}\n\t\t\t"; var fs = "\n\t\t\t\t#ifdef GL_ES\n\t\t\t\t\t#define LOWP lowp\n\t\t\t\t\tprecision mediump float;\n\t\t\t\t#else\n\t\t\t\t\t#define LOWP\n\t\t\t\t#endif\n\t\t\t\tvarying LOWP vec4 v_color;\n\n\t\t\t\tvoid main () {\n\t\t\t\t\tgl_FragColor = v_color;\n\t\t\t\t}\n\t\t\t";
return new Shader(context, vs, fs); return new Shader(context, vs, fs);
}; };
return Shader;
}());
Shader.MVP_MATRIX = "u_projTrans"; Shader.MVP_MATRIX = "u_projTrans";
Shader.POSITION = "a_position"; Shader.POSITION = "a_position";
Shader.COLOR = "a_color"; Shader.COLOR = "a_color";
Shader.COLOR2 = "a_color2"; Shader.COLOR2 = "a_color2";
Shader.TEXCOORDS = "a_texCoords"; Shader.TEXCOORDS = "a_texCoords";
Shader.SAMPLER = "u_texture"; Shader.SAMPLER = "u_texture";
return Shader;
}());
webgl.Shader = Shader; webgl.Shader = Shader;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -8734,10 +8742,10 @@ var spine;
}; };
SkeletonDebugRenderer.prototype.dispose = function () { SkeletonDebugRenderer.prototype.dispose = function () {
}; };
return SkeletonDebugRenderer;
}());
SkeletonDebugRenderer.LIGHT_GRAY = new spine.Color(192 / 255, 192 / 255, 192 / 255, 1); SkeletonDebugRenderer.LIGHT_GRAY = new spine.Color(192 / 255, 192 / 255, 192 / 255, 1);
SkeletonDebugRenderer.GREEN = new spine.Color(0, 1, 0, 1); SkeletonDebugRenderer.GREEN = new spine.Color(0, 1, 0, 1);
return SkeletonDebugRenderer;
}());
webgl.SkeletonDebugRenderer = SkeletonDebugRenderer; webgl.SkeletonDebugRenderer = SkeletonDebugRenderer;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9006,9 +9014,9 @@ var spine;
} }
clipper.clipEnd(); clipper.clipEnd();
}; };
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
return SkeletonRenderer; return SkeletonRenderer;
}()); }());
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
webgl.SkeletonRenderer = SkeletonRenderer; webgl.SkeletonRenderer = SkeletonRenderer;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9160,8 +9168,6 @@ var spine;
default: throw new Error("Unknown blend mode: " + blendMode); default: throw new Error("Unknown blend mode: " + blendMode);
} }
}; };
return WebGLBlendModeConverter;
}());
WebGLBlendModeConverter.ZERO = 0; WebGLBlendModeConverter.ZERO = 0;
WebGLBlendModeConverter.ONE = 1; WebGLBlendModeConverter.ONE = 1;
WebGLBlendModeConverter.SRC_COLOR = 0x0300; WebGLBlendModeConverter.SRC_COLOR = 0x0300;
@ -9171,6 +9177,8 @@ var spine;
WebGLBlendModeConverter.DST_ALPHA = 0x0304; WebGLBlendModeConverter.DST_ALPHA = 0x0304;
WebGLBlendModeConverter.ONE_MINUS_DST_ALPHA = 0x0305; WebGLBlendModeConverter.ONE_MINUS_DST_ALPHA = 0x0305;
WebGLBlendModeConverter.DST_COLOR = 0x0306; WebGLBlendModeConverter.DST_COLOR = 0x0306;
return WebGLBlendModeConverter;
}());
webgl.WebGLBlendModeConverter = WebGLBlendModeConverter; webgl.WebGLBlendModeConverter = WebGLBlendModeConverter;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));

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

File diff suppressed because one or more lines are too long

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

@ -589,9 +589,6 @@ declare module spine {
ChainScale = 2, ChainScale = 2,
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
class SharedAssetManager implements Disposable { class SharedAssetManager implements Disposable {
private pathPrefix; private pathPrefix;
@ -1000,6 +997,7 @@ declare module spine {
static newShortArray(size: number): ArrayLike<number>; static newShortArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): number[] | Float32Array; static toFloatArray(array: Array<number>): number[] | Float32Array;
static toSinglePrecision(value: number): number; static toSinglePrecision(value: number): number;
static webkit602BugfixHelper(alpha: number, pose: MixPose): void;
} }
class DebugUtils { class DebugUtils {
static logBones(skeleton: Skeleton): void; static logBones(skeleton: Skeleton): void;
@ -1054,6 +1052,9 @@ declare module spine {
end(): void; end(): void;
} }
} }
interface Math {
fround(n: number): number;
}
declare module spine { declare module spine {
abstract class Attachment { abstract class Attachment {
name: string; name: string;

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

@ -162,12 +162,12 @@ var spine;
var y = curves[i - 1]; var y = curves[i - 1];
return y + (1 - y) * (percent - x) / (1 - x); return y + (1 - y) * (percent - x) / (1 - x);
}; };
return CurveTimeline;
}());
CurveTimeline.LINEAR = 0; CurveTimeline.LINEAR = 0;
CurveTimeline.STEPPED = 1; CurveTimeline.STEPPED = 1;
CurveTimeline.BEZIER = 2; CurveTimeline.BEZIER = 2;
CurveTimeline.BEZIER_SIZE = 10 * 2 - 1; CurveTimeline.BEZIER_SIZE = 10 * 2 - 1;
return CurveTimeline;
}());
spine.CurveTimeline = CurveTimeline; spine.CurveTimeline = CurveTimeline;
var RotateTimeline = (function (_super) { var RotateTimeline = (function (_super) {
__extends(RotateTimeline, _super); __extends(RotateTimeline, _super);
@ -226,12 +226,12 @@ var spine;
bone.rotation += r * alpha; bone.rotation += r * alpha;
} }
}; };
return RotateTimeline;
}(CurveTimeline));
RotateTimeline.ENTRIES = 2; RotateTimeline.ENTRIES = 2;
RotateTimeline.PREV_TIME = -2; RotateTimeline.PREV_TIME = -2;
RotateTimeline.PREV_ROTATION = -1; RotateTimeline.PREV_ROTATION = -1;
RotateTimeline.ROTATION = 1; RotateTimeline.ROTATION = 1;
return RotateTimeline;
}(CurveTimeline));
spine.RotateTimeline = RotateTimeline; spine.RotateTimeline = RotateTimeline;
var TranslateTimeline = (function (_super) { var TranslateTimeline = (function (_super) {
__extends(TranslateTimeline, _super); __extends(TranslateTimeline, _super);
@ -287,14 +287,14 @@ var spine;
bone.y += (bone.data.y + y - bone.y) * alpha; bone.y += (bone.data.y + y - bone.y) * alpha;
} }
}; };
return TranslateTimeline;
}(CurveTimeline));
TranslateTimeline.ENTRIES = 3; TranslateTimeline.ENTRIES = 3;
TranslateTimeline.PREV_TIME = -3; TranslateTimeline.PREV_TIME = -3;
TranslateTimeline.PREV_X = -2; TranslateTimeline.PREV_X = -2;
TranslateTimeline.PREV_Y = -1; TranslateTimeline.PREV_Y = -1;
TranslateTimeline.X = 1; TranslateTimeline.X = 1;
TranslateTimeline.Y = 2; TranslateTimeline.Y = 2;
return TranslateTimeline;
}(CurveTimeline));
spine.TranslateTimeline = TranslateTimeline; spine.TranslateTimeline = TranslateTimeline;
var ScaleTimeline = (function (_super) { var ScaleTimeline = (function (_super) {
__extends(ScaleTimeline, _super); __extends(ScaleTimeline, _super);
@ -473,8 +473,6 @@ var spine;
color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha); color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha);
} }
}; };
return ColorTimeline;
}(CurveTimeline));
ColorTimeline.ENTRIES = 5; ColorTimeline.ENTRIES = 5;
ColorTimeline.PREV_TIME = -5; ColorTimeline.PREV_TIME = -5;
ColorTimeline.PREV_R = -4; ColorTimeline.PREV_R = -4;
@ -485,6 +483,8 @@ var spine;
ColorTimeline.G = 2; ColorTimeline.G = 2;
ColorTimeline.B = 3; ColorTimeline.B = 3;
ColorTimeline.A = 4; ColorTimeline.A = 4;
return ColorTimeline;
}(CurveTimeline));
spine.ColorTimeline = ColorTimeline; spine.ColorTimeline = ColorTimeline;
var TwoColorTimeline = (function (_super) { var TwoColorTimeline = (function (_super) {
__extends(TwoColorTimeline, _super); __extends(TwoColorTimeline, _super);
@ -567,8 +567,6 @@ var spine;
dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0); dark.add((r2 - dark.r) * alpha, (g2 - dark.g) * alpha, (b2 - dark.b) * alpha, 0);
} }
}; };
return TwoColorTimeline;
}(CurveTimeline));
TwoColorTimeline.ENTRIES = 8; TwoColorTimeline.ENTRIES = 8;
TwoColorTimeline.PREV_TIME = -8; TwoColorTimeline.PREV_TIME = -8;
TwoColorTimeline.PREV_R = -7; TwoColorTimeline.PREV_R = -7;
@ -585,6 +583,8 @@ var spine;
TwoColorTimeline.R2 = 5; TwoColorTimeline.R2 = 5;
TwoColorTimeline.G2 = 6; TwoColorTimeline.G2 = 6;
TwoColorTimeline.B2 = 7; TwoColorTimeline.B2 = 7;
return TwoColorTimeline;
}(CurveTimeline));
spine.TwoColorTimeline = TwoColorTimeline; spine.TwoColorTimeline = TwoColorTimeline;
var AttachmentTimeline = (function () { var AttachmentTimeline = (function () {
function AttachmentTimeline(frameCount) { function AttachmentTimeline(frameCount) {
@ -893,14 +893,14 @@ var spine;
constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION]; constraint.bendDirection = frames[frame + IkConstraintTimeline.PREV_BEND_DIRECTION];
} }
}; };
return IkConstraintTimeline;
}(CurveTimeline));
IkConstraintTimeline.ENTRIES = 3; IkConstraintTimeline.ENTRIES = 3;
IkConstraintTimeline.PREV_TIME = -3; IkConstraintTimeline.PREV_TIME = -3;
IkConstraintTimeline.PREV_MIX = -2; IkConstraintTimeline.PREV_MIX = -2;
IkConstraintTimeline.PREV_BEND_DIRECTION = -1; IkConstraintTimeline.PREV_BEND_DIRECTION = -1;
IkConstraintTimeline.MIX = 1; IkConstraintTimeline.MIX = 1;
IkConstraintTimeline.BEND_DIRECTION = 2; IkConstraintTimeline.BEND_DIRECTION = 2;
return IkConstraintTimeline;
}(CurveTimeline));
spine.IkConstraintTimeline = IkConstraintTimeline; spine.IkConstraintTimeline = IkConstraintTimeline;
var TransformConstraintTimeline = (function (_super) { var TransformConstraintTimeline = (function (_super) {
__extends(TransformConstraintTimeline, _super); __extends(TransformConstraintTimeline, _super);
@ -975,8 +975,6 @@ var spine;
constraint.shearMix += (shear - constraint.shearMix) * alpha; constraint.shearMix += (shear - constraint.shearMix) * alpha;
} }
}; };
return TransformConstraintTimeline;
}(CurveTimeline));
TransformConstraintTimeline.ENTRIES = 5; TransformConstraintTimeline.ENTRIES = 5;
TransformConstraintTimeline.PREV_TIME = -5; TransformConstraintTimeline.PREV_TIME = -5;
TransformConstraintTimeline.PREV_ROTATE = -4; TransformConstraintTimeline.PREV_ROTATE = -4;
@ -987,6 +985,8 @@ var spine;
TransformConstraintTimeline.TRANSLATE = 2; TransformConstraintTimeline.TRANSLATE = 2;
TransformConstraintTimeline.SCALE = 3; TransformConstraintTimeline.SCALE = 3;
TransformConstraintTimeline.SHEAR = 4; TransformConstraintTimeline.SHEAR = 4;
return TransformConstraintTimeline;
}(CurveTimeline));
spine.TransformConstraintTimeline = TransformConstraintTimeline; spine.TransformConstraintTimeline = TransformConstraintTimeline;
var PathConstraintPositionTimeline = (function (_super) { var PathConstraintPositionTimeline = (function (_super) {
__extends(PathConstraintPositionTimeline, _super); __extends(PathConstraintPositionTimeline, _super);
@ -1031,12 +1031,12 @@ var spine;
else else
constraint.position += (position - constraint.position) * alpha; constraint.position += (position - constraint.position) * alpha;
}; };
return PathConstraintPositionTimeline;
}(CurveTimeline));
PathConstraintPositionTimeline.ENTRIES = 2; PathConstraintPositionTimeline.ENTRIES = 2;
PathConstraintPositionTimeline.PREV_TIME = -2; PathConstraintPositionTimeline.PREV_TIME = -2;
PathConstraintPositionTimeline.PREV_VALUE = -1; PathConstraintPositionTimeline.PREV_VALUE = -1;
PathConstraintPositionTimeline.VALUE = 1; PathConstraintPositionTimeline.VALUE = 1;
return PathConstraintPositionTimeline;
}(CurveTimeline));
spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline; spine.PathConstraintPositionTimeline = PathConstraintPositionTimeline;
var PathConstraintSpacingTimeline = (function (_super) { var PathConstraintSpacingTimeline = (function (_super) {
__extends(PathConstraintSpacingTimeline, _super); __extends(PathConstraintSpacingTimeline, _super);
@ -1131,14 +1131,14 @@ var spine;
constraint.translateMix += (translate - constraint.translateMix) * alpha; constraint.translateMix += (translate - constraint.translateMix) * alpha;
} }
}; };
return PathConstraintMixTimeline;
}(CurveTimeline));
PathConstraintMixTimeline.ENTRIES = 3; PathConstraintMixTimeline.ENTRIES = 3;
PathConstraintMixTimeline.PREV_TIME = -3; PathConstraintMixTimeline.PREV_TIME = -3;
PathConstraintMixTimeline.PREV_ROTATE = -2; PathConstraintMixTimeline.PREV_ROTATE = -2;
PathConstraintMixTimeline.PREV_TRANSLATE = -1; PathConstraintMixTimeline.PREV_TRANSLATE = -1;
PathConstraintMixTimeline.ROTATE = 1; PathConstraintMixTimeline.ROTATE = 1;
PathConstraintMixTimeline.TRANSLATE = 2; PathConstraintMixTimeline.TRANSLATE = 2;
return PathConstraintMixTimeline;
}(CurveTimeline));
spine.PathConstraintMixTimeline = PathConstraintMixTimeline; spine.PathConstraintMixTimeline = PathConstraintMixTimeline;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -1263,10 +1263,12 @@ var spine;
if (timeline instanceof spine.RotateTimeline) { if (timeline instanceof spine.RotateTimeline) {
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, mix, pose, timelinesRotation, ii << 1, firstFrame);
} }
else else {
spine.Utils.webkit602BugfixHelper(mix, pose);
timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]); timeline.apply(skeleton, animationLast, animationTime, events, mix, pose, spine.MixDirection["in"]);
} }
} }
}
this.queueEvents(current, animationTime); this.queueEvents(current, animationTime);
events.length = 0; events.length = 0;
current.nextAnimationLast = animationTime; current.nextAnimationLast = animationTime;
@ -1333,6 +1335,7 @@ var spine;
if (timeline instanceof spine.RotateTimeline) if (timeline instanceof spine.RotateTimeline)
this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame); this.applyRotateTimeline(timeline, skeleton, animationTime, alpha, pose, timelinesRotation, i << 1, firstFrame);
else { else {
spine.Utils.webkit602BugfixHelper(alpha, pose);
timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out); timeline.apply(skeleton, animationLast, animationTime, events, alpha, pose, spine.MixDirection.out);
} }
} }
@ -1416,10 +1419,13 @@ var spine;
continue; continue;
this.queue.event(entry, event_1); this.queue.event(entry, event_1);
} }
if (entry.loop ? (trackLastWrapped > entry.trackTime % duration) var complete = false;
: (animationTime >= animationEnd && entry.animationLast < animationEnd)) { if (entry.loop)
complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
else
complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
if (complete)
this.queue.complete(entry); this.queue.complete(entry);
}
for (; i < n; i++) { for (; i < n; i++) {
var event_2 = events[i]; var event_2 = events[i];
if (event_2.time < animationStart) if (event_2.time < animationStart)
@ -1631,13 +1637,13 @@ var spine;
AnimationState.prototype.clearListenerNotifications = function () { AnimationState.prototype.clearListenerNotifications = function () {
this.queue.clear(); this.queue.clear();
}; };
return AnimationState;
}());
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.DIP = 2; AnimationState.DIP = 2;
AnimationState.DIP_MIX = 3; AnimationState.DIP_MIX = 3;
return AnimationState;
}());
spine.AnimationState = AnimationState; spine.AnimationState = AnimationState;
var TrackEntry = (function () { var TrackEntry = (function () {
function TrackEntry() { function TrackEntry() {
@ -3058,12 +3064,12 @@ var spine;
PathConstraint.prototype.getOrder = function () { PathConstraint.prototype.getOrder = function () {
return this.data.order; return this.data.order;
}; };
return PathConstraint;
}());
PathConstraint.NONE = -1; PathConstraint.NONE = -1;
PathConstraint.BEFORE = -2; PathConstraint.BEFORE = -2;
PathConstraint.AFTER = -3; PathConstraint.AFTER = -3;
PathConstraint.epsilon = 0.00001; PathConstraint.epsilon = 0.00001;
return PathConstraint;
}());
spine.PathConstraint = PathConstraint; spine.PathConstraint = PathConstraint;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -3095,15 +3101,6 @@ var spine;
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale"; RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
})(RotateMode = spine.RotateMode || (spine.RotateMode = {})); })(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Assets = (function () { var Assets = (function () {
@ -5874,13 +5871,13 @@ var spine;
this.a = 1; this.a = 1;
return this; return this;
}; };
return Color;
}());
Color.WHITE = new Color(1, 1, 1, 1); Color.WHITE = new Color(1, 1, 1, 1);
Color.RED = new Color(1, 0, 0, 1); Color.RED = new Color(1, 0, 0, 1);
Color.GREEN = new Color(0, 1, 0, 1); Color.GREEN = new Color(0, 1, 0, 1);
Color.BLUE = new Color(0, 0, 1, 1); Color.BLUE = new Color(0, 0, 1, 1);
Color.MAGENTA = new Color(1, 0, 1, 1); Color.MAGENTA = new Color(1, 0, 1, 1);
return Color;
}());
spine.Color = Color; spine.Color = Color;
var MathUtils = (function () { var MathUtils = (function () {
function MathUtils() { function MathUtils() {
@ -5918,14 +5915,14 @@ var spine;
return min + Math.sqrt(u * d * (mode - min)); return min + Math.sqrt(u * d * (mode - min));
return max - Math.sqrt((1 - u) * d * (max - mode)); return max - Math.sqrt((1 - u) * d * (max - mode));
}; };
return MathUtils;
}());
MathUtils.PI = 3.1415927; MathUtils.PI = 3.1415927;
MathUtils.PI2 = MathUtils.PI * 2; MathUtils.PI2 = MathUtils.PI * 2;
MathUtils.radiansToDegrees = 180 / MathUtils.PI; MathUtils.radiansToDegrees = 180 / MathUtils.PI;
MathUtils.radDeg = MathUtils.radiansToDegrees; MathUtils.radDeg = MathUtils.radiansToDegrees;
MathUtils.degreesToRadians = MathUtils.PI / 180; MathUtils.degreesToRadians = MathUtils.PI / 180;
MathUtils.degRad = MathUtils.degreesToRadians; MathUtils.degRad = MathUtils.degreesToRadians;
return MathUtils;
}());
spine.MathUtils = MathUtils; spine.MathUtils = MathUtils;
var Interpolation = (function () { var Interpolation = (function () {
function Interpolation() { function Interpolation() {
@ -6023,9 +6020,11 @@ var spine;
Utils.toSinglePrecision = function (value) { Utils.toSinglePrecision = function (value) {
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value; return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
}; };
Utils.webkit602BugfixHelper = function (alpha, pose) {
};
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
return Utils; return Utils;
}()); }());
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
spine.Utils = Utils; spine.Utils = Utils;
var DebugUtils = (function () { var DebugUtils = (function () {
function DebugUtils() { function DebugUtils() {
@ -6161,6 +6160,15 @@ var spine;
}()); }());
spine.WindowedMean = WindowedMean; spine.WindowedMean = WindowedMean;
})(spine || (spine = {})); })(spine || (spine = {}));
(function () {
if (!Math.fround) {
Math.fround = (function (array) {
return function (x) {
return array[0] = x, array[0];
};
})(new Float32Array(1));
}
})();
var spine; var spine;
(function (spine) { (function (spine) {
var Attachment = (function () { var Attachment = (function () {
@ -6242,9 +6250,9 @@ var spine;
VertexAttachment.prototype.applyDeform = function (sourceAttachment) { VertexAttachment.prototype.applyDeform = function (sourceAttachment) {
return this == sourceAttachment; return this == sourceAttachment;
}; };
VertexAttachment.nextID = 0;
return VertexAttachment; return VertexAttachment;
}(Attachment)); }(Attachment));
VertexAttachment.nextID = 0;
spine.VertexAttachment = VertexAttachment; spine.VertexAttachment = VertexAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6482,8 +6490,6 @@ var spine;
worldVertices[offset] = offsetX * a + offsetY * b + x; worldVertices[offset] = offsetX * a + offsetY * b + x;
worldVertices[offset + 1] = offsetX * c + offsetY * d + y; worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
}; };
return RegionAttachment;
}(spine.Attachment));
RegionAttachment.OX1 = 0; RegionAttachment.OX1 = 0;
RegionAttachment.OY1 = 1; RegionAttachment.OY1 = 1;
RegionAttachment.OX2 = 2; RegionAttachment.OX2 = 2;
@ -6524,6 +6530,8 @@ var spine;
RegionAttachment.C4A = 29; RegionAttachment.C4A = 29;
RegionAttachment.U4 = 30; RegionAttachment.U4 = 30;
RegionAttachment.V4 = 31; RegionAttachment.V4 = 31;
return RegionAttachment;
}(spine.Attachment));
spine.RegionAttachment = RegionAttachment; spine.RegionAttachment = RegionAttachment;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6578,9 +6586,9 @@ var spine;
}; };
SwirlEffect.prototype.end = function () { SwirlEffect.prototype.end = function () {
}; };
SwirlEffect.interpolation = new spine.PowOut(2);
return SwirlEffect; return SwirlEffect;
}()); }());
SwirlEffect.interpolation = new spine.PowOut(2);
spine.SwirlEffect = SwirlEffect; spine.SwirlEffect = SwirlEffect;
})(spine || (spine = {})); })(spine || (spine = {}));
var spine; var spine;
@ -6993,14 +7001,14 @@ var spine;
renderer.end(); renderer.end();
renderer.camera.position.set(oldX, oldY, 0); renderer.camera.position.set(oldX, oldY, 0);
}; };
return LoadingScreen;
}());
LoadingScreen.FADE_SECONDS = 1; LoadingScreen.FADE_SECONDS = 1;
LoadingScreen.loaded = 0; LoadingScreen.loaded = 0;
LoadingScreen.spinnerImg = null; LoadingScreen.spinnerImg = null;
LoadingScreen.logoImg = null; LoadingScreen.logoImg = null;
LoadingScreen.SPINNER_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAChCAMAAAB3TUS6AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYNQTFRFAAAA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AA/0AAkTDRyAAAAIB0Uk5TAAABAgMEBQYHCAkKCwwODxAREhMUFRYXGBkaHB0eICEiIyQlJicoKSorLC0uLzAxMjM0Nzg5Ojs8PT4/QEFDRUlKS0xNTk9QUlRWWFlbXF1eYWJjZmhscHF0d3h5e3x+f4CIiYuMj5GSlJWXm56io6arr7rAxcjO0dXe6Onr8fmb5sOOAAADuElEQVQYGe3B+3vTVBwH4M/3nCRt13br2Lozhug2q25gYQubcxqVKYoMCYoKjEsUdSpeiBc0Kl7yp9t2za39pely7PF5zvuiQKc+/e2f8K+f9g2oyQ77Ag4VGX+HketQ0XYYe0JQ0CdhogwF+WFiBgr6JkxUoKCDMMGgoP0w9gdUtB3GfoCKVsPYAVQ0H8YuQUWVMHYGKuJhrAklPQkjJpT0bdj3O9S0FfZ9ADXxP8MjVSiqFfa8B2VVV8+df14QtB4iwn+BpuZEgyM38WMQHDYhnbkgukrIh5ygZ48glyn6KshlL+jbhVRcxCzk0ApiC5CI5kVsgTAy9jiI/WxBGmqIFBMjqwYphwRZaiLNwsjqQdoVSFISGRwjM4OMFUjBRcYCYWT0XZD2SwUS0LzIKCGH2SDja0LxKiJjCrm0gowVFI6aIs1CTouPg5QvUTgSKXMMuVUeBSmEopFITBPGwO8HCYbCTYtImTAWejuI3CMUjmZFT5NjbM/9GvQcMkhADdFRIxxD7aug4wGDFGSVTcLx0MzutQ2CpmmapmmapmmapmmapmmaphWBmGFV6rNNcaLC0GUuv3LROftUo8wJk0a10207sVED6IIf+9673LIwQeW2PaCEJX/A+xYmhTbtQUu46g96SJgQZg9Zwxf+EAMTwuwhm3jkD7EwIdweBn+YhQlh9pA2HvpDTEwIs4es4GN/CMekNOxBJ9D2B10nTAyfW7fT1hjYgZ/xYIUwUcycaiwuv2h3tOcZADr7ud/12c0ru2cWSwQ1UAcixIgImqZpmqZpmqZpmqZpmqZp2v8HMSIcF186t8oghbnlOJt1wnHwl7yOGxwSlHacrjWG8dVuej03OApn7jhHtiyMiZa9yD6haLYTebWOsbDXvQRHwchJWSTkV/rQS+EoWttJaTHkJe56KXcJRZt20jY48nnBy9hE4WjLSbvAkIfwMm5zFG/KyWgRRke3vYwGZDjpZHCMruJltCAFrTtpVYxu1ktzCHKwbSdlGqOreynXGGQpOylljI5uebFbBuSZc2IbhBxmvcj9GiSiZ52+HQO5nPb6TkIqajs9L5eQk7jnddxZgGT0jNOxYSI36+Kdj9oG5OPV6QpB6yJuGAYnqIrecLveYlDUKffIOtREl90+BiWV3cgMlNR0I09DSS030oaSttzILpT0phu5BBWRmyAoiLkJgoIMN8GgoJKb4FBQzU0YUFDdTRhQUNVNcCjIdBMEBdE7buQ8lFRz+97lUFN5fe+qu//aMkeB/gU2ae9y2HgbngAAAABJRU5ErkJggg=="; LoadingScreen.SPINNER_DATA = "data:image/png;base64,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";
LoadingScreen.SPINE_LOGO_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFIAAAAZCAYAAACis3k0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtNJREFUaN7tmT2I1EAUxwN+oWgRT0HFKo0WCkJ6ObmAWFwZbCxsXGysLNJaiCyIoDaSwk4ETzvhmnBaCRbBWoQ01ho4PwotjP8cE337mMy8TLK757mBH3fLTWbe/PbN53neNniqZW8FvAVvQAqugwvgDDgO9niLRyTyJagM/ACPF6bsIl9ZRDac/Cc6tLn5xQdRQ496QlKPLxD5QCDxO9jtGM8QfYoIgUlgCipGCRJL5VvlyOdCU09iEXkCfLSIfCrs7Fab6nOsiafu06iDwES9w/uU1QnDC+ekkVS9vEaDsgVeB0d+z1VDtOGxRaYPboP3Gokb4GgXkZp4chZPJKgvZ3U0XkriK/TIt9YUDllFgTAjGwoaoHqfBhMI58yD4BQ4V6/aHYdfxToftvw9F2SiVroawU2/Cv5C4Thv0KB9S5nxlOd4STxjwUjzSdYlgrYijw2BsEfgsaFcM09lhiys94xXQQwugcvgJrgFLjrEE7WUiTuWCQzt/ZXN7FfqGwuGClyVy2xZAFmfDQvNtwFFSspMDGsD+UTWqu1KoVmVooFEJgKRXw0if85RpISEzwsjzeqWzkjkC4PIJ3MUmQgITAHlQwTFhnZhELkEntfZRwR+AvfAgXmJHOqU02XligWT8ppg67NXbdCXeq7afUQ6L8C2DalEZNt2YyQ94Qy8/ekjMpBMbfyl5iTjG7YAI8cNecROAb4kJmTjaXAF3AGvwQewOiuRxEtlSaT4j2h2lMsUueQEoMlIKpTvAmKhxPMtC876jEX6rE8l8TNx/KVbn6xlWU9NWcSDUsO4NGWpQOTZFpHPOooMXcswmW2XFk3ixb2v0Nq+XVKP00QNaffBLyWwBI/AkTlfMYZDXMf12kc6yjwEjoFdO/5me5oi/6tnyhlZX6OtgmX1c2Uh0k3khmbB2b9TRfpd/jfTUeRDJvHdYg5wE7kPXAN3wQ1weDvH+xufEgpi5qIl3QAAAABJRU5ErkJggg=="; LoadingScreen.SPINE_LOGO_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFIAAAAZCAYAAACis3k0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtNJREFUaN7tmT2I1EAUxwN+oWgRT0HFKo0WCkJ6ObmAWFwZbCxsXGysLNJaiCyIoDaSwk4ETzvhmnBaCRbBWoQ01ho4PwotjP8cE337mMy8TLK757mBH3fLTWbe/PbN53neNniqZW8FvAVvQAqugwvgDDgO9niLRyTyJagM/ACPF6bsIl9ZRDac/Cc6tLn5xQdRQ496QlKPLxD5QCDxO9jtGM8QfYoIgUlgCipGCRJL5VvlyOdCU09iEXkCfLSIfCrs7Fab6nOsiafu06iDwES9w/uU1QnDC+ekkVS9vEaDsgVeB0d+z1VDtOGxRaYPboP3Gokb4GgXkZp4chZPJKgvZ3U0XkriK/TIt9YUDllFgTAjGwoaoHqfBhMI58yD4BQ4V6/aHYdfxToftvw9F2SiVroawU2/Cv5C4Thv0KB9S5nxlOd4STxjwUjzSdYlgrYijw2BsEfgsaFcM09lhiys94xXQQwugcvgJrgFLjrEE7WUiTuWCQzt/ZXN7FfqGwuGClyVy2xZAFmfDQvNtwFFSspMDGsD+UTWqu1KoVmVooFEJgKRXw0if85RpISEzwsjzeqWzkjkC4PIJ3MUmQgITAHlQwTFhnZhELkEntfZRwR+AvfAgXmJHOqU02XligWT8ppg67NXbdCXeq7afUQ6L8C2DalEZNt2YyQ94Qy8/ekjMpBMbfyl5iTjG7YAI8cNecROAb4kJmTjaXAF3AGvwQewOiuRxEtlSaT4j2h2lMsUueQEoMlIKpTvAmKhxPMtC876jEX6rE8l8TNx/KVbn6xlWU9NWcSDUsO4NGWpQOTZFpHPOooMXcswmW2XFk3ixb2v0Nq+XVKP00QNaffBLyWwBI/AkTlfMYZDXMf12kc6yjwEjoFdO/5me5oi/6tnyhlZX6OtgmX1c2Uh0k3khmbB2b9TRfpd/jfTUeRDJvHdYg5wE7kPXAN3wQ1weDvH+xufEgpi5qIl3QAAAABJRU5ErkJggg==";
return LoadingScreen;
}());
webgl.LoadingScreen = LoadingScreen; webgl.LoadingScreen = LoadingScreen;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -7295,12 +7303,12 @@ var spine;
if (Matrix4.zAxis === null) if (Matrix4.zAxis === null)
Matrix4.zAxis = new webgl.Vector3(); Matrix4.zAxis = new webgl.Vector3();
}; };
return Matrix4;
}());
Matrix4.xAxis = null; Matrix4.xAxis = null;
Matrix4.yAxis = null; Matrix4.yAxis = null;
Matrix4.zAxis = null; Matrix4.zAxis = null;
Matrix4.tmpMatrix = new Matrix4(); Matrix4.tmpMatrix = new Matrix4();
return Matrix4;
}());
webgl.Matrix4 = Matrix4; webgl.Matrix4 = Matrix4;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -8214,14 +8222,14 @@ var spine;
var fs = "\n\t\t\t\t#ifdef GL_ES\n\t\t\t\t\t#define LOWP lowp\n\t\t\t\t\tprecision mediump float;\n\t\t\t\t#else\n\t\t\t\t\t#define LOWP\n\t\t\t\t#endif\n\t\t\t\tvarying LOWP vec4 v_color;\n\n\t\t\t\tvoid main () {\n\t\t\t\t\tgl_FragColor = v_color;\n\t\t\t\t}\n\t\t\t"; var fs = "\n\t\t\t\t#ifdef GL_ES\n\t\t\t\t\t#define LOWP lowp\n\t\t\t\t\tprecision mediump float;\n\t\t\t\t#else\n\t\t\t\t\t#define LOWP\n\t\t\t\t#endif\n\t\t\t\tvarying LOWP vec4 v_color;\n\n\t\t\t\tvoid main () {\n\t\t\t\t\tgl_FragColor = v_color;\n\t\t\t\t}\n\t\t\t";
return new Shader(context, vs, fs); return new Shader(context, vs, fs);
}; };
return Shader;
}());
Shader.MVP_MATRIX = "u_projTrans"; Shader.MVP_MATRIX = "u_projTrans";
Shader.POSITION = "a_position"; Shader.POSITION = "a_position";
Shader.COLOR = "a_color"; Shader.COLOR = "a_color";
Shader.COLOR2 = "a_color2"; Shader.COLOR2 = "a_color2";
Shader.TEXCOORDS = "a_texCoords"; Shader.TEXCOORDS = "a_texCoords";
Shader.SAMPLER = "u_texture"; Shader.SAMPLER = "u_texture";
return Shader;
}());
webgl.Shader = Shader; webgl.Shader = Shader;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -8734,10 +8742,10 @@ var spine;
}; };
SkeletonDebugRenderer.prototype.dispose = function () { SkeletonDebugRenderer.prototype.dispose = function () {
}; };
return SkeletonDebugRenderer;
}());
SkeletonDebugRenderer.LIGHT_GRAY = new spine.Color(192 / 255, 192 / 255, 192 / 255, 1); SkeletonDebugRenderer.LIGHT_GRAY = new spine.Color(192 / 255, 192 / 255, 192 / 255, 1);
SkeletonDebugRenderer.GREEN = new spine.Color(0, 1, 0, 1); SkeletonDebugRenderer.GREEN = new spine.Color(0, 1, 0, 1);
return SkeletonDebugRenderer;
}());
webgl.SkeletonDebugRenderer = SkeletonDebugRenderer; webgl.SkeletonDebugRenderer = SkeletonDebugRenderer;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9006,9 +9014,9 @@ var spine;
} }
clipper.clipEnd(); clipper.clipEnd();
}; };
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
return SkeletonRenderer; return SkeletonRenderer;
}()); }());
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
webgl.SkeletonRenderer = SkeletonRenderer; webgl.SkeletonRenderer = SkeletonRenderer;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9160,8 +9168,6 @@ var spine;
default: throw new Error("Unknown blend mode: " + blendMode); default: throw new Error("Unknown blend mode: " + blendMode);
} }
}; };
return WebGLBlendModeConverter;
}());
WebGLBlendModeConverter.ZERO = 0; WebGLBlendModeConverter.ZERO = 0;
WebGLBlendModeConverter.ONE = 1; WebGLBlendModeConverter.ONE = 1;
WebGLBlendModeConverter.SRC_COLOR = 0x0300; WebGLBlendModeConverter.SRC_COLOR = 0x0300;
@ -9171,6 +9177,8 @@ var spine;
WebGLBlendModeConverter.DST_ALPHA = 0x0304; WebGLBlendModeConverter.DST_ALPHA = 0x0304;
WebGLBlendModeConverter.ONE_MINUS_DST_ALPHA = 0x0305; WebGLBlendModeConverter.ONE_MINUS_DST_ALPHA = 0x0305;
WebGLBlendModeConverter.DST_COLOR = 0x0306; WebGLBlendModeConverter.DST_COLOR = 0x0306;
return WebGLBlendModeConverter;
}());
webgl.WebGLBlendModeConverter = WebGLBlendModeConverter; webgl.WebGLBlendModeConverter = WebGLBlendModeConverter;
})(webgl = spine.webgl || (spine.webgl = {})); })(webgl = spine.webgl || (spine.webgl = {}));
})(spine || (spine = {})); })(spine || (spine = {}));
@ -9484,9 +9492,9 @@ var spine;
window.attachEvent("onload", SpineWidget.ready); window.attachEvent("onload", SpineWidget.ready);
} }
}; };
SpineWidget.pageLoaded = false;
return SpineWidget; return SpineWidget;
}()); }());
SpineWidget.pageLoaded = false;
spine.SpineWidget = SpineWidget; spine.SpineWidget = SpineWidget;
var SpineWidgetConfig = (function () { var SpineWidgetConfig = (function () {
function SpineWidgetConfig() { function SpineWidgetConfig() {

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

File diff suppressed because one or more lines are too long

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

@ -341,10 +341,12 @@ module spine {
} }
// Queue complete if completed a loop iteration or the animation. // Queue complete if completed a loop iteration or the animation.
if (entry.loop ? (trackLastWrapped > entry.trackTime % duration) var complete = false;
: (animationTime >= animationEnd && entry.animationLast < animationEnd)) { if (entry.loop)
this.queue.complete(entry); complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
} else
complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
if (complete) this.queue.complete(entry);
// Queue events after complete. // Queue events after complete.
for (; i < n; i++) { for (; i < n; i++) {