UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-28 20:51:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Closes #1065, make key pairs for mixing data unique

Browse Source
This commit is contained in:
badlogic 2018-01-12 10:34:03 +01:00
parent 4416582216
commit 4f4a4e8dce
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1862,11 +1862,11 @@ var spine;
throw new Error("from cannot be null."); throw new Error("from cannot be null.");
if (to == null) if (to == null)
throw new Error("to cannot be null."); throw new Error("to cannot be null.");
var key = from.name + to.name; var key = from.name + "." + to.name;
this.animationToMixTime[key] = duration; this.animationToMixTime[key] = duration;
}; };
AnimationStateData.prototype.getMix = function (from, to) { AnimationStateData.prototype.getMix = function (from, to) {
var key = from.name + to.name; var key = from.name + "." + to.name;
var value = this.animationToMixTime[key]; var value = this.animationToMixTime[key];
return value === undefined ? this.defaultMix : value; return value === undefined ? this.defaultMix : value;
}; };

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

File diff suppressed because one or more lines are too long

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

@ -1862,11 +1862,11 @@ var spine;
throw new Error("from cannot be null."); throw new Error("from cannot be null.");
if (to == null) if (to == null)
throw new Error("to cannot be null."); throw new Error("to cannot be null.");
var key = from.name + to.name; var key = from.name + "." + to.name;
this.animationToMixTime[key] = duration; this.animationToMixTime[key] = duration;
}; };
AnimationStateData.prototype.getMix = function (from, to) { AnimationStateData.prototype.getMix = function (from, to) {
var key = from.name + to.name; var key = from.name + "." + to.name;
var value = this.animationToMixTime[key]; var value = this.animationToMixTime[key];
return value === undefined ? this.defaultMix : value; return value === undefined ? this.defaultMix : value;
}; };

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

File diff suppressed because one or more lines are too long

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

@ -1862,11 +1862,11 @@ var spine;
throw new Error("from cannot be null."); throw new Error("from cannot be null.");
if (to == null) if (to == null)
throw new Error("to cannot be null."); throw new Error("to cannot be null.");
var key = from.name + to.name; var key = from.name + "." + to.name;
this.animationToMixTime[key] = duration; this.animationToMixTime[key] = duration;
}; };
AnimationStateData.prototype.getMix = function (from, to) { AnimationStateData.prototype.getMix = function (from, to) {
var key = from.name + to.name; var key = from.name + "." + to.name;
var value = this.animationToMixTime[key]; var value = this.animationToMixTime[key];
return value === undefined ? this.defaultMix : value; return value === undefined ? this.defaultMix : value;
}; };

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

File diff suppressed because one or more lines are too long

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

@ -1862,11 +1862,11 @@ var spine;
throw new Error("from cannot be null."); throw new Error("from cannot be null.");
if (to == null) if (to == null)
throw new Error("to cannot be null."); throw new Error("to cannot be null.");
var key = from.name + to.name; var key = from.name + "." + to.name;
this.animationToMixTime[key] = duration; this.animationToMixTime[key] = duration;
}; };
AnimationStateData.prototype.getMix = function (from, to) { AnimationStateData.prototype.getMix = function (from, to) {
var key = from.name + to.name; var key = from.name + "." + to.name;
var value = this.animationToMixTime[key]; var value = this.animationToMixTime[key];
return value === undefined ? this.defaultMix : value; return value === undefined ? this.defaultMix : value;
}; };

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

File diff suppressed because one or more lines are too long

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

@ -1862,11 +1862,11 @@ var spine;
throw new Error("from cannot be null."); throw new Error("from cannot be null.");
if (to == null) if (to == null)
throw new Error("to cannot be null."); throw new Error("to cannot be null.");
var key = from.name + to.name; var key = from.name + "." + to.name;
this.animationToMixTime[key] = duration; this.animationToMixTime[key] = duration;
}; };
AnimationStateData.prototype.getMix = function (from, to) { AnimationStateData.prototype.getMix = function (from, to) {
var key = from.name + to.name; var key = from.name + "." + to.name;
var value = this.animationToMixTime[key]; var value = this.animationToMixTime[key];
return value === undefined ? this.defaultMix : value; return value === undefined ? this.defaultMix : value;
}; };

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

File diff suppressed because one or more lines are too long

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

@ -1862,11 +1862,11 @@ var spine;
throw new Error("from cannot be null."); throw new Error("from cannot be null.");
if (to == null) if (to == null)
throw new Error("to cannot be null."); throw new Error("to cannot be null.");
var key = from.name + to.name; var key = from.name + "." + to.name;
this.animationToMixTime[key] = duration; this.animationToMixTime[key] = duration;
}; };
AnimationStateData.prototype.getMix = function (from, to) { AnimationStateData.prototype.getMix = function (from, to) {
var key = from.name + to.name; var key = from.name + "." + to.name;
var value = this.animationToMixTime[key]; var value = this.animationToMixTime[key];
return value === undefined ? this.defaultMix : value; return value === undefined ? this.defaultMix : value;
}; };

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

File diff suppressed because one or more lines are too long

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

@ -50,12 +50,12 @@ module spine {
setMixWith (from: Animation, to: Animation, duration: number) { setMixWith (from: Animation, to: Animation, duration: number) {
if (from == null) throw new Error("from cannot be null."); if (from == null) throw new Error("from cannot be null.");
if (to == null) throw new Error("to cannot be null."); if (to == null) throw new Error("to cannot be null.");
let key = from.name + to.name; let key = from.name + "." + to.name;
this.animationToMixTime[key] = duration; this.animationToMixTime[key] = duration;
} }
getMix (from: Animation, to: Animation) { getMix (from: Animation, to: Animation) {
let key = from.name + to.name; let key = from.name + "." + to.name;
let value = this.animationToMixTime[key]; let value = this.animationToMixTime[key];
return value === undefined ? this.defaultMix : value; return value === undefined ? this.defaultMix : value;
} }