Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-16 01:38:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reset the delta and elapsed for more accurate timing

Browse source
This commit is contained in:
Richard Davey 2022-09-06 18:50:14 +01:00
parent 9fc45df7ac
commit 3aaf9b1dbd
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/tweens/tween/TweenData.js
View file

@ -393,12 +393,9 @@ var TweenData = new Class({
} }
if (this.totalDuration > tween.duration) if (this.totalDuration > tween.duration)
// if (this.t1 > tween.duration)
{ {
// Get the longest TweenData from the Tween, used to calculate the Tween TD // Set the longest duration in the parent Tween
// tween.duration = this.totalDuration; tween.duration = this.totalDuration;
tween.duration = this.t1;
} }
if (this.delay < tween.startDelay) if (this.delay < tween.startDelay)
@ -457,7 +454,7 @@ var TweenData = new Class({
if (this.elapsed <= 0) if (this.elapsed <= 0)
{ {
this.elapsed = Math.abs(this.elapsed); this.elapsed = 0;
this.state = TWEEN_CONST.PENDING_RENDER; this.state = TWEEN_CONST.PENDING_RENDER;
} }
@ -468,13 +465,13 @@ var TweenData = new Class({
if (this.elapsed <= 0) if (this.elapsed <= 0)
{ {
this.elapsed = Math.abs(this.elapsed); // Adjust the delta for the PLAYING_FORWARD block below
this.elapsed = 0;
delta = 0;
this.state = TWEEN_CONST.PLAYING_FORWARD; this.state = TWEEN_CONST.PLAYING_FORWARD;
// Adjust the delta for the PLAYING_FORWARD block below
delta = this.elapsed;
this.dispatchEvent(Events.TWEEN_REPEAT, 'onRepeat'); this.dispatchEvent(Events.TWEEN_REPEAT, 'onRepeat');
} }
} }
@ -484,7 +481,10 @@ var TweenData = new Class({
if (this.elapsed <= 0) if (this.elapsed <= 0)
{ {
this.state = this.setStateFromEnd(Math.abs(this.elapsed)); // This will set elapsed to 0 too
this.state = this.setStateFromEnd(0);
delta = 0;
} }
} }
@ -503,10 +503,14 @@ var TweenData = new Class({
target[key] = this.start; target[key] = this.start;
this.state = TWEEN_CONST.PLAYING_FORWARD; this.state = TWEEN_CONST.PLAYING_FORWARD;
return true;
} }
else else
{ {
this.state = TWEEN_CONST.COMPLETE; this.state = TWEEN_CONST.COMPLETE;
return false;
} }
} }
@ -529,7 +533,7 @@ var TweenData = new Class({
elapsed += delta; elapsed += delta;
if (elapsed > duration) if (elapsed >= duration)
{ {
diff = elapsed - duration; diff = elapsed - duration;
elapsed = duration; elapsed = duration;
@ -552,7 +556,8 @@ var TweenData = new Class({
if (this.hold > 0) if (this.hold > 0)
{ {
this.elapsed = this.hold - diff; // this.elapsed = this.hold - diff;
this.elapsed = this.hold;
this.state = TWEEN_CONST.HOLD_DELAY; this.state = TWEEN_CONST.HOLD_DELAY;
} }
@ -572,7 +577,12 @@ var TweenData = new Class({
} }
else else
{ {
var v = (forward) ? this.ease(progress) : this.ease(1 - progress); if (!forward)
{
progress = 1 - progress;
}
var v = this.ease(progress);
if (this.interpolation) if (this.interpolation)
{ {