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

Clean up, javadoc.

Browse Source
This commit is contained in:
NathanSweet 2016-08-23 18:25:01 +02:00
parent c9fdfdf501
commit 014f229af9
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/AnimationStateTest.java
View File

@ -655,7 +655,7 @@ public class AnimationStateTest {
}
});
setup("resetTrack", // 24
setup("setEmptyAnimation", // 24
expect(0, "start", 0, 0), //
expect(0, "event 0", 0, 0), //
expect(0, "event 14", 0.5f, 0.5f), //
@ -665,7 +665,7 @@ public class AnimationStateTest {
state.addAnimation(0, "events1", false, 0);
run(0.1f, 10, new TestListener() {
public void frame (float time) {
if (MathUtils.isEqual(time, 0.7f)) state.resetTrack(0, 0);
if (MathUtils.isEqual(time, 0.7f)) state.setEmptyAnimation(0, 0);
}
});

47
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -269,26 +269,6 @@ public class AnimationState {
queue.drain();
}
/** Removes all queued animations for all tracks and sets empty animations to mix out the current animations, so any changes
* the current animations have made to skeletons are reverted to the setup pose. */
public void resetTracks (float mixDuration) {
queue.drainDisabled = true;
for (int i = 0, n = tracks.size; i < n; i++)
resetTrack(i, mixDuration);
queue.drainDisabled = false;
queue.drain();
}
/** Removes all queued animations and sets an empty animation to mix out the current animation, so any changes the current
* animation has made to skeletons are reverted to the setup pose. */
public void resetTrack (int trackIndex, float mixDuration) {
if (trackIndex >= tracks.size) return;
TrackEntry current = tracks.get(trackIndex);
if (current == null) return;
setEmptyAnimation(current.trackIndex, mixDuration);
queue.drain();
}
/** @param entry May be null. */
private void disposeNext (TrackEntry entry) {
TrackEntry next = entry.next;
@ -383,7 +363,7 @@ public class AnimationState {
/** Sets the current animation for a track, discarding any queued animations.
* @return A track entry to allow further customization of animation playback. References to the track entry must not be kept
* after {@link AnimationStateListener#end(TrackEntry)}. */
* after {@link AnimationStateListener#dispose(TrackEntry)}. */
public TrackEntry setAnimation (int trackIndex, Animation animation, boolean loop) {
if (animation == null) throw new IllegalArgumentException("animation cannot be null.");
TrackEntry current = expandToIndex(trackIndex);
@ -412,10 +392,10 @@ public class AnimationState {
}
/** Adds an animation to be played after the current or last queued animation for a track.
* @param delay Seconds to begin this animation after the start of the previous animation. May be <= 0 to use duration of the
* previous animation minus any mix duration plus the negative delay.
* @param delay Seconds to begin this animation after the start of the previous animation. May be <= 0 to use the animation
* duration of the previous track minus any mix duration plus the negative delay.
* @return A track entry to allow further customization of animation playback. References to the track entry must not be kept
* after {@link AnimationStateListener#end(TrackEntry)}. */
* after {@link AnimationStateListener#dispose(TrackEntry)}. */
public TrackEntry addAnimation (int trackIndex, Animation animation, boolean loop, float delay) {
if (animation == null) throw new IllegalArgumentException("animation cannot be null.");
@ -445,6 +425,7 @@ public class AnimationState {
return entry;
}
/** Sets an empty animation for a track, discarding any queued animations, and mixes to it over the specified mix duration. */
public TrackEntry setEmptyAnimation (int trackIndex, float mixDuration) {
TrackEntry entry = setAnimation(trackIndex, emptyAnimation, false);
entry.mixDuration = mixDuration;
@ -452,6 +433,12 @@ public class AnimationState {
return entry;
}
/** Adds an empty animation to be played after the current or last queued animation for a track, and mixes to it over the
* specified mix duration.
* @param delay Seconds to begin this animation after the start of the previous animation. May be <= 0 to use the animation
* duration of the previous track minus any mix duration plus the negative delay.
* @return A track entry to allow further customization of animation playback. References to the track entry must not be kept
* after {@link AnimationStateListener#dispose(TrackEntry)}. */
public TrackEntry addEmptyAnimation (int trackIndex, float mixDuration, float delay) {
TrackEntry entry = addAnimation(trackIndex, emptyAnimation, false, delay);
entry.mixDuration = mixDuration;
@ -459,6 +446,18 @@ public class AnimationState {
return entry;
}
/** Sets an empty animation for every tracks, discarding any queued animations, and mixes to it over the specified mix
* duration. */
public void setEmptyAnimations (float mixDuration) {
queue.drainDisabled = true;
for (int i = 0, n = tracks.size; i < n; i++) {
TrackEntry current = tracks.get(i);
if (current != null) setEmptyAnimation(current.trackIndex, mixDuration);
}
queue.drainDisabled = false;
queue.drain();
}
/** @param last May be null. */
private TrackEntry trackEntry (int trackIndex, Animation animation, boolean loop, TrackEntry last) {
TrackEntry entry = trackEntryPool.obtain();

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

@ -503,7 +503,7 @@ public class SkeletonViewer extends ApplicationAdapter {
if (state != null) {
String name = animationList.getSelected();
if (name == null)
state.resetTrack(0, ui.mixSlider.getValue());
state.setEmptyAnimation(0, ui.mixSlider.getValue());
else
setAnimation();
}