UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[haxe] port of commit 4a351ce: Fixed delay being negative, causing the track time to jump. See #2837.

Browse Source
This commit is contained in:
Davide Tantillo 2025-05-07 17:53:18 +02:00
parent c516c9a5cd
commit 24529f5cd1
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spine-haxe/spine-haxe/spine/animation/AnimationState.hx
View File

@ -594,11 +594,11 @@ class AnimationState {
if (last == null) { if (last == null) {
setCurrent(trackIndex, entry, true); setCurrent(trackIndex, entry, true);
queue.drain(); queue.drain();
if (delay < 0) delay = 0;
} else { } else {
last.next = entry; last.next = entry;
entry.previous = last; entry.previous = last;
if (delay <= 0) if (delay <= 0) delay = Math.max(delay + last.getTrackComplete() - entry.mixDuration, 0);
delay += last.getTrackComplete() - entry.mixDuration;
} }
entry.delay = delay; entry.delay = delay;
@ -614,8 +614,7 @@ class AnimationState {
public function addEmptyAnimation(trackIndex:Int, mixDuration:Float, delay:Float):TrackEntry { public function addEmptyAnimation(trackIndex:Int, mixDuration:Float, delay:Float):TrackEntry {
var entry:TrackEntry = addAnimation(trackIndex, emptyAnimation, false, delay); var entry:TrackEntry = addAnimation(trackIndex, emptyAnimation, false, delay);
if (delay <= 0) if (delay <= 0) entry.delay = Math.max(entry.delay + entry.mixDuration - mixDuration, 0);
entry.delay += entry.mixDuration - mixDuration;
entry.mixDuration = mixDuration; entry.mixDuration = mixDuration;
entry.trackEnd = mixDuration; entry.trackEnd = mixDuration;
return entry; return entry;

39
spine-haxe/spine-haxe/spine/animation/TrackEntry.hx
View File

@ -56,7 +56,20 @@ class TrackEntry implements Poolable {
public var animationEnd:Float = 0; public var animationEnd:Float = 0;
public var animationLast:Float = 0; public var animationLast:Float = 0;
public var nextAnimationLast:Float = 0; public var nextAnimationLast:Float = 0;
public var delay:Float = 0;
/** Seconds to postpone playing the animation. Must be >= 0. When this track entry is the current track entry,
* <code>delay</code> postpones incrementing the {@link #getTrackTime()}. When this track entry is queued,
* <code>delay</code> is the time from the start of the previous animation to when this track entry will become the current
* track entry (ie when the previous track entry {@link TrackEntry#getTrackTime()} >= this track entry's
* <code>delay</code>).
* <p>
* {@link #getTimeScale()} affects the delay.
* <p>
* When passing <code>delay</code> <= 0 to {@link AnimationState#addAnimation(int, Animation, boolean, float)} this
* <code>delay</code> is set using a mix duration from {@link AnimationStateData}. To change the {@link #getMixDuration()}
* afterward, use {@link #setMixDuration(float, float)} so this <code>delay</code> is adjusted. */
public var delay(default, set):Float = 0;
public var trackTime:Float = 0; public var trackTime:Float = 0;
public var trackLast:Float = 0; public var trackLast:Float = 0;
public var nextTrackLast:Float = 0; public var nextTrackLast:Float = 0;
@ -64,7 +77,7 @@ class TrackEntry implements Poolable {
public var timeScale:Float = 0; public var timeScale:Float = 0;
public var alpha:Float = 0; public var alpha:Float = 0;
public var mixTime:Float = 0; public var mixTime:Float = 0;
@:isVar public var mixDuration(get, set):Float = 0; public var mixDuration:Float = 0;
public var interruptAlpha:Float = 0; public var interruptAlpha:Float = 0;
public var totalAlpha:Float = 0; public var totalAlpha:Float = 0;
public var mixBlend:MixBlend = MixBlend.replace; public var mixBlend:MixBlend = MixBlend.replace;
@ -73,14 +86,9 @@ class TrackEntry implements Poolable {
public var timelinesRotation:Array<Float> = new Array<Float>(); public var timelinesRotation:Array<Float> = new Array<Float>();
public var shortestRotation = false; public var shortestRotation = false;
function get_mixDuration():Float { function set_delay(delay:Float):Float {
return mixDuration; if (delay < 0) throw new SpineException("delay must be >= 0.");
} return this.delay = delay;
function set_mixDuration(mixDuration:Float):Float {
this.mixDuration = mixDuration;
if (previous != null && delay <= 0) delay += previous.getTrackComplete() - mixDuration;
return mixDuration;
} }
public function new() {} public function new() {}
@ -142,4 +150,15 @@ class TrackEntry implements Poolable {
public function resetRotationDirection():Void { public function resetRotationDirection():Void {
timelinesRotation.resize(0); timelinesRotation.resize(0);
} }
public function setMixDurationWithDelay(mixDuration:Float):Float {
this.mixDuration = mixDuration;
if (delay <= 0) {
if (this.previous != null)
delay = Math.max(delay + this.previous.getTrackComplete() - mixDuration, 0);
else
delay = 0;
}
return mixDuration;
}
} }