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] And another fix for args...

Browse Source
This commit is contained in:
badlogic 2016-10-24 15:14:09 +02:00
parent aa5282b398
commit a4fcc0cdbf
4 changed files with 8547 additions and 8547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,8 +222,8 @@ declare module spine {
clearTracks(): void;
clearTrack(trackIndex: number): void;
setCurrent(index: number, current: TrackEntry): void;
setAnimationByName(trackIndex: number, animationName: string, loop: boolean): TrackEntry;
setAnimation(trackIndex: number, animation: Animation, loop: boolean): TrackEntry;
setAnimation(trackIndex: number, animationName: string, loop: boolean): TrackEntry;
setAnimationWith(trackIndex: number, animation: Animation, loop: boolean): TrackEntry;
addAnimationByName(trackIndex: number, animationName: string, loop: boolean, delay: number): TrackEntry;
addAnimation(trackIndex: number, animation: Animation, loop: boolean, delay: number): TrackEntry;
setEmptyAnimation(trackIndex: number, mixDuration: number): TrackEntry;

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

@ -1175,13 +1175,13 @@ var spine;
}
this.queue.start(current);
};
AnimationState.prototype.setAnimationByName = function (trackIndex, animationName, loop) {
AnimationState.prototype.setAnimation = function (trackIndex, animationName, loop) {
var animation = this.data.skeletonData.findAnimation(animationName);
if (animation == null)
throw new Error("Animation not found: " + animationName);
return this.setAnimation(trackIndex, animation, loop);
return this.setAnimationWith(trackIndex, animation, loop);
};
AnimationState.prototype.setAnimation = function (trackIndex, animation, loop) {
AnimationState.prototype.setAnimationWith = function (trackIndex, animation, loop) {
if (animation == null)
throw new Error("animation cannot be null.");
var current = this.expandToIndex(trackIndex);
@ -1234,7 +1234,7 @@ var spine;
return entry;
};
AnimationState.prototype.setEmptyAnimation = function (trackIndex, mixDuration) {
var entry = this.setAnimation(trackIndex, AnimationState.emptyAnimation, false);
var entry = this.setAnimationWith(trackIndex, AnimationState.emptyAnimation, false);
entry.mixDuration = mixDuration;
entry.trackEnd = mixDuration;
return entry;

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

File diff suppressed because one or more lines are too long

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

@ -361,7 +361,7 @@ module spine {
setAnimation (trackIndex: number, animationName: string, loop: boolean) {
let animation = this.data.skeletonData.findAnimation(animationName);
if (animation == null) throw new Error("Animation not found: " + animationName);
return this.setAnimation(trackIndex, animation, loop);
return this.setAnimationWith(trackIndex, animation, loop);
}
setAnimationWith (trackIndex: number, animation: Animation, loop: boolean) {
@ -420,7 +420,7 @@ module spine {
}
setEmptyAnimation (trackIndex: number, mixDuration: number) {
let entry = this.setAnimation(trackIndex, AnimationState.emptyAnimation, false);
let entry = this.setAnimationWith(trackIndex, AnimationState.emptyAnimation, false);
entry.mixDuration = mixDuration;
entry.trackEnd = mixDuration;
return entry;