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

[ts] Fix for clearTracks, see #805

Browse Source
This commit is contained in:
badlogic 2016-12-15 13:34:54 +01:00
parent fe33e912c6
commit 05ba66efe0
13 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1534,11 +1534,12 @@ var spine;
} }
}; };
AnimationState.prototype.clearTracks = function () { AnimationState.prototype.clearTracks = function () {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) for (var i = 0, n = this.tracks.length; i < n; i++)
this.clearTrack(i); this.clearTrack(i);
this.tracks.length = 0; this.tracks.length = 0;
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.clearTrack = function (trackIndex) { AnimationState.prototype.clearTrack = function (trackIndex) {
@ -1650,13 +1651,14 @@ var spine;
return entry; return entry;
}; };
AnimationState.prototype.setEmptyAnimations = function (mixDuration) { AnimationState.prototype.setEmptyAnimations = function (mixDuration) {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) { for (var i = 0, n = this.tracks.length; i < n; i++) {
var current = this.tracks[i]; var current = this.tracks[i];
if (current != null) if (current != null)
this.setEmptyAnimation(current.trackIndex, mixDuration); this.setEmptyAnimation(current.trackIndex, mixDuration);
} }
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.expandToIndex = function (index) { AnimationState.prototype.expandToIndex = function (index) {

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.js
View File

@ -1534,11 +1534,12 @@ var spine;
} }
}; };
AnimationState.prototype.clearTracks = function () { AnimationState.prototype.clearTracks = function () {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) for (var i = 0, n = this.tracks.length; i < n; i++)
this.clearTrack(i); this.clearTrack(i);
this.tracks.length = 0; this.tracks.length = 0;
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.clearTrack = function (trackIndex) { AnimationState.prototype.clearTrack = function (trackIndex) {
@ -1650,13 +1651,14 @@ var spine;
return entry; return entry;
}; };
AnimationState.prototype.setEmptyAnimations = function (mixDuration) { AnimationState.prototype.setEmptyAnimations = function (mixDuration) {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) { for (var i = 0, n = this.tracks.length; i < n; i++) {
var current = this.tracks[i]; var current = this.tracks[i];
if (current != null) if (current != null)
this.setEmptyAnimation(current.trackIndex, mixDuration); this.setEmptyAnimation(current.trackIndex, mixDuration);
} }
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.expandToIndex = function (index) { AnimationState.prototype.expandToIndex = function (index) {

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.js
View File

@ -1187,11 +1187,12 @@ var spine;
} }
}; };
AnimationState.prototype.clearTracks = function () { AnimationState.prototype.clearTracks = function () {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) for (var i = 0, n = this.tracks.length; i < n; i++)
this.clearTrack(i); this.clearTrack(i);
this.tracks.length = 0; this.tracks.length = 0;
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.clearTrack = function (trackIndex) { AnimationState.prototype.clearTrack = function (trackIndex) {
@ -1303,13 +1304,14 @@ var spine;
return entry; return entry;
}; };
AnimationState.prototype.setEmptyAnimations = function (mixDuration) { AnimationState.prototype.setEmptyAnimations = function (mixDuration) {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) { for (var i = 0, n = this.tracks.length; i < n; i++) {
var current = this.tracks[i]; var current = this.tracks[i];
if (current != null) if (current != null)
this.setEmptyAnimation(current.trackIndex, mixDuration); this.setEmptyAnimation(current.trackIndex, mixDuration);
} }
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.expandToIndex = function (index) { AnimationState.prototype.expandToIndex = function (index) {

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-threejs.js
View File

@ -1187,11 +1187,12 @@ var spine;
} }
}; };
AnimationState.prototype.clearTracks = function () { AnimationState.prototype.clearTracks = function () {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) for (var i = 0, n = this.tracks.length; i < n; i++)
this.clearTrack(i); this.clearTrack(i);
this.tracks.length = 0; this.tracks.length = 0;
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.clearTrack = function (trackIndex) { AnimationState.prototype.clearTrack = function (trackIndex) {
@ -1303,13 +1304,14 @@ var spine;
return entry; return entry;
}; };
AnimationState.prototype.setEmptyAnimations = function (mixDuration) { AnimationState.prototype.setEmptyAnimations = function (mixDuration) {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) { for (var i = 0, n = this.tracks.length; i < n; i++) {
var current = this.tracks[i]; var current = this.tracks[i];
if (current != null) if (current != null)
this.setEmptyAnimation(current.trackIndex, mixDuration); this.setEmptyAnimation(current.trackIndex, mixDuration);
} }
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.expandToIndex = function (index) { AnimationState.prototype.expandToIndex = function (index) {

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.js
View File

@ -1187,11 +1187,12 @@ var spine;
} }
}; };
AnimationState.prototype.clearTracks = function () { AnimationState.prototype.clearTracks = function () {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) for (var i = 0, n = this.tracks.length; i < n; i++)
this.clearTrack(i); this.clearTrack(i);
this.tracks.length = 0; this.tracks.length = 0;
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.clearTrack = function (trackIndex) { AnimationState.prototype.clearTrack = function (trackIndex) {
@ -1303,13 +1304,14 @@ var spine;
return entry; return entry;
}; };
AnimationState.prototype.setEmptyAnimations = function (mixDuration) { AnimationState.prototype.setEmptyAnimations = function (mixDuration) {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) { for (var i = 0, n = this.tracks.length; i < n; i++) {
var current = this.tracks[i]; var current = this.tracks[i];
if (current != null) if (current != null)
this.setEmptyAnimation(current.trackIndex, mixDuration); this.setEmptyAnimation(current.trackIndex, mixDuration);
} }
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.expandToIndex = function (index) { AnimationState.prototype.expandToIndex = function (index) {

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

File diff suppressed because one or more lines are too long

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

@ -1187,11 +1187,12 @@ var spine;
} }
}; };
AnimationState.prototype.clearTracks = function () { AnimationState.prototype.clearTracks = function () {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) for (var i = 0, n = this.tracks.length; i < n; i++)
this.clearTrack(i); this.clearTrack(i);
this.tracks.length = 0; this.tracks.length = 0;
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.clearTrack = function (trackIndex) { AnimationState.prototype.clearTrack = function (trackIndex) {
@ -1303,13 +1304,14 @@ var spine;
return entry; return entry;
}; };
AnimationState.prototype.setEmptyAnimations = function (mixDuration) { AnimationState.prototype.setEmptyAnimations = function (mixDuration) {
var oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (var i = 0, n = this.tracks.length; i < n; i++) { for (var i = 0, n = this.tracks.length; i < n; i++) {
var current = this.tracks[i]; var current = this.tracks[i];
if (current != null) if (current != null)
this.setEmptyAnimation(current.trackIndex, mixDuration); this.setEmptyAnimation(current.trackIndex, mixDuration);
} }
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
}; };
AnimationState.prototype.expandToIndex = function (index) { AnimationState.prototype.expandToIndex = function (index) {

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

File diff suppressed because one or more lines are too long

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

@ -307,11 +307,12 @@ module spine {
} }
clearTracks () { clearTracks () {
let oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (let i = 0, n = this.tracks.length; i < n; i++) for (let i = 0, n = this.tracks.length; i < n; i++)
this.clearTrack(i); this.clearTrack(i);
this.tracks.length = 0; this.tracks.length = 0;
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
} }
@ -435,12 +436,13 @@ module spine {
} }
setEmptyAnimations (mixDuration: number) { setEmptyAnimations (mixDuration: number) {
let oldDrainDisabled = this.queue.drainDisabled;
this.queue.drainDisabled = true; this.queue.drainDisabled = true;
for (let i = 0, n = this.tracks.length; i < n; i++) { for (let i = 0, n = this.tracks.length; i < n; i++) {
let current = this.tracks[i]; let current = this.tracks[i];
if (current != null) this.setEmptyAnimation(current.trackIndex, mixDuration); if (current != null) this.setEmptyAnimation(current.trackIndex, mixDuration);
} }
this.queue.drainDisabled = false; this.queue.drainDisabled = oldDrainDisabled;
this.queue.drain(); this.queue.drain();
} }