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

Trying new flow

Browse source
This commit is contained in:
Richard Davey 2022-08-30 23:45:19 +01:00
parent b352deff83
commit 9eb364e3a2
1 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/tweens/tween/Tween.js
View file

@ -399,6 +399,8 @@ var Tween = new Class({
this.elapsed = 0; this.elapsed = 0;
this.totalElapsed = 0; this.totalElapsed = 0;
console.log('Tween.init', this.duration, 'sd', this.startDelay);
if (!isChained) if (!isChained)
{ {
this.state = TWEEN_CONST.ACTIVE; this.state = TWEEN_CONST.ACTIVE;
@ -449,10 +451,12 @@ var Tween = new Class({
tweenData.totalDuration += (tweenData.t2 * tweenData.repeat); tweenData.totalDuration += (tweenData.t2 * tweenData.repeat);
} }
if (tweenData.totalDuration > maxDuration) // if (tweenData.totalDuration > maxDuration)
if (tweenData.t1 > maxDuration)
{ {
// Get the longest TweenData from the Tween, used to calculate the Tween TD // Get the longest TweenData from the Tween, used to calculate the Tween TD
maxDuration = tweenData.totalDuration; // maxDuration = tweenData.totalDuration;
maxDuration = tweenData.t1;
} }
if (tweenData.delay < minDelay) if (tweenData.delay < minDelay)
@ -467,6 +471,9 @@ var Tween = new Class({
// renders at least 1 frame, but no more, without causing divided by zero errors elsewhere. // renders at least 1 frame, but no more, without causing divided by zero errors elsewhere.
this.duration = Math.max(maxDuration, 0.001); this.duration = Math.max(maxDuration, 0.001);
// How long before this Tween starts playback?
this.startDelay = minDelay;
this.loopCounter = (this.loop === -1) ? 999999999999 : this.loop; this.loopCounter = (this.loop === -1) ? 999999999999 : this.loop;
if (this.loopCounter > 0) if (this.loopCounter > 0)
@ -477,9 +484,6 @@ var Tween = new Class({
{ {
this.totalDuration = this.duration + this.completeDelay; this.totalDuration = this.duration + this.completeDelay;
} }
// How long before this Tween starts playback?
this.startDelay = minDelay;
}, },
/** /**
@ -798,9 +802,6 @@ var Tween = new Class({
onCompleteHandler: function (t) onCompleteHandler: function (t)
{ {
// Additional time overstep may be in 'countdown' or the diff between 'elasped' and 'duration' // Additional time overstep may be in 'countdown' or the diff between 'elasped' and 'duration'
// var diff = Math.max(0, (this.elapsed - this.duration) - this.delta);
var diff = this.elapsed - this.duration; var diff = this.elapsed - this.duration;
if (diff > this.delta) if (diff > this.delta)
@ -808,12 +809,6 @@ var Tween = new Class({
diff -= this.delta; diff -= this.delta;
} }
console.log('end', t);
console.log('elapsed', this.elapsed);
console.log('duration', this.duration);
console.log('delta', this.delta);
console.log('delta diff', diff);
this.dispatchEvent(Events.TWEEN_COMPLETE, this.callbacks.onComplete); this.dispatchEvent(Events.TWEEN_COMPLETE, this.callbacks.onComplete);
// Chain ... // Chain ...
@ -822,9 +817,18 @@ var Tween = new Class({
// this.chainedTween.state = TWEEN_CONST.ACTIVE; // this.chainedTween.state = TWEEN_CONST.ACTIVE;
this.chainedTween.state = TWEEN_CONST.PENDING_ACTIVE; this.chainedTween.state = TWEEN_CONST.PENDING_ACTIVE;
this.chainedTween.delta = diff; this.chainedTween.delta = diff;
console.log('end', t);
console.log('elapsed', this.elapsed);
console.log('---------------------------------------');
}
else
{
console.log('end', t);
console.log('elapsed', this.elapsed);
console.log('duration', this.duration);
console.log('delta', this.delta);
console.log('delta diff', diff);
} }
console.log('-------------------------------------------------------');
}, },
/** /**
@ -1124,7 +1128,7 @@ var Tween = new Class({
this.state = TWEEN_CONST.ACTIVE; this.state = TWEEN_CONST.ACTIVE;
// Override the delta with whatever was left over from the previously chained tween // Override the delta with whatever was left over from the previously chained tween
delta = this.delta; // delta = this.delta;
} }
else if (state === TWEEN_CONST.PENDING_REMOVE || state === TWEEN_CONST.DESTROYED) else if (state === TWEEN_CONST.PENDING_REMOVE || state === TWEEN_CONST.DESTROYED)
{ {
@ -1137,14 +1141,6 @@ var Tween = new Class({
delta *= this.timeScale * this.parent.timeScale; delta *= this.timeScale * this.parent.timeScale;
this.delta = delta;
this.elapsed += delta;
this.progress = Math.min(this.elapsed / this.duration, 1);
this.totalElapsed += delta;
this.totalProgress = Math.min(this.totalElapsed / this.totalDuration, 1);
if (state === TWEEN_CONST.LOOP_DELAY) if (state === TWEEN_CONST.LOOP_DELAY)
{ {
this.updateCountdown(TWEEN_CONST.ACTIVE, Events.TWEEN_LOOP, this.callbacks.onLoop); this.updateCountdown(TWEEN_CONST.ACTIVE, Events.TWEEN_LOOP, this.callbacks.onLoop);
@ -1162,6 +1158,17 @@ var Tween = new Class({
if (this.state === TWEEN_CONST.ACTIVE) if (this.state === TWEEN_CONST.ACTIVE)
{ {
this.updateActive(delta, timestamp); this.updateActive(delta, timestamp);
if (this.hasStarted)
{
this.delta = delta;
this.elapsed += delta;
this.progress = Math.min(this.elapsed / this.duration, 1);
this.totalElapsed += delta;
this.totalProgress = Math.min(this.totalElapsed / this.totalDuration, 1);
}
} }
return (this.state === TWEEN_CONST.PENDING_REMOVE); return (this.state === TWEEN_CONST.PENDING_REMOVE);
@ -1221,9 +1228,9 @@ var Tween = new Class({
this.dispatchEvent(Events.TWEEN_START, this.callbacks.onStart); this.dispatchEvent(Events.TWEEN_START, this.callbacks.onStart);
delta = Math.abs(this.startDelay); // delta = Math.abs(this.startDelay);
console.log('start', t, 'delta adjust', delta); console.log('start', t, 'delta adjust', this.startDelay, 'd', delta);
} }
else else
{ {