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

Merge branch '3.7' into 3.8-beta

Browse Source
This commit is contained in:
badlogic 2019-03-08 16:38:38 +01:00
commit 79123e747d
32 changed files with 480 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,9 +844,9 @@ declare module spine {
originalWidth: number;
originalHeight: number;
}
class FakeTexture extends spine.Texture {
setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter): void;
setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap): void;
class FakeTexture extends Texture {
setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
dispose(): void;
}
}

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

@ -200,17 +200,17 @@ var spine;
return;
}
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) {
var r = frames[frames.length + RotateTimeline.PREV_ROTATION];
var r_2 = frames[frames.length + RotateTimeline.PREV_ROTATION];
switch (blend) {
case MixBlend.setup:
bone.rotation = bone.data.rotation + r * alpha;
bone.rotation = bone.data.rotation + r_2 * alpha;
break;
case MixBlend.first:
case MixBlend.replace:
r += bone.data.rotation - bone.rotation;
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
r_2 += bone.data.rotation - bone.rotation;
r_2 -= (16384 - ((16384.499999999996 - r_2 / 360) | 0)) * 360;
case MixBlend.add:
bone.rotation += r * alpha;
bone.rotation += r_2 * alpha;
}
return;
}
@ -218,7 +218,7 @@ var spine;
var prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
var frameTime = frames[frame];
var percent = this.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
var r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r = prevRotation + (r - (16384 - ((16384.499999999996 - r / 360) | 0)) * 360) * percent;
switch (blend) {
case MixBlend.setup:
@ -738,9 +738,9 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_1 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_1 = 0; i_1 < vertexCount; i_1++) {
vertices[i_1] += lastVertices[i_1] - setupVertices_1[i_1];
vertices[i_1] += lastVertices[i_1] - setupVertices[i_1];
}
}
else {
@ -757,9 +757,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_1 = slotAttachment;
if (vertexAttachment_1.bones == null) {
var setupVertices_2 = vertexAttachment_1.vertices;
var setupVertices = vertexAttachment_1.vertices;
for (var i_3 = 0; i_3 < vertexCount; i_3++) {
var setup = setupVertices_2[i_3];
var setup = setupVertices[i_3];
vertices[i_3] = setup + (lastVertices[i_3] - setup) * alpha;
}
}
@ -776,9 +776,9 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_3 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_6 = 0; i_6 < vertexCount; i_6++) {
vertices[i_6] += (lastVertices[i_6] - setupVertices_3[i_6]) * alpha;
vertices[i_6] += (lastVertices[i_6] - setupVertices[i_6]) * alpha;
}
}
else {
@ -798,10 +798,10 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_4 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_8 = 0; i_8 < vertexCount; i_8++) {
var prev = prevVertices[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices_4[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices[i_8];
}
}
else {
@ -823,9 +823,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_2 = slotAttachment;
if (vertexAttachment_2.bones == null) {
var setupVertices_5 = vertexAttachment_2.vertices;
var setupVertices = vertexAttachment_2.vertices;
for (var i_11 = 0; i_11 < vertexCount; i_11++) {
var prev = prevVertices[i_11], setup = setupVertices_5[i_11];
var prev = prevVertices[i_11], setup = setupVertices[i_11];
vertices[i_11] = setup + (prev + (nextVertices[i_11] - prev) * percent - setup) * alpha;
}
}
@ -847,10 +847,10 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_6 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_14 = 0; i_14 < vertexCount; i_14++) {
var prev = prevVertices[i_14];
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices_6[i_14]) * alpha;
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices[i_14]) * alpha;
}
}
else {
@ -1471,7 +1471,7 @@ var spine;
for (var i = 0; i < timelineCount; i++) {
var timeline = timelines[i];
var direction = spine.MixDirection.out;
var timelineBlend;
var timelineBlend = void 0;
var alpha = 0;
switch (timelineMode[i]) {
case AnimationState.SUBSEQUENT:
@ -1817,9 +1817,9 @@ var spine;
var timelineDipMix = spine.Utils.setArraySize(entry.timelineHoldMix, timelinesCount);
var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) {
for (var i_16 = 0; i_16 < timelinesCount; i_16++) {
propertyIDs.add(timelines[i_16].getPropertyId());
timelineMode[i_16] = AnimationState.HOLD;
for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId());
timelineMode[i] = AnimationState.HOLD;
}
return;
}
@ -2957,17 +2957,17 @@ var spine;
else if (percentSpacing) {
if (scale) {
var x = setupLength * bone.a, y = setupLength * bone.c;
var length = Math.sqrt(x * x + y * y);
lengths[i] = length;
var length_1 = Math.sqrt(x * x + y * y);
lengths[i] = length_1;
}
spaces[++i] = spacing;
}
else {
var x_1 = setupLength * bone.a, y_1 = setupLength * bone.c;
var length_1 = Math.sqrt(x_1 * x_1 + y_1 * y_1);
var x = setupLength * bone.a, y = setupLength * bone.c;
var length_2 = Math.sqrt(x * x + y * y);
if (scale)
lengths[i] = length_1;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
lengths[i] = length_2;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_2 / setupLength;
}
}
}
@ -2989,17 +2989,17 @@ var spine;
var bone = bones[i];
bone.worldX += (boneX - bone.worldX) * translateMix;
bone.worldY += (boneY - bone.worldY) * translateMix;
var x_2 = positions[p], y_2 = positions[p + 1], dx = x_2 - boneX, dy = y_2 - boneY;
var x = positions[p], y = positions[p + 1], dx = x - boneX, dy = y - boneY;
if (scale) {
var length_2 = lengths[i];
if (length_2 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_2 - 1) * rotateMix + 1;
var length_3 = lengths[i];
if (length_3 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_3 - 1) * rotateMix + 1;
bone.a *= s;
bone.c *= s;
}
}
boneX = x_2;
boneY = y_2;
boneX = x;
boneY = y;
if (rotate) {
var a = bone.a, b = bone.b, c = bone.c, d = bone.d, r = 0, cos = 0, sin = 0;
if (tangents)
@ -3012,9 +3012,9 @@ var spine;
if (tip) {
cos = Math.cos(r);
sin = Math.sin(r);
var length_3 = bone.data.length;
boneX += (length_3 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_3 * (sin * a + cos * c) - dy) * rotateMix;
var length_4 = bone.data.length;
boneX += (length_4 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_4 * (sin * a + cos * c) - dy) * rotateMix;
}
else {
r += offsetRotation;
@ -3078,14 +3078,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_4 = lengths[curve];
if (p > length_4)
var length_5 = lengths[curve];
if (p > length_5)
continue;
if (curve == 0)
p /= length_4;
p /= length_5;
else {
var prev = lengths[curve - 1];
p = (p - prev) / (length_4 - prev);
p = (p - prev) / (length_5 - prev);
}
break;
}
@ -3180,14 +3180,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_5 = curves[curve];
if (p > length_5)
var length_6 = curves[curve];
if (p > length_6)
continue;
if (curve == 0)
p /= length_5;
p /= length_6;
else {
var prev = curves[curve - 1];
p = (p - prev) / (length_5 - prev);
p = (p - prev) / (length_6 - prev);
}
break;
}
@ -3232,14 +3232,14 @@ var spine;
}
p *= curveLength;
for (;; segment++) {
var length_6 = segments[segment];
if (p > length_6)
var length_7 = segments[segment];
if (p > length_7)
continue;
if (segment == 0)
p /= length_6;
p /= length_7;
else {
var prev = segments[segment - 1];
p = segment + (p - prev) / (length_6 - prev);
p = segment + (p - prev) / (length_7 - prev);
}
break;
}
@ -5398,7 +5398,7 @@ var spine;
FakeTexture.prototype.setWraps = function (uWrap, vWrap) { };
FakeTexture.prototype.dispose = function () { };
return FakeTexture;
}(spine.Texture));
}(Texture));
spine.FakeTexture = FakeTexture;
})(spine || (spine = {}));
var spine;
@ -7343,8 +7343,8 @@ var spine;
break;
}
var listeners = _this.listeners;
for (var i_17 = 0; i_17 < listeners.length; i_17++) {
listeners[i_17].down(_this.currTouch.x, _this.currTouch.y);
for (var i_16 = 0; i_16 < listeners.length; i_16++) {
listeners[i_16].down(_this.currTouch.x, _this.currTouch.y);
}
console.log("Start " + _this.currTouch.x + ", " + _this.currTouch.y);
_this.lastX = _this.currTouch.x;
@ -7353,6 +7353,29 @@ var spine;
ev.preventDefault();
}, false);
element.addEventListener("touchend", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
if (_this.currTouch.identifier === touch.identifier) {
var rect = element.getBoundingClientRect();
var x = _this.currTouch.x = touch.clientX - rect.left;
var y = _this.currTouch.y = touch.clientY - rect.top;
_this.touchesPool.free(_this.currTouch);
var listeners = _this.listeners;
for (var i_17 = 0; i_17 < listeners.length; i_17++) {
listeners[i_17].up(x, y);
}
console.log("End " + x + ", " + y);
_this.lastX = x;
_this.lastY = y;
_this.buttonDown = false;
_this.currTouch = null;
break;
}
}
ev.preventDefault();
}, false);
element.addEventListener("touchcancel", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
@ -7375,29 +7398,6 @@ var spine;
}
ev.preventDefault();
}, false);
element.addEventListener("touchcancel", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
if (_this.currTouch.identifier === touch.identifier) {
var rect = element.getBoundingClientRect();
var x = _this.currTouch.x = touch.clientX - rect.left;
var y = _this.currTouch.y = touch.clientY - rect.top;
_this.touchesPool.free(_this.currTouch);
var listeners = _this.listeners;
for (var i_19 = 0; i_19 < listeners.length; i_19++) {
listeners[i_19].up(x, y);
}
console.log("End " + x + ", " + y);
_this.lastX = x;
_this.lastY = y;
_this.buttonDown = false;
_this.currTouch = null;
break;
}
}
ev.preventDefault();
}, false);
element.addEventListener("touchmove", function (ev) {
if (_this.currTouch == null)
return;
@ -7409,8 +7409,8 @@ var spine;
var x = touch.clientX - rect.left;
var y = touch.clientY - rect.top;
var listeners = _this.listeners;
for (var i_20 = 0; i_20 < listeners.length; i_20++) {
listeners[i_20].dragged(x, y);
for (var i_19 = 0; i_19 < listeners.length; i_19++) {
listeners[i_19].dragged(x, y);
}
console.log("Drag " + x + ", " + y);
_this.lastX = _this.currTouch.x = x;
@ -9260,11 +9260,11 @@ var spine;
var nn = clip.worldVerticesLength;
var world = this.temp = spine.Utils.setArraySize(this.temp, nn, 0);
clip.computeWorldVertices(slot, 0, nn, world, 0, 2);
for (var i_21 = 0, n_2 = world.length; i_21 < n_2; i_21 += 2) {
var x = world[i_21];
var y = world[i_21 + 1];
var x2 = world[(i_21 + 2) % world.length];
var y2 = world[(i_21 + 3) % world.length];
for (var i_20 = 0, n_2 = world.length; i_20 < n_2; i_20 += 2) {
var x = world[i_20];
var y = world[i_20 + 1];
var x2 = world[(i_20 + 2) % world.length];
var y2 = world[(i_20 + 3) % world.length];
shapes.line(x, y, x2, y2);
}
}

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

File diff suppressed because one or more lines are too long

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

@ -844,9 +844,9 @@ declare module spine {
originalWidth: number;
originalHeight: number;
}
class FakeTexture extends spine.Texture {
setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter): void;
setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap): void;
class FakeTexture extends Texture {
setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
dispose(): void;
}
}

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

@ -200,17 +200,17 @@ var spine;
return;
}
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) {
var r = frames[frames.length + RotateTimeline.PREV_ROTATION];
var r_2 = frames[frames.length + RotateTimeline.PREV_ROTATION];
switch (blend) {
case MixBlend.setup:
bone.rotation = bone.data.rotation + r * alpha;
bone.rotation = bone.data.rotation + r_2 * alpha;
break;
case MixBlend.first:
case MixBlend.replace:
r += bone.data.rotation - bone.rotation;
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
r_2 += bone.data.rotation - bone.rotation;
r_2 -= (16384 - ((16384.499999999996 - r_2 / 360) | 0)) * 360;
case MixBlend.add:
bone.rotation += r * alpha;
bone.rotation += r_2 * alpha;
}
return;
}
@ -218,7 +218,7 @@ var spine;
var prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
var frameTime = frames[frame];
var percent = this.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
var r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r = prevRotation + (r - (16384 - ((16384.499999999996 - r / 360) | 0)) * 360) * percent;
switch (blend) {
case MixBlend.setup:
@ -738,9 +738,9 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_1 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_1 = 0; i_1 < vertexCount; i_1++) {
vertices[i_1] += lastVertices[i_1] - setupVertices_1[i_1];
vertices[i_1] += lastVertices[i_1] - setupVertices[i_1];
}
}
else {
@ -757,9 +757,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_1 = slotAttachment;
if (vertexAttachment_1.bones == null) {
var setupVertices_2 = vertexAttachment_1.vertices;
var setupVertices = vertexAttachment_1.vertices;
for (var i_3 = 0; i_3 < vertexCount; i_3++) {
var setup = setupVertices_2[i_3];
var setup = setupVertices[i_3];
vertices[i_3] = setup + (lastVertices[i_3] - setup) * alpha;
}
}
@ -776,9 +776,9 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_3 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_6 = 0; i_6 < vertexCount; i_6++) {
vertices[i_6] += (lastVertices[i_6] - setupVertices_3[i_6]) * alpha;
vertices[i_6] += (lastVertices[i_6] - setupVertices[i_6]) * alpha;
}
}
else {
@ -798,10 +798,10 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_4 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_8 = 0; i_8 < vertexCount; i_8++) {
var prev = prevVertices[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices_4[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices[i_8];
}
}
else {
@ -823,9 +823,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_2 = slotAttachment;
if (vertexAttachment_2.bones == null) {
var setupVertices_5 = vertexAttachment_2.vertices;
var setupVertices = vertexAttachment_2.vertices;
for (var i_11 = 0; i_11 < vertexCount; i_11++) {
var prev = prevVertices[i_11], setup = setupVertices_5[i_11];
var prev = prevVertices[i_11], setup = setupVertices[i_11];
vertices[i_11] = setup + (prev + (nextVertices[i_11] - prev) * percent - setup) * alpha;
}
}
@ -847,10 +847,10 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_6 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_14 = 0; i_14 < vertexCount; i_14++) {
var prev = prevVertices[i_14];
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices_6[i_14]) * alpha;
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices[i_14]) * alpha;
}
}
else {
@ -1471,7 +1471,7 @@ var spine;
for (var i = 0; i < timelineCount; i++) {
var timeline = timelines[i];
var direction = spine.MixDirection.out;
var timelineBlend;
var timelineBlend = void 0;
var alpha = 0;
switch (timelineMode[i]) {
case AnimationState.SUBSEQUENT:
@ -1817,9 +1817,9 @@ var spine;
var timelineDipMix = spine.Utils.setArraySize(entry.timelineHoldMix, timelinesCount);
var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) {
for (var i_16 = 0; i_16 < timelinesCount; i_16++) {
propertyIDs.add(timelines[i_16].getPropertyId());
timelineMode[i_16] = AnimationState.HOLD;
for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId());
timelineMode[i] = AnimationState.HOLD;
}
return;
}
@ -2957,17 +2957,17 @@ var spine;
else if (percentSpacing) {
if (scale) {
var x = setupLength * bone.a, y = setupLength * bone.c;
var length = Math.sqrt(x * x + y * y);
lengths[i] = length;
var length_1 = Math.sqrt(x * x + y * y);
lengths[i] = length_1;
}
spaces[++i] = spacing;
}
else {
var x_1 = setupLength * bone.a, y_1 = setupLength * bone.c;
var length_1 = Math.sqrt(x_1 * x_1 + y_1 * y_1);
var x = setupLength * bone.a, y = setupLength * bone.c;
var length_2 = Math.sqrt(x * x + y * y);
if (scale)
lengths[i] = length_1;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
lengths[i] = length_2;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_2 / setupLength;
}
}
}
@ -2989,17 +2989,17 @@ var spine;
var bone = bones[i];
bone.worldX += (boneX - bone.worldX) * translateMix;
bone.worldY += (boneY - bone.worldY) * translateMix;
var x_2 = positions[p], y_2 = positions[p + 1], dx = x_2 - boneX, dy = y_2 - boneY;
var x = positions[p], y = positions[p + 1], dx = x - boneX, dy = y - boneY;
if (scale) {
var length_2 = lengths[i];
if (length_2 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_2 - 1) * rotateMix + 1;
var length_3 = lengths[i];
if (length_3 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_3 - 1) * rotateMix + 1;
bone.a *= s;
bone.c *= s;
}
}
boneX = x_2;
boneY = y_2;
boneX = x;
boneY = y;
if (rotate) {
var a = bone.a, b = bone.b, c = bone.c, d = bone.d, r = 0, cos = 0, sin = 0;
if (tangents)
@ -3012,9 +3012,9 @@ var spine;
if (tip) {
cos = Math.cos(r);
sin = Math.sin(r);
var length_3 = bone.data.length;
boneX += (length_3 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_3 * (sin * a + cos * c) - dy) * rotateMix;
var length_4 = bone.data.length;
boneX += (length_4 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_4 * (sin * a + cos * c) - dy) * rotateMix;
}
else {
r += offsetRotation;
@ -3078,14 +3078,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_4 = lengths[curve];
if (p > length_4)
var length_5 = lengths[curve];
if (p > length_5)
continue;
if (curve == 0)
p /= length_4;
p /= length_5;
else {
var prev = lengths[curve - 1];
p = (p - prev) / (length_4 - prev);
p = (p - prev) / (length_5 - prev);
}
break;
}
@ -3180,14 +3180,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_5 = curves[curve];
if (p > length_5)
var length_6 = curves[curve];
if (p > length_6)
continue;
if (curve == 0)
p /= length_5;
p /= length_6;
else {
var prev = curves[curve - 1];
p = (p - prev) / (length_5 - prev);
p = (p - prev) / (length_6 - prev);
}
break;
}
@ -3232,14 +3232,14 @@ var spine;
}
p *= curveLength;
for (;; segment++) {
var length_6 = segments[segment];
if (p > length_6)
var length_7 = segments[segment];
if (p > length_7)
continue;
if (segment == 0)
p /= length_6;
p /= length_7;
else {
var prev = segments[segment - 1];
p = segment + (p - prev) / (length_6 - prev);
p = segment + (p - prev) / (length_7 - prev);
}
break;
}
@ -5398,7 +5398,7 @@ var spine;
FakeTexture.prototype.setWraps = function (uWrap, vWrap) { };
FakeTexture.prototype.dispose = function () { };
return FakeTexture;
}(spine.Texture));
}(Texture));
spine.FakeTexture = FakeTexture;
})(spine || (spine = {}));
var spine;

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

File diff suppressed because one or more lines are too long

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

@ -844,9 +844,9 @@ declare module spine {
originalWidth: number;
originalHeight: number;
}
class FakeTexture extends spine.Texture {
setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter): void;
setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap): void;
class FakeTexture extends Texture {
setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
dispose(): void;
}
}

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

@ -200,17 +200,17 @@ var spine;
return;
}
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) {
var r = frames[frames.length + RotateTimeline.PREV_ROTATION];
var r_2 = frames[frames.length + RotateTimeline.PREV_ROTATION];
switch (blend) {
case MixBlend.setup:
bone.rotation = bone.data.rotation + r * alpha;
bone.rotation = bone.data.rotation + r_2 * alpha;
break;
case MixBlend.first:
case MixBlend.replace:
r += bone.data.rotation - bone.rotation;
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
r_2 += bone.data.rotation - bone.rotation;
r_2 -= (16384 - ((16384.499999999996 - r_2 / 360) | 0)) * 360;
case MixBlend.add:
bone.rotation += r * alpha;
bone.rotation += r_2 * alpha;
}
return;
}
@ -218,7 +218,7 @@ var spine;
var prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
var frameTime = frames[frame];
var percent = this.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
var r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r = prevRotation + (r - (16384 - ((16384.499999999996 - r / 360) | 0)) * 360) * percent;
switch (blend) {
case MixBlend.setup:
@ -738,9 +738,9 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_1 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_1 = 0; i_1 < vertexCount; i_1++) {
vertices[i_1] += lastVertices[i_1] - setupVertices_1[i_1];
vertices[i_1] += lastVertices[i_1] - setupVertices[i_1];
}
}
else {
@ -757,9 +757,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_1 = slotAttachment;
if (vertexAttachment_1.bones == null) {
var setupVertices_2 = vertexAttachment_1.vertices;
var setupVertices = vertexAttachment_1.vertices;
for (var i_3 = 0; i_3 < vertexCount; i_3++) {
var setup = setupVertices_2[i_3];
var setup = setupVertices[i_3];
vertices[i_3] = setup + (lastVertices[i_3] - setup) * alpha;
}
}
@ -776,9 +776,9 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_3 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_6 = 0; i_6 < vertexCount; i_6++) {
vertices[i_6] += (lastVertices[i_6] - setupVertices_3[i_6]) * alpha;
vertices[i_6] += (lastVertices[i_6] - setupVertices[i_6]) * alpha;
}
}
else {
@ -798,10 +798,10 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_4 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_8 = 0; i_8 < vertexCount; i_8++) {
var prev = prevVertices[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices_4[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices[i_8];
}
}
else {
@ -823,9 +823,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_2 = slotAttachment;
if (vertexAttachment_2.bones == null) {
var setupVertices_5 = vertexAttachment_2.vertices;
var setupVertices = vertexAttachment_2.vertices;
for (var i_11 = 0; i_11 < vertexCount; i_11++) {
var prev = prevVertices[i_11], setup = setupVertices_5[i_11];
var prev = prevVertices[i_11], setup = setupVertices[i_11];
vertices[i_11] = setup + (prev + (nextVertices[i_11] - prev) * percent - setup) * alpha;
}
}
@ -847,10 +847,10 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_6 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_14 = 0; i_14 < vertexCount; i_14++) {
var prev = prevVertices[i_14];
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices_6[i_14]) * alpha;
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices[i_14]) * alpha;
}
}
else {
@ -1471,7 +1471,7 @@ var spine;
for (var i = 0; i < timelineCount; i++) {
var timeline = timelines[i];
var direction = spine.MixDirection.out;
var timelineBlend;
var timelineBlend = void 0;
var alpha = 0;
switch (timelineMode[i]) {
case AnimationState.SUBSEQUENT:
@ -1817,9 +1817,9 @@ var spine;
var timelineDipMix = spine.Utils.setArraySize(entry.timelineHoldMix, timelinesCount);
var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) {
for (var i_16 = 0; i_16 < timelinesCount; i_16++) {
propertyIDs.add(timelines[i_16].getPropertyId());
timelineMode[i_16] = AnimationState.HOLD;
for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId());
timelineMode[i] = AnimationState.HOLD;
}
return;
}
@ -2957,17 +2957,17 @@ var spine;
else if (percentSpacing) {
if (scale) {
var x = setupLength * bone.a, y = setupLength * bone.c;
var length = Math.sqrt(x * x + y * y);
lengths[i] = length;
var length_1 = Math.sqrt(x * x + y * y);
lengths[i] = length_1;
}
spaces[++i] = spacing;
}
else {
var x_1 = setupLength * bone.a, y_1 = setupLength * bone.c;
var length_1 = Math.sqrt(x_1 * x_1 + y_1 * y_1);
var x = setupLength * bone.a, y = setupLength * bone.c;
var length_2 = Math.sqrt(x * x + y * y);
if (scale)
lengths[i] = length_1;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
lengths[i] = length_2;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_2 / setupLength;
}
}
}
@ -2989,17 +2989,17 @@ var spine;
var bone = bones[i];
bone.worldX += (boneX - bone.worldX) * translateMix;
bone.worldY += (boneY - bone.worldY) * translateMix;
var x_2 = positions[p], y_2 = positions[p + 1], dx = x_2 - boneX, dy = y_2 - boneY;
var x = positions[p], y = positions[p + 1], dx = x - boneX, dy = y - boneY;
if (scale) {
var length_2 = lengths[i];
if (length_2 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_2 - 1) * rotateMix + 1;
var length_3 = lengths[i];
if (length_3 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_3 - 1) * rotateMix + 1;
bone.a *= s;
bone.c *= s;
}
}
boneX = x_2;
boneY = y_2;
boneX = x;
boneY = y;
if (rotate) {
var a = bone.a, b = bone.b, c = bone.c, d = bone.d, r = 0, cos = 0, sin = 0;
if (tangents)
@ -3012,9 +3012,9 @@ var spine;
if (tip) {
cos = Math.cos(r);
sin = Math.sin(r);
var length_3 = bone.data.length;
boneX += (length_3 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_3 * (sin * a + cos * c) - dy) * rotateMix;
var length_4 = bone.data.length;
boneX += (length_4 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_4 * (sin * a + cos * c) - dy) * rotateMix;
}
else {
r += offsetRotation;
@ -3078,14 +3078,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_4 = lengths[curve];
if (p > length_4)
var length_5 = lengths[curve];
if (p > length_5)
continue;
if (curve == 0)
p /= length_4;
p /= length_5;
else {
var prev = lengths[curve - 1];
p = (p - prev) / (length_4 - prev);
p = (p - prev) / (length_5 - prev);
}
break;
}
@ -3180,14 +3180,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_5 = curves[curve];
if (p > length_5)
var length_6 = curves[curve];
if (p > length_6)
continue;
if (curve == 0)
p /= length_5;
p /= length_6;
else {
var prev = curves[curve - 1];
p = (p - prev) / (length_5 - prev);
p = (p - prev) / (length_6 - prev);
}
break;
}
@ -3232,14 +3232,14 @@ var spine;
}
p *= curveLength;
for (;; segment++) {
var length_6 = segments[segment];
if (p > length_6)
var length_7 = segments[segment];
if (p > length_7)
continue;
if (segment == 0)
p /= length_6;
p /= length_7;
else {
var prev = segments[segment - 1];
p = segment + (p - prev) / (length_6 - prev);
p = segment + (p - prev) / (length_7 - prev);
}
break;
}
@ -5398,7 +5398,7 @@ var spine;
FakeTexture.prototype.setWraps = function (uWrap, vWrap) { };
FakeTexture.prototype.dispose = function () { };
return FakeTexture;
}(spine.Texture));
}(Texture));
spine.FakeTexture = FakeTexture;
})(spine || (spine = {}));
var spine;

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

File diff suppressed because one or more lines are too long

6
spine-ts/build/spine-player.d.ts vendored
View File

@ -844,9 +844,9 @@ declare module spine {
originalWidth: number;
originalHeight: number;
}
class FakeTexture extends spine.Texture {
setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter): void;
setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap): void;
class FakeTexture extends Texture {
setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
dispose(): void;
}
}

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

@ -200,17 +200,17 @@ var spine;
return;
}
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) {
var r = frames[frames.length + RotateTimeline.PREV_ROTATION];
var r_2 = frames[frames.length + RotateTimeline.PREV_ROTATION];
switch (blend) {
case MixBlend.setup:
bone.rotation = bone.data.rotation + r * alpha;
bone.rotation = bone.data.rotation + r_2 * alpha;
break;
case MixBlend.first:
case MixBlend.replace:
r += bone.data.rotation - bone.rotation;
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
r_2 += bone.data.rotation - bone.rotation;
r_2 -= (16384 - ((16384.499999999996 - r_2 / 360) | 0)) * 360;
case MixBlend.add:
bone.rotation += r * alpha;
bone.rotation += r_2 * alpha;
}
return;
}
@ -218,7 +218,7 @@ var spine;
var prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
var frameTime = frames[frame];
var percent = this.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
var r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r = prevRotation + (r - (16384 - ((16384.499999999996 - r / 360) | 0)) * 360) * percent;
switch (blend) {
case MixBlend.setup:
@ -738,9 +738,9 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_1 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_1 = 0; i_1 < vertexCount; i_1++) {
vertices[i_1] += lastVertices[i_1] - setupVertices_1[i_1];
vertices[i_1] += lastVertices[i_1] - setupVertices[i_1];
}
}
else {
@ -757,9 +757,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_1 = slotAttachment;
if (vertexAttachment_1.bones == null) {
var setupVertices_2 = vertexAttachment_1.vertices;
var setupVertices = vertexAttachment_1.vertices;
for (var i_3 = 0; i_3 < vertexCount; i_3++) {
var setup = setupVertices_2[i_3];
var setup = setupVertices[i_3];
vertices[i_3] = setup + (lastVertices[i_3] - setup) * alpha;
}
}
@ -776,9 +776,9 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_3 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_6 = 0; i_6 < vertexCount; i_6++) {
vertices[i_6] += (lastVertices[i_6] - setupVertices_3[i_6]) * alpha;
vertices[i_6] += (lastVertices[i_6] - setupVertices[i_6]) * alpha;
}
}
else {
@ -798,10 +798,10 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_4 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_8 = 0; i_8 < vertexCount; i_8++) {
var prev = prevVertices[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices_4[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices[i_8];
}
}
else {
@ -823,9 +823,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_2 = slotAttachment;
if (vertexAttachment_2.bones == null) {
var setupVertices_5 = vertexAttachment_2.vertices;
var setupVertices = vertexAttachment_2.vertices;
for (var i_11 = 0; i_11 < vertexCount; i_11++) {
var prev = prevVertices[i_11], setup = setupVertices_5[i_11];
var prev = prevVertices[i_11], setup = setupVertices[i_11];
vertices[i_11] = setup + (prev + (nextVertices[i_11] - prev) * percent - setup) * alpha;
}
}
@ -847,10 +847,10 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_6 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_14 = 0; i_14 < vertexCount; i_14++) {
var prev = prevVertices[i_14];
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices_6[i_14]) * alpha;
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices[i_14]) * alpha;
}
}
else {
@ -1471,7 +1471,7 @@ var spine;
for (var i = 0; i < timelineCount; i++) {
var timeline = timelines[i];
var direction = spine.MixDirection.out;
var timelineBlend;
var timelineBlend = void 0;
var alpha = 0;
switch (timelineMode[i]) {
case AnimationState.SUBSEQUENT:
@ -1817,9 +1817,9 @@ var spine;
var timelineDipMix = spine.Utils.setArraySize(entry.timelineHoldMix, timelinesCount);
var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) {
for (var i_16 = 0; i_16 < timelinesCount; i_16++) {
propertyIDs.add(timelines[i_16].getPropertyId());
timelineMode[i_16] = AnimationState.HOLD;
for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId());
timelineMode[i] = AnimationState.HOLD;
}
return;
}
@ -2957,17 +2957,17 @@ var spine;
else if (percentSpacing) {
if (scale) {
var x = setupLength * bone.a, y = setupLength * bone.c;
var length = Math.sqrt(x * x + y * y);
lengths[i] = length;
var length_1 = Math.sqrt(x * x + y * y);
lengths[i] = length_1;
}
spaces[++i] = spacing;
}
else {
var x_1 = setupLength * bone.a, y_1 = setupLength * bone.c;
var length_1 = Math.sqrt(x_1 * x_1 + y_1 * y_1);
var x = setupLength * bone.a, y = setupLength * bone.c;
var length_2 = Math.sqrt(x * x + y * y);
if (scale)
lengths[i] = length_1;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
lengths[i] = length_2;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_2 / setupLength;
}
}
}
@ -2989,17 +2989,17 @@ var spine;
var bone = bones[i];
bone.worldX += (boneX - bone.worldX) * translateMix;
bone.worldY += (boneY - bone.worldY) * translateMix;
var x_2 = positions[p], y_2 = positions[p + 1], dx = x_2 - boneX, dy = y_2 - boneY;
var x = positions[p], y = positions[p + 1], dx = x - boneX, dy = y - boneY;
if (scale) {
var length_2 = lengths[i];
if (length_2 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_2 - 1) * rotateMix + 1;
var length_3 = lengths[i];
if (length_3 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_3 - 1) * rotateMix + 1;
bone.a *= s;
bone.c *= s;
}
}
boneX = x_2;
boneY = y_2;
boneX = x;
boneY = y;
if (rotate) {
var a = bone.a, b = bone.b, c = bone.c, d = bone.d, r = 0, cos = 0, sin = 0;
if (tangents)
@ -3012,9 +3012,9 @@ var spine;
if (tip) {
cos = Math.cos(r);
sin = Math.sin(r);
var length_3 = bone.data.length;
boneX += (length_3 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_3 * (sin * a + cos * c) - dy) * rotateMix;
var length_4 = bone.data.length;
boneX += (length_4 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_4 * (sin * a + cos * c) - dy) * rotateMix;
}
else {
r += offsetRotation;
@ -3078,14 +3078,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_4 = lengths[curve];
if (p > length_4)
var length_5 = lengths[curve];
if (p > length_5)
continue;
if (curve == 0)
p /= length_4;
p /= length_5;
else {
var prev = lengths[curve - 1];
p = (p - prev) / (length_4 - prev);
p = (p - prev) / (length_5 - prev);
}
break;
}
@ -3180,14 +3180,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_5 = curves[curve];
if (p > length_5)
var length_6 = curves[curve];
if (p > length_6)
continue;
if (curve == 0)
p /= length_5;
p /= length_6;
else {
var prev = curves[curve - 1];
p = (p - prev) / (length_5 - prev);
p = (p - prev) / (length_6 - prev);
}
break;
}
@ -3232,14 +3232,14 @@ var spine;
}
p *= curveLength;
for (;; segment++) {
var length_6 = segments[segment];
if (p > length_6)
var length_7 = segments[segment];
if (p > length_7)
continue;
if (segment == 0)
p /= length_6;
p /= length_7;
else {
var prev = segments[segment - 1];
p = segment + (p - prev) / (length_6 - prev);
p = segment + (p - prev) / (length_7 - prev);
}
break;
}
@ -5398,7 +5398,7 @@ var spine;
FakeTexture.prototype.setWraps = function (uWrap, vWrap) { };
FakeTexture.prototype.dispose = function () { };
return FakeTexture;
}(spine.Texture));
}(Texture));
spine.FakeTexture = FakeTexture;
})(spine || (spine = {}));
var spine;
@ -7077,8 +7077,8 @@ var spine;
break;
}
var listeners = _this.listeners;
for (var i_17 = 0; i_17 < listeners.length; i_17++) {
listeners[i_17].down(_this.currTouch.x, _this.currTouch.y);
for (var i_16 = 0; i_16 < listeners.length; i_16++) {
listeners[i_16].down(_this.currTouch.x, _this.currTouch.y);
}
console.log("Start " + _this.currTouch.x + ", " + _this.currTouch.y);
_this.lastX = _this.currTouch.x;
@ -7087,6 +7087,29 @@ var spine;
ev.preventDefault();
}, false);
element.addEventListener("touchend", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
if (_this.currTouch.identifier === touch.identifier) {
var rect = element.getBoundingClientRect();
var x = _this.currTouch.x = touch.clientX - rect.left;
var y = _this.currTouch.y = touch.clientY - rect.top;
_this.touchesPool.free(_this.currTouch);
var listeners = _this.listeners;
for (var i_17 = 0; i_17 < listeners.length; i_17++) {
listeners[i_17].up(x, y);
}
console.log("End " + x + ", " + y);
_this.lastX = x;
_this.lastY = y;
_this.buttonDown = false;
_this.currTouch = null;
break;
}
}
ev.preventDefault();
}, false);
element.addEventListener("touchcancel", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
@ -7109,29 +7132,6 @@ var spine;
}
ev.preventDefault();
}, false);
element.addEventListener("touchcancel", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
if (_this.currTouch.identifier === touch.identifier) {
var rect = element.getBoundingClientRect();
var x = _this.currTouch.x = touch.clientX - rect.left;
var y = _this.currTouch.y = touch.clientY - rect.top;
_this.touchesPool.free(_this.currTouch);
var listeners = _this.listeners;
for (var i_19 = 0; i_19 < listeners.length; i_19++) {
listeners[i_19].up(x, y);
}
console.log("End " + x + ", " + y);
_this.lastX = x;
_this.lastY = y;
_this.buttonDown = false;
_this.currTouch = null;
break;
}
}
ev.preventDefault();
}, false);
element.addEventListener("touchmove", function (ev) {
if (_this.currTouch == null)
return;
@ -7143,8 +7143,8 @@ var spine;
var x = touch.clientX - rect.left;
var y = touch.clientY - rect.top;
var listeners = _this.listeners;
for (var i_20 = 0; i_20 < listeners.length; i_20++) {
listeners[i_20].dragged(x, y);
for (var i_19 = 0; i_19 < listeners.length; i_19++) {
listeners[i_19].dragged(x, y);
}
console.log("Drag " + x + ", " + y);
_this.lastX = _this.currTouch.x = x;
@ -8994,11 +8994,11 @@ var spine;
var nn = clip.worldVerticesLength;
var world = this.temp = spine.Utils.setArraySize(this.temp, nn, 0);
clip.computeWorldVertices(slot, 0, nn, world, 0, 2);
for (var i_21 = 0, n_2 = world.length; i_21 < n_2; i_21 += 2) {
var x = world[i_21];
var y = world[i_21 + 1];
var x2 = world[(i_21 + 2) % world.length];
var y2 = world[(i_21 + 3) % world.length];
for (var i_20 = 0, n_2 = world.length; i_20 < n_2; i_20 += 2) {
var x = world[i_20];
var y = world[i_20 + 1];
var x2 = world[(i_20 + 2) % world.length];
var y2 = world[(i_20 + 3) % world.length];
shapes.line(x, y, x2, y2);
}
}

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

File diff suppressed because one or more lines are too long

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

@ -844,9 +844,9 @@ declare module spine {
originalWidth: number;
originalHeight: number;
}
class FakeTexture extends spine.Texture {
setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter): void;
setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap): void;
class FakeTexture extends Texture {
setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
dispose(): void;
}
}

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

@ -200,17 +200,17 @@ var spine;
return;
}
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) {
var r = frames[frames.length + RotateTimeline.PREV_ROTATION];
var r_2 = frames[frames.length + RotateTimeline.PREV_ROTATION];
switch (blend) {
case MixBlend.setup:
bone.rotation = bone.data.rotation + r * alpha;
bone.rotation = bone.data.rotation + r_2 * alpha;
break;
case MixBlend.first:
case MixBlend.replace:
r += bone.data.rotation - bone.rotation;
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
r_2 += bone.data.rotation - bone.rotation;
r_2 -= (16384 - ((16384.499999999996 - r_2 / 360) | 0)) * 360;
case MixBlend.add:
bone.rotation += r * alpha;
bone.rotation += r_2 * alpha;
}
return;
}
@ -218,7 +218,7 @@ var spine;
var prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
var frameTime = frames[frame];
var percent = this.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
var r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r = prevRotation + (r - (16384 - ((16384.499999999996 - r / 360) | 0)) * 360) * percent;
switch (blend) {
case MixBlend.setup:
@ -738,9 +738,9 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_1 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_1 = 0; i_1 < vertexCount; i_1++) {
vertices[i_1] += lastVertices[i_1] - setupVertices_1[i_1];
vertices[i_1] += lastVertices[i_1] - setupVertices[i_1];
}
}
else {
@ -757,9 +757,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_1 = slotAttachment;
if (vertexAttachment_1.bones == null) {
var setupVertices_2 = vertexAttachment_1.vertices;
var setupVertices = vertexAttachment_1.vertices;
for (var i_3 = 0; i_3 < vertexCount; i_3++) {
var setup = setupVertices_2[i_3];
var setup = setupVertices[i_3];
vertices[i_3] = setup + (lastVertices[i_3] - setup) * alpha;
}
}
@ -776,9 +776,9 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_3 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_6 = 0; i_6 < vertexCount; i_6++) {
vertices[i_6] += (lastVertices[i_6] - setupVertices_3[i_6]) * alpha;
vertices[i_6] += (lastVertices[i_6] - setupVertices[i_6]) * alpha;
}
}
else {
@ -798,10 +798,10 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_4 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_8 = 0; i_8 < vertexCount; i_8++) {
var prev = prevVertices[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices_4[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices[i_8];
}
}
else {
@ -823,9 +823,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_2 = slotAttachment;
if (vertexAttachment_2.bones == null) {
var setupVertices_5 = vertexAttachment_2.vertices;
var setupVertices = vertexAttachment_2.vertices;
for (var i_11 = 0; i_11 < vertexCount; i_11++) {
var prev = prevVertices[i_11], setup = setupVertices_5[i_11];
var prev = prevVertices[i_11], setup = setupVertices[i_11];
vertices[i_11] = setup + (prev + (nextVertices[i_11] - prev) * percent - setup) * alpha;
}
}
@ -847,10 +847,10 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_6 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_14 = 0; i_14 < vertexCount; i_14++) {
var prev = prevVertices[i_14];
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices_6[i_14]) * alpha;
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices[i_14]) * alpha;
}
}
else {
@ -1471,7 +1471,7 @@ var spine;
for (var i = 0; i < timelineCount; i++) {
var timeline = timelines[i];
var direction = spine.MixDirection.out;
var timelineBlend;
var timelineBlend = void 0;
var alpha = 0;
switch (timelineMode[i]) {
case AnimationState.SUBSEQUENT:
@ -1817,9 +1817,9 @@ var spine;
var timelineDipMix = spine.Utils.setArraySize(entry.timelineHoldMix, timelinesCount);
var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) {
for (var i_16 = 0; i_16 < timelinesCount; i_16++) {
propertyIDs.add(timelines[i_16].getPropertyId());
timelineMode[i_16] = AnimationState.HOLD;
for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId());
timelineMode[i] = AnimationState.HOLD;
}
return;
}
@ -2957,17 +2957,17 @@ var spine;
else if (percentSpacing) {
if (scale) {
var x = setupLength * bone.a, y = setupLength * bone.c;
var length = Math.sqrt(x * x + y * y);
lengths[i] = length;
var length_1 = Math.sqrt(x * x + y * y);
lengths[i] = length_1;
}
spaces[++i] = spacing;
}
else {
var x_1 = setupLength * bone.a, y_1 = setupLength * bone.c;
var length_1 = Math.sqrt(x_1 * x_1 + y_1 * y_1);
var x = setupLength * bone.a, y = setupLength * bone.c;
var length_2 = Math.sqrt(x * x + y * y);
if (scale)
lengths[i] = length_1;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
lengths[i] = length_2;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_2 / setupLength;
}
}
}
@ -2989,17 +2989,17 @@ var spine;
var bone = bones[i];
bone.worldX += (boneX - bone.worldX) * translateMix;
bone.worldY += (boneY - bone.worldY) * translateMix;
var x_2 = positions[p], y_2 = positions[p + 1], dx = x_2 - boneX, dy = y_2 - boneY;
var x = positions[p], y = positions[p + 1], dx = x - boneX, dy = y - boneY;
if (scale) {
var length_2 = lengths[i];
if (length_2 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_2 - 1) * rotateMix + 1;
var length_3 = lengths[i];
if (length_3 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_3 - 1) * rotateMix + 1;
bone.a *= s;
bone.c *= s;
}
}
boneX = x_2;
boneY = y_2;
boneX = x;
boneY = y;
if (rotate) {
var a = bone.a, b = bone.b, c = bone.c, d = bone.d, r = 0, cos = 0, sin = 0;
if (tangents)
@ -3012,9 +3012,9 @@ var spine;
if (tip) {
cos = Math.cos(r);
sin = Math.sin(r);
var length_3 = bone.data.length;
boneX += (length_3 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_3 * (sin * a + cos * c) - dy) * rotateMix;
var length_4 = bone.data.length;
boneX += (length_4 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_4 * (sin * a + cos * c) - dy) * rotateMix;
}
else {
r += offsetRotation;
@ -3078,14 +3078,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_4 = lengths[curve];
if (p > length_4)
var length_5 = lengths[curve];
if (p > length_5)
continue;
if (curve == 0)
p /= length_4;
p /= length_5;
else {
var prev = lengths[curve - 1];
p = (p - prev) / (length_4 - prev);
p = (p - prev) / (length_5 - prev);
}
break;
}
@ -3180,14 +3180,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_5 = curves[curve];
if (p > length_5)
var length_6 = curves[curve];
if (p > length_6)
continue;
if (curve == 0)
p /= length_5;
p /= length_6;
else {
var prev = curves[curve - 1];
p = (p - prev) / (length_5 - prev);
p = (p - prev) / (length_6 - prev);
}
break;
}
@ -3232,14 +3232,14 @@ var spine;
}
p *= curveLength;
for (;; segment++) {
var length_6 = segments[segment];
if (p > length_6)
var length_7 = segments[segment];
if (p > length_7)
continue;
if (segment == 0)
p /= length_6;
p /= length_7;
else {
var prev = segments[segment - 1];
p = segment + (p - prev) / (length_6 - prev);
p = segment + (p - prev) / (length_7 - prev);
}
break;
}
@ -5398,7 +5398,7 @@ var spine;
FakeTexture.prototype.setWraps = function (uWrap, vWrap) { };
FakeTexture.prototype.dispose = function () { };
return FakeTexture;
}(spine.Texture));
}(Texture));
spine.FakeTexture = FakeTexture;
})(spine || (spine = {}));
var spine;

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

File diff suppressed because one or more lines are too long

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

@ -844,9 +844,9 @@ declare module spine {
originalWidth: number;
originalHeight: number;
}
class FakeTexture extends spine.Texture {
setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter): void;
setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap): void;
class FakeTexture extends Texture {
setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
dispose(): void;
}
}

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

@ -200,17 +200,17 @@ var spine;
return;
}
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) {
var r = frames[frames.length + RotateTimeline.PREV_ROTATION];
var r_2 = frames[frames.length + RotateTimeline.PREV_ROTATION];
switch (blend) {
case MixBlend.setup:
bone.rotation = bone.data.rotation + r * alpha;
bone.rotation = bone.data.rotation + r_2 * alpha;
break;
case MixBlend.first:
case MixBlend.replace:
r += bone.data.rotation - bone.rotation;
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
r_2 += bone.data.rotation - bone.rotation;
r_2 -= (16384 - ((16384.499999999996 - r_2 / 360) | 0)) * 360;
case MixBlend.add:
bone.rotation += r * alpha;
bone.rotation += r_2 * alpha;
}
return;
}
@ -218,7 +218,7 @@ var spine;
var prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
var frameTime = frames[frame];
var percent = this.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
var r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r = prevRotation + (r - (16384 - ((16384.499999999996 - r / 360) | 0)) * 360) * percent;
switch (blend) {
case MixBlend.setup:
@ -738,9 +738,9 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_1 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_1 = 0; i_1 < vertexCount; i_1++) {
vertices[i_1] += lastVertices[i_1] - setupVertices_1[i_1];
vertices[i_1] += lastVertices[i_1] - setupVertices[i_1];
}
}
else {
@ -757,9 +757,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_1 = slotAttachment;
if (vertexAttachment_1.bones == null) {
var setupVertices_2 = vertexAttachment_1.vertices;
var setupVertices = vertexAttachment_1.vertices;
for (var i_3 = 0; i_3 < vertexCount; i_3++) {
var setup = setupVertices_2[i_3];
var setup = setupVertices[i_3];
vertices[i_3] = setup + (lastVertices[i_3] - setup) * alpha;
}
}
@ -776,9 +776,9 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_3 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_6 = 0; i_6 < vertexCount; i_6++) {
vertices[i_6] += (lastVertices[i_6] - setupVertices_3[i_6]) * alpha;
vertices[i_6] += (lastVertices[i_6] - setupVertices[i_6]) * alpha;
}
}
else {
@ -798,10 +798,10 @@ var spine;
if (blend == MixBlend.add) {
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_4 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_8 = 0; i_8 < vertexCount; i_8++) {
var prev = prevVertices[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices_4[i_8];
vertices[i_8] += prev + (nextVertices[i_8] - prev) * percent - setupVertices[i_8];
}
}
else {
@ -823,9 +823,9 @@ var spine;
case MixBlend.setup: {
var vertexAttachment_2 = slotAttachment;
if (vertexAttachment_2.bones == null) {
var setupVertices_5 = vertexAttachment_2.vertices;
var setupVertices = vertexAttachment_2.vertices;
for (var i_11 = 0; i_11 < vertexCount; i_11++) {
var prev = prevVertices[i_11], setup = setupVertices_5[i_11];
var prev = prevVertices[i_11], setup = setupVertices[i_11];
vertices[i_11] = setup + (prev + (nextVertices[i_11] - prev) * percent - setup) * alpha;
}
}
@ -847,10 +847,10 @@ var spine;
case MixBlend.add:
var vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) {
var setupVertices_6 = vertexAttachment.vertices;
var setupVertices = vertexAttachment.vertices;
for (var i_14 = 0; i_14 < vertexCount; i_14++) {
var prev = prevVertices[i_14];
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices_6[i_14]) * alpha;
vertices[i_14] += (prev + (nextVertices[i_14] - prev) * percent - setupVertices[i_14]) * alpha;
}
}
else {
@ -1471,7 +1471,7 @@ var spine;
for (var i = 0; i < timelineCount; i++) {
var timeline = timelines[i];
var direction = spine.MixDirection.out;
var timelineBlend;
var timelineBlend = void 0;
var alpha = 0;
switch (timelineMode[i]) {
case AnimationState.SUBSEQUENT:
@ -1817,9 +1817,9 @@ var spine;
var timelineDipMix = spine.Utils.setArraySize(entry.timelineHoldMix, timelinesCount);
var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) {
for (var i_16 = 0; i_16 < timelinesCount; i_16++) {
propertyIDs.add(timelines[i_16].getPropertyId());
timelineMode[i_16] = AnimationState.HOLD;
for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId());
timelineMode[i] = AnimationState.HOLD;
}
return;
}
@ -2957,17 +2957,17 @@ var spine;
else if (percentSpacing) {
if (scale) {
var x = setupLength * bone.a, y = setupLength * bone.c;
var length = Math.sqrt(x * x + y * y);
lengths[i] = length;
var length_1 = Math.sqrt(x * x + y * y);
lengths[i] = length_1;
}
spaces[++i] = spacing;
}
else {
var x_1 = setupLength * bone.a, y_1 = setupLength * bone.c;
var length_1 = Math.sqrt(x_1 * x_1 + y_1 * y_1);
var x = setupLength * bone.a, y = setupLength * bone.c;
var length_2 = Math.sqrt(x * x + y * y);
if (scale)
lengths[i] = length_1;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_1 / setupLength;
lengths[i] = length_2;
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length_2 / setupLength;
}
}
}
@ -2989,17 +2989,17 @@ var spine;
var bone = bones[i];
bone.worldX += (boneX - bone.worldX) * translateMix;
bone.worldY += (boneY - bone.worldY) * translateMix;
var x_2 = positions[p], y_2 = positions[p + 1], dx = x_2 - boneX, dy = y_2 - boneY;
var x = positions[p], y = positions[p + 1], dx = x - boneX, dy = y - boneY;
if (scale) {
var length_2 = lengths[i];
if (length_2 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_2 - 1) * rotateMix + 1;
var length_3 = lengths[i];
if (length_3 != 0) {
var s = (Math.sqrt(dx * dx + dy * dy) / length_3 - 1) * rotateMix + 1;
bone.a *= s;
bone.c *= s;
}
}
boneX = x_2;
boneY = y_2;
boneX = x;
boneY = y;
if (rotate) {
var a = bone.a, b = bone.b, c = bone.c, d = bone.d, r = 0, cos = 0, sin = 0;
if (tangents)
@ -3012,9 +3012,9 @@ var spine;
if (tip) {
cos = Math.cos(r);
sin = Math.sin(r);
var length_3 = bone.data.length;
boneX += (length_3 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_3 * (sin * a + cos * c) - dy) * rotateMix;
var length_4 = bone.data.length;
boneX += (length_4 * (cos * a - sin * c) - dx) * rotateMix;
boneY += (length_4 * (sin * a + cos * c) - dy) * rotateMix;
}
else {
r += offsetRotation;
@ -3078,14 +3078,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_4 = lengths[curve];
if (p > length_4)
var length_5 = lengths[curve];
if (p > length_5)
continue;
if (curve == 0)
p /= length_4;
p /= length_5;
else {
var prev = lengths[curve - 1];
p = (p - prev) / (length_4 - prev);
p = (p - prev) / (length_5 - prev);
}
break;
}
@ -3180,14 +3180,14 @@ var spine;
continue;
}
for (;; curve++) {
var length_5 = curves[curve];
if (p > length_5)
var length_6 = curves[curve];
if (p > length_6)
continue;
if (curve == 0)
p /= length_5;
p /= length_6;
else {
var prev = curves[curve - 1];
p = (p - prev) / (length_5 - prev);
p = (p - prev) / (length_6 - prev);
}
break;
}
@ -3232,14 +3232,14 @@ var spine;
}
p *= curveLength;
for (;; segment++) {
var length_6 = segments[segment];
if (p > length_6)
var length_7 = segments[segment];
if (p > length_7)
continue;
if (segment == 0)
p /= length_6;
p /= length_7;
else {
var prev = segments[segment - 1];
p = segment + (p - prev) / (length_6 - prev);
p = segment + (p - prev) / (length_7 - prev);
}
break;
}
@ -5398,7 +5398,7 @@ var spine;
FakeTexture.prototype.setWraps = function (uWrap, vWrap) { };
FakeTexture.prototype.dispose = function () { };
return FakeTexture;
}(spine.Texture));
}(Texture));
spine.FakeTexture = FakeTexture;
})(spine || (spine = {}));
var spine;
@ -7077,8 +7077,8 @@ var spine;
break;
}
var listeners = _this.listeners;
for (var i_17 = 0; i_17 < listeners.length; i_17++) {
listeners[i_17].down(_this.currTouch.x, _this.currTouch.y);
for (var i_16 = 0; i_16 < listeners.length; i_16++) {
listeners[i_16].down(_this.currTouch.x, _this.currTouch.y);
}
console.log("Start " + _this.currTouch.x + ", " + _this.currTouch.y);
_this.lastX = _this.currTouch.x;
@ -7087,6 +7087,29 @@ var spine;
ev.preventDefault();
}, false);
element.addEventListener("touchend", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
if (_this.currTouch.identifier === touch.identifier) {
var rect = element.getBoundingClientRect();
var x = _this.currTouch.x = touch.clientX - rect.left;
var y = _this.currTouch.y = touch.clientY - rect.top;
_this.touchesPool.free(_this.currTouch);
var listeners = _this.listeners;
for (var i_17 = 0; i_17 < listeners.length; i_17++) {
listeners[i_17].up(x, y);
}
console.log("End " + x + ", " + y);
_this.lastX = x;
_this.lastY = y;
_this.buttonDown = false;
_this.currTouch = null;
break;
}
}
ev.preventDefault();
}, false);
element.addEventListener("touchcancel", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
@ -7109,29 +7132,6 @@ var spine;
}
ev.preventDefault();
}, false);
element.addEventListener("touchcancel", function (ev) {
var touches = ev.changedTouches;
for (var i = 0; i < touches.length; i++) {
var touch = touches[i];
if (_this.currTouch.identifier === touch.identifier) {
var rect = element.getBoundingClientRect();
var x = _this.currTouch.x = touch.clientX - rect.left;
var y = _this.currTouch.y = touch.clientY - rect.top;
_this.touchesPool.free(_this.currTouch);
var listeners = _this.listeners;
for (var i_19 = 0; i_19 < listeners.length; i_19++) {
listeners[i_19].up(x, y);
}
console.log("End " + x + ", " + y);
_this.lastX = x;
_this.lastY = y;
_this.buttonDown = false;
_this.currTouch = null;
break;
}
}
ev.preventDefault();
}, false);
element.addEventListener("touchmove", function (ev) {
if (_this.currTouch == null)
return;
@ -7143,8 +7143,8 @@ var spine;
var x = touch.clientX - rect.left;
var y = touch.clientY - rect.top;
var listeners = _this.listeners;
for (var i_20 = 0; i_20 < listeners.length; i_20++) {
listeners[i_20].dragged(x, y);
for (var i_19 = 0; i_19 < listeners.length; i_19++) {
listeners[i_19].dragged(x, y);
}
console.log("Drag " + x + ", " + y);
_this.lastX = _this.currTouch.x = x;
@ -8994,11 +8994,11 @@ var spine;
var nn = clip.worldVerticesLength;
var world = this.temp = spine.Utils.setArraySize(this.temp, nn, 0);
clip.computeWorldVertices(slot, 0, nn, world, 0, 2);
for (var i_21 = 0, n_2 = world.length; i_21 < n_2; i_21 += 2) {
var x = world[i_21];
var y = world[i_21 + 1];
var x2 = world[(i_21 + 2) % world.length];
var y2 = world[(i_21 + 3) % world.length];
for (var i_20 = 0, n_2 = world.length; i_20 < n_2; i_20 += 2) {
var x = world[i_20];
var y = world[i_20 + 1];
var x2 = world[(i_20 + 2) % world.length];
var y2 = world[(i_20 + 3) % world.length];
shapes.line(x, y, x2, y2);
}
}

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

File diff suppressed because one or more lines are too long

8
spine-ts/core/src/Animation.ts
View File

@ -233,7 +233,7 @@ module spine {
}
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) { // Time is after last frame.
var r = frames[frames.length + RotateTimeline.PREV_ROTATION];
let r = frames[frames.length + RotateTimeline.PREV_ROTATION];
switch (blend) {
case MixBlend.setup:
bone.rotation = bone.data.rotation + r * alpha;
@ -255,7 +255,7 @@ module spine {
let percent = this.getCurvePercent((frame >> 1) - 1,
1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
let r = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r = prevRotation + (r - (16384 - ((16384.499999999996 - r / 360) | 0)) * 360) * percent;
switch (blend) {
case MixBlend.setup:
@ -728,7 +728,7 @@ module spine {
}
}
var zeros : ArrayLike<number> = null;
let zeros : ArrayLike<number> = null;
export class DeformTimeline extends CurveTimeline {
slotIndex: number;
@ -779,7 +779,7 @@ module spine {
let vertices: Array<number> = Utils.setArraySize(verticesArray, vertexCount);
if (vertexAttachment.bones == null) {
// Unweighted vertex positions.
var setupVertices = vertexAttachment.vertices;
let setupVertices = vertexAttachment.vertices;
for (var i = 0; i < vertexCount; i++)
vertices[i] += (setupVertices[i] - vertices[i]) * alpha;
} else {

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

@ -212,7 +212,7 @@ module spine {
let timelines = from.animation.timelines;
let alphaHold = from.alpha * to.interruptAlpha, alphaMix = alphaHold * (1 - mix);
if (blend == MixBlend.add) {
for (var i = 0; i < timelineCount; i++)
for (let i = 0; i < timelineCount; i++)
timelines[i].apply(skeleton, animationLast, animationTime, events, alphaMix, blend, MixDirection.out);
} else {
let timelineMode = from.timelineMode;
@ -223,11 +223,11 @@ module spine {
let timelinesRotation = from.timelinesRotation;
from.totalAlpha = 0;
for (var i = 0; i < timelineCount; i++) {
for (let i = 0; i < timelineCount; i++) {
let timeline = timelines[i];
var direction = MixDirection.out;
var timelineBlend: MixBlend;
var alpha = 0;
let direction = MixDirection.out;
let timelineBlend: MixBlend;
let alpha = 0;
switch (timelineMode[i]) {
case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof AttachmentTimeline) continue;
@ -364,7 +364,7 @@ module spine {
}
// Queue complete if completed a loop iteration or the animation.
var complete = false;
let complete = false;
if (entry.loop)
complete = duration == 0 || trackLastWrapped > entry.trackTime % duration;
else
@ -577,7 +577,7 @@ module spine {
this.propertyIDs.clear();
for (var i = 0, n = this.tracks.length; i < n; i++) {
for (let i = 0, n = this.tracks.length; i < n; i++) {
let entry = this.tracks[i];
if (entry == null) continue;
while (entry.mixingFrom != null)
@ -608,7 +608,7 @@ module spine {
}
outer:
for (var i = 0; i < timelinesCount; i++) {
for (let i = 0; i < timelinesCount; i++) {
let id = timelines[i].getPropertyId();
if (!propertyIDs.add(id))
timelineMode[i] = AnimationState.SUBSEQUENT;
@ -631,7 +631,7 @@ module spine {
hasTimeline (entry: TrackEntry, id: number) : boolean {
let timelines = entry.animation.timelines;
for (var i = 0, n = timelines.length; i < n; i++)
for (let i = 0, n = timelines.length; i < n; i++)
if (timelines[i].getPropertyId() == id) return true;
return false;
}

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

@ -147,15 +147,15 @@ module spine {
this.toLoad++;
AssetManager.downloadText(path, (atlasData: string): void => {
var pagesLoaded: any = { count: 0 };
var atlasPages = new Array<string>();
let pagesLoaded: any = { count: 0 };
let atlasPages = new Array<string>();
try {
let atlas = new spine.TextureAtlas(atlasData, (path: string) => {
let atlas = new TextureAtlas(atlasData, (path: string) => {
atlasPages.push(parent + "/" + path);
let image = document.createElement("img") as HTMLImageElement;
image.width = 16;
image.height = 16;
return new spine.FakeTexture(image);
return new FakeTexture(image);
});
} catch (e) {
let ex = e as Error;
@ -174,7 +174,7 @@ module spine {
if (pagesLoaded.count == atlasPages.length) {
if (!pageLoadError) {
try {
let atlas = new spine.TextureAtlas(atlasData, (path: string) => {
let atlas = new TextureAtlas(atlasData, (path: string) => {
return this.get(parent + "/" + path);
});
this.assets[path] = atlas;

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

@ -185,7 +185,7 @@ module spine {
break outer;
}
}
let minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
let minAngle = MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
let maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
c = -a * l1 / (aa - bb);
if (c >= -1 && c <= 1) {

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

@ -78,7 +78,7 @@ module spine {
let spacing = this.spacing;
if (scale || !percentSpacing) {
if (scale) lengths = Utils.setArraySize(this.lengths, boneCount);
var lengthSpacing = data.spacingMode == SpacingMode.Length;
let lengthSpacing = data.spacingMode == SpacingMode.Length;
for (let i = 0, n = spacesCount - 1; i < n;) {
let bone = bones[i];
let setupLength = bone.data.length;
@ -87,8 +87,8 @@ module spine {
spaces[++i] = 0;
} else if (percentSpacing) {
if (scale) {
var x = setupLength * bone.a, y = setupLength * bone.c;
var length = Math.sqrt(x * x + y * y);
let x = setupLength * bone.a, y = setupLength * bone.c;
let length = Math.sqrt(x * x + y * y);
lengths[i] = length;
}
spaces[++i] = spacing;

18
spine-ts/core/src/SharedAssetManager.ts
View File

@ -40,8 +40,8 @@ module spine {
}
loaded() {
var i = 0;
for (var v in this.assets) i++;
let i = 0;
for (let v in this.assets) i++;
return i;
}
}
@ -58,7 +58,7 @@ module spine {
}
private queueAsset(clientId: string, textureLoader: (image: HTMLImageElement) => any, path: string): boolean {
var clientAssets = this.clientAssets[clientId];
let clientAssets = this.clientAssets[clientId];
if (clientAssets === null || clientAssets === undefined) {
clientAssets = new Assets(clientId);
this.clientAssets[clientId] = clientAssets;
@ -127,17 +127,17 @@ module spine {
get (clientId: string, path: string) {
path = this.pathPrefix + path;
var clientAssets = this.clientAssets[clientId];
let clientAssets = this.clientAssets[clientId];
if (clientAssets === null || clientAssets === undefined) return true;
return clientAssets.assets[path];
}
private updateClientAssets(clientAssets: Assets): void {
for (var i = 0; i < clientAssets.toLoad.length; i++) {
var path = clientAssets.toLoad[i];
var asset = clientAssets.assets[path];
for (let i = 0; i < clientAssets.toLoad.length; i++) {
let path = clientAssets.toLoad[i];
let asset = clientAssets.assets[path];
if (asset === null || asset === undefined) {
var rawAsset = this.rawAssets[path];
let rawAsset = this.rawAssets[path];
if (rawAsset === null || rawAsset === undefined) continue;
if (rawAsset instanceof HTMLImageElement) {
clientAssets.assets[path] = clientAssets.textureLoader(<HTMLImageElement>rawAsset);
@ -149,7 +149,7 @@ module spine {
}
isLoadingComplete (clientId: string): boolean {
var clientAssets = this.clientAssets[clientId];
let clientAssets = this.clientAssets[clientId];
if (clientAssets === null || clientAssets === undefined) return true;
this.updateClientAssets(clientAssets);
return clientAssets.toLoad.length == clientAssets.loaded();

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

@ -45,7 +45,7 @@ module spine {
this.clipAttachment = clip;
let n = clip.worldVerticesLength;
let vertices = spine.Utils.setArraySize(this.clippingPolygon, n);
let vertices = Utils.setArraySize(this.clippingPolygon, n);
clip.computeWorldVertices(slot, 0, n, vertices, 0, 2);
let clippingPolygon = this.clippingPolygon;
SkeletonClipping.makeClockwise(clippingPolygon);
@ -113,7 +113,7 @@ module spine {
let clipOutputCount = clipOutputLength >> 1;
let clipOutputItems = this.clipOutput;
let clippedVerticesItems = spine.Utils.setArraySize(clippedVertices, s + clipOutputCount * vertexSize);
let clippedVerticesItems = Utils.setArraySize(clippedVertices, s + clipOutputCount * vertexSize);
for (let ii = 0; ii < clipOutputLength; ii += 2) {
let x = clipOutputItems[ii], y = clipOutputItems[ii + 1];
clippedVerticesItems[s] = x;
@ -138,7 +138,7 @@ module spine {
}
s = clippedTriangles.length;
let clippedTrianglesItems = spine.Utils.setArraySize(clippedTriangles, s + 3 * (clipOutputCount - 2));
let clippedTrianglesItems = Utils.setArraySize(clippedTriangles, s + 3 * (clipOutputCount - 2));
clipOutputCount--;
for (let ii = 1; ii < clipOutputCount; ii++) {
clippedTrianglesItems[s] = index;
@ -149,7 +149,7 @@ module spine {
index += clipOutputCount + 1;
} else {
let clippedVerticesItems = spine.Utils.setArraySize(clippedVertices, s + 3 * vertexSize);
let clippedVerticesItems = Utils.setArraySize(clippedVertices, s + 3 * vertexSize);
clippedVerticesItems[s] = x1;
clippedVerticesItems[s + 1] = y1;
clippedVerticesItems[s + 2] = light.r;
@ -213,7 +213,7 @@ module spine {
}
s = clippedTriangles.length;
let clippedTrianglesItems = spine.Utils.setArraySize(clippedTriangles, s + 3);
let clippedTrianglesItems = Utils.setArraySize(clippedTriangles, s + 3);
clippedTrianglesItems[s] = index;
clippedTrianglesItems[s + 1] = (index + 1);
clippedTrianglesItems[s + 2] = (index + 2);

6
spine-ts/core/src/Texture.ts
View File

@ -93,9 +93,9 @@ module spine {
originalWidth = 0; originalHeight = 0;
}
export class FakeTexture extends spine.Texture {
setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter) { }
setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap) { }
export class FakeTexture extends Texture {
setFilters(minFilter: TextureFilter, magFilter: TextureFilter) { }
setWraps(uWrap: TextureWrap, vWrap: TextureWrap) { }
dispose() { }
}
}

4
spine-ts/core/src/Utils.ts
View File

@ -155,7 +155,7 @@ module spine {
}
static cbrt (x: number) {
var y = Math.pow(Math.abs(x), 1/3);
let y = Math.pow(Math.abs(x), 1/3);
return x < 0 ? -y : y;
}
@ -341,7 +341,7 @@ module spine {
private frameTime = 0;
update () {
var now = Date.now() / 1000;
let now = Date.now() / 1000;
this.delta = now - this.lastTime;
this.frameTime += this.delta;
this.totalTime += this.delta;

2
spine-ts/core/src/attachments/ClippingAttachment.ts
View File

@ -33,7 +33,7 @@ module spine {
endSlot: SlotData;
// Nonessential.
color = new spine.Color(0.2275, 0.2275, 0.8078, 1); // ce3a3aff
color = new Color(0.2275, 0.2275, 0.8078, 1); // ce3a3aff
constructor (name: string) {
super(name);

24
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp
View File

@ -89,23 +89,25 @@ void USpineSkeletonAnimationComponent::BeginPlay() {
void USpineSkeletonAnimationComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) {
Super::Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
InternalTick(DeltaTime);
InternalTick(DeltaTime, true, TickType == LEVELTICK_ViewportsOnly);
}
void USpineSkeletonAnimationComponent::InternalTick(float DeltaTime, bool CallDelegates) {
void USpineSkeletonAnimationComponent::InternalTick(float DeltaTime, bool CallDelegates, bool Preview) {
CheckState();
if (state && bAutoPlaying) {
if (lastPreviewAnimation != PreviewAnimation) {
if (PreviewAnimation != "") SetAnimation(0, PreviewAnimation, true);
else SetEmptyAnimation(0, 0);
lastPreviewAnimation = PreviewAnimation;
}
if (Preview) {
if (lastPreviewAnimation != PreviewAnimation) {
if (PreviewAnimation != "") SetAnimation(0, PreviewAnimation, true);
else SetEmptyAnimation(0, 0);
lastPreviewAnimation = PreviewAnimation;
}
if (lastPreviewSkin != PreviewSkin) {
if (PreviewSkin != "") SetSkin(PreviewSkin);
else SetSkin("default");
lastPreviewSkin = PreviewSkin;
if (lastPreviewSkin != PreviewSkin) {
if (PreviewSkin != "") SetSkin(PreviewSkin);
else SetSkin("default");
lastPreviewSkin = PreviewSkin;
}
}
state->update(DeltaTime);
state->apply(*skeleton);

2
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonComponent.cpp
View File

@ -258,7 +258,7 @@ void USpineSkeletonComponent::TickComponent (float DeltaTime, ELevelTick TickTyp
InternalTick(DeltaTime);
}
void USpineSkeletonComponent::InternalTick(float DeltaTime, bool CallDelegates) {
void USpineSkeletonComponent::InternalTick(float DeltaTime, bool CallDelegates, bool Preview) {
CheckState();
if (skeleton) {

6
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h
View File

@ -260,10 +260,10 @@ public:
UPROPERTY(BlueprintAssignable, Category="Components|Spine|Animation")
FSpineAnimationDisposeDelegate AnimationDispose;
UPROPERTY(Transient, EditAnywhere, Category=Spine)
UPROPERTY(EditAnywhere, Category=Spine)
FString PreviewAnimation;
UPROPERTY(Transient, EditAnywhere, Category=Spine)
UPROPERTY(EditAnywhere, Category=Spine)
FString PreviewSkin;
// used in C event callback. Needs to be public as we can't call
@ -271,7 +271,7 @@ public:
void GCTrackEntry(UTrackEntry* entry) { trackEntries.Remove(entry); }
protected:
virtual void CheckState () override;
virtual void InternalTick(float DeltaTime, bool CallDelegates = true) override;
virtual void InternalTick(float DeltaTime, bool CallDelegates = true, bool Preview = false) override;
virtual void DisposeState () override;
spine::AnimationState* state;

2
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h
View File

@ -133,7 +133,7 @@ public:
protected:
virtual void CheckState ();
virtual void InternalTick(float DeltaTime, bool CallDelegates = true);
virtual void InternalTick(float DeltaTime, bool CallDelegates = true, bool Preview = false);
virtual void DisposeState ();
spine::Skeleton* skeleton;