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

Clean up.

Browse Source
This commit is contained in:
Nathan Sweet 2021-10-02 03:03:22 -10:00
parent 6e938b32ea
commit 3cb04204f4
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2425,17 +2425,18 @@ public class Animation {
}
/** Changes a slot's {@link Slot#getSequenceIndex()} for an attachment's {@link Sequence}. */
static public class SequenceTimeline<T extends Attachment & HasTextureRegion> extends Timeline implements SlotTimeline {
static public class SequenceTimeline extends Timeline implements SlotTimeline {
static public final int ENTRIES = 3;
static private final int MODE = 1, FRAME_TIME = 2;
static private final int MODE = 1, DELAY = 2;
final int slotIndex;
final T attachment;
final HasTextureRegion attachment;
public SequenceTimeline (int frameCount, int slotIndex, T attachment) {
super(frameCount, Property.sequence.ordinal() + "|" + slotIndex + "|" + attachment.getSequence().getId());
public <T extends Attachment & HasTextureRegion> SequenceTimeline (int frameCount, int slotIndex, Attachment attachment) {
super(frameCount,
Property.sequence.ordinal() + "|" + slotIndex + "|" + ((HasTextureRegion)attachment).getSequence().getId());
this.slotIndex = slotIndex;
this.attachment = attachment;
this.attachment = (HasTextureRegion)attachment;
}
public int getFrameEntries () {
@ -2446,18 +2447,18 @@ public class Animation {
return slotIndex;
}
public T getAttachment () {
return attachment;
public Attachment getAttachment () {
return (Attachment)attachment;
}
/** Sets the time, mode, index, and frame time for the specified frame.
* @param frame Between 0 and <code>frameCount</code>, inclusive.
* @param time The frame time in seconds. */
public void setFrame (int frame, float time, SequenceMode mode, int index, float frameTime) {
* @param time Seconds between frames. */
public void setFrame (int frame, float time, SequenceMode mode, int index, float delay) {
frame *= ENTRIES;
frames[frame] = time;
frames[frame + MODE] = mode.ordinal() | (index << 4);
frames[frame + FRAME_TIME] = frameTime;
frames[frame + DELAY] = delay;
}
public void apply (Skeleton skeleton, float lastTime, float time, @Null Array<Event> events, float alpha, MixBlend blend,
@ -2480,12 +2481,12 @@ public class Animation {
int i = search(frames, time, ENTRIES);
float before = frames[i];
int modeAndIndex = (int)frames[i + MODE];
float frameTime = frames[i + FRAME_TIME];
float delay = frames[i + DELAY];
int index = modeAndIndex >> 4, count = attachment.getSequence().getRegions().length;
SequenceMode mode = SequenceMode.values[modeAndIndex & 0xf];
if (mode != SequenceMode.stop) {
index += (time - before) / frameTime;
index += (time - before) / delay;
switch (mode) {
case play:
index = Math.min(count - 1, index);

6
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/Sequence.java
View File

@ -58,10 +58,8 @@ public class Sequence {
public <T extends Attachment & HasTextureRegion> void apply (Slot slot, T attachment) {
int index = slot.getSequenceIndex();
if (index == -1)
index = setupIndex;
else if (index >= regions.length) //
index = regions.length - 1;
if (index == -1) index = setupIndex;
if (index >= regions.length) index = regions.length - 1;
TextureRegion region = regions[index];
if (attachment.getRegion() != region) {
attachment.setRegion(region);