UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-09 16:48:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts][libgdx] Fixed TwoColorTimeline ordinal

Browse Source
This commit is contained in:
badlogic 2017-01-26 14:56:05 +01:00
parent be1a2e3cbb
commit 8f99571185
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -638,7 +638,7 @@ public class Animation {
}
public int getPropertyId () {
return (TimelineType.color.ordinal() << 24) + slotIndex;
return (TimelineType.twoColor.ordinal() << 24) + slotIndex;
}
public void setSlotIndex (int index) {

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

@ -446,7 +446,7 @@ var spine;
this.frames = spine.Utils.newFloatArray(frameCount * TwoColorTimeline.ENTRIES);
}
TwoColorTimeline.prototype.getPropertyId = function () {
return (TimelineType.color << 24) + this.slotIndex;
return (TimelineType.twoColor << 24) + this.slotIndex;
};
TwoColorTimeline.prototype.setFrame = function (frameIndex, time, r, g, b, a, r2, g2, b2) {
frameIndex *= TwoColorTimeline.ENTRIES;

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

File diff suppressed because one or more lines are too long

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

@ -502,7 +502,7 @@ module spine {
}
getPropertyId () {
return (TimelineType.color << 24) + this.slotIndex;
return (TimelineType.twoColor << 24) + this.slotIndex;
}
/** Sets the time and value of the specified keyframe. */