Use the TweenData.index property now. Much cleaner.

photonstorm · photonstorm · commit bf592808f392 · 2019-06-28T18:08:26.000+01:00
diff --git a/src/tweens/tween/Tween.js b/src/tweens/tween/Tween.js
@@ -606,7 +606,7 @@ var Tween = new Class({
             var target = tweenData.target;
             var gen = tweenData.gen;
             var key = tweenData.key;
-            var targetIndex = Math.floor(totalTargets / i);
+            var targetIndex = tweenData.index;
 
             //  Old function signature: i, totalTargets, target
             //  New function signature: target, key, value, index, total, tween
@@ -810,7 +810,7 @@ var Tween = new Class({
 
             var target = tweenData.target;
             var key = tweenData.key;
-            var targetIndex = Math.floor(totalTargets / i);
+            var targetIndex = tweenData.index;
 
             tweenData.progress = 0;
             tweenData.elapsed = 0;
@@ -923,7 +923,7 @@ var Tween = new Class({
             var target = tweenData.target;
             var gen = tweenData.gen;
             var key = tweenData.key;
-            var targetIndex = Math.floor(totalTargets / i);
+            var targetIndex = tweenData.index;
 
             tweenData.progress = 0;
             tweenData.elapsed = 0;
@@ -1162,14 +1162,12 @@ var Tween = new Class({
                 }
 
                 var stillRunning = false;
-                var totalTargets = this.totalTargets;
 
                 for (var i = 0; i < this.totalData; i++)
                 {
                     var tweenData = this.data[i];
-                    var targetIndex = Math.floor(totalTargets / i);
 
-                    if (this.updateTweenData(this, tweenData, delta, targetIndex, totalTargets))
+                    if (this.updateTweenData(this, tweenData, delta))
                     {
                         stillRunning = true;
                     }
@@ -1284,12 +1282,10 @@ var Tween = new Class({
      * @param {Phaser.Tweens.Tween} tween - The Tween to update.
      * @param {Phaser.Types.Tweens.TweenDataConfig} tweenData - The TweenData property to update.
      * @param {number} diff - Any extra time that needs to be accounted for in the elapsed and progress values.
-     * @param {integer} targetIndex - The index of the target within the Tween.
-     * @param {integer} totalTargets - The total number of targets in this Tween.
      *
      * @return {integer} The state of this Tween.
      */
-    setStateFromEnd: function (tween, tweenData, diff, targetIndex, totalTargets)
+    setStateFromEnd: function (tween, tweenData, diff)
     {
         if (tweenData.yoyo)
         {
@@ -1311,7 +1307,7 @@ var Tween = new Class({
 
             this.dispatchTweenDataEvent(Events.TWEEN_YOYO, tween.callbacks.onYoyo, tweenData);
 
-            tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);
+            tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);
 
             return TWEEN_CONST.PLAYING_BACKWARD;
         }
@@ -1336,9 +1332,9 @@ var Tween = new Class({
                 tweenData.target.toggleFlipY();
             }
 
-            tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);
+            tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);
 
-            tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);
+            tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);
 
             //  Delay?
             if (tweenData.repeatDelay > 0)
@@ -1372,12 +1368,10 @@ var Tween = new Class({
      * @param {Phaser.Tweens.Tween} tween - The Tween to update.
      * @param {Phaser.Types.Tweens.TweenDataConfig} tweenData - The TweenData property to update.
      * @param {number} diff - Any extra time that needs to be accounted for in the elapsed and progress values.
-     * @param {integer} targetIndex - The index of the target within the Tween.
-     * @param {integer} totalTargets - The total number of targets in this Tween.
      *
      * @return {integer} The state of this Tween.
      */
-    setStateFromStart: function (tween, tweenData, diff, targetIndex, totalTargets)
+    setStateFromStart: function (tween, tweenData, diff)
     {
         if (tweenData.repeatCounter > 0)
         {
@@ -1397,7 +1391,7 @@ var Tween = new Class({
                 tweenData.target.toggleFlipY();
             }
 
-            tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);
+            tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);
 
             //  Delay?
             if (tweenData.repeatDelay > 0)
@@ -1432,12 +1426,10 @@ var Tween = new Class({
      * @param {Phaser.Tweens.Tween} tween - The Tween to update.
      * @param {Phaser.Types.Tweens.TweenDataConfig} tweenData - The TweenData property to update.
      * @param {number} delta - Either a value in ms, or 1 if Tween.useFrames is true.
-     * @param {integer} targetIndex - The index of the target within the Tween.
-     * @param {integer} totalTargets - The total number of targets in this Tween.
      *
      * @return {boolean} True if the tween is not complete (e.g., playing), or false if the tween is complete.
      */
-    updateTweenData: function (tween, tweenData, delta, targetIndex, totalTargets)
+    updateTweenData: function (tween, tweenData, delta)
     {
         var target = tweenData.target;
 
@@ -1485,15 +1477,15 @@ var Tween = new Class({
                         }
                         else
                         {
-                            tweenData.state = this.setStateFromEnd(tween, tweenData, diff, targetIndex, totalTargets);
+                            tweenData.state = this.setStateFromEnd(tween, tweenData, diff);
                         }
                     }
                     else
                     {
                         tweenData.current = tweenData.start;
                         target[tweenData.key] = tweenData.start;
 
-                        tweenData.state = this.setStateFromStart(tween, tweenData, diff, targetIndex, totalTargets);
+                        tweenData.state = this.setStateFromStart(tween, tweenData, diff);
                     }
                 }
                 else
@@ -1543,7 +1535,7 @@ var Tween = new Class({
 
                 if (tweenData.elapsed <= 0)
                 {
-                    tweenData.state = this.setStateFromEnd(tween, tweenData, Math.abs(tweenData.elapsed), targetIndex, totalTargets);
+                    tweenData.state = this.setStateFromEnd(tween, tweenData, Math.abs(tweenData.elapsed));
                 }
 
                 break;
@@ -1552,9 +1544,9 @@ var Tween = new Class({
 
                 if (target)
                 {
-                    tweenData.start = tweenData.getStartValue(target, tweenData.key, target[tweenData.key], targetIndex, totalTargets, tween);
+                    tweenData.start = tweenData.getStartValue(target, tweenData.key, target[tweenData.key], tweenData.index, tween.totalTargets, tween);
 
-                    tweenData.end = tweenData.getEndValue(target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);
+                    tweenData.end = tweenData.getEndValue(target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);
 
                     tweenData.current = tweenData.start;
 

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ var Tween = new Class({`
`606`	`606`	`var target = tweenData.target;`
`607`	`607`	`var gen = tweenData.gen;`
`608`	`608`	`var key = tweenData.key;`
`609`		`- var targetIndex = Math.floor(totalTargets / i);`
	`609`	`+ var targetIndex = tweenData.index;`
`610`	`610`
`611`	`611`	`// Old function signature: i, totalTargets, target`
`612`	`612`	`// New function signature: target, key, value, index, total, tween`
`@@ -810,7 +810,7 @@ var Tween = new Class({`
`810`	`810`
`811`	`811`	`var target = tweenData.target;`
`812`	`812`	`var key = tweenData.key;`
`813`		`- var targetIndex = Math.floor(totalTargets / i);`
	`813`	`+ var targetIndex = tweenData.index;`
`814`	`814`
`815`	`815`	`tweenData.progress = 0;`
`816`	`816`	`tweenData.elapsed = 0;`
`@@ -923,7 +923,7 @@ var Tween = new Class({`
`923`	`923`	`var target = tweenData.target;`
`924`	`924`	`var gen = tweenData.gen;`
`925`	`925`	`var key = tweenData.key;`
`926`		`- var targetIndex = Math.floor(totalTargets / i);`
	`926`	`+ var targetIndex = tweenData.index;`
`927`	`927`
`928`	`928`	`tweenData.progress = 0;`
`929`	`929`	`tweenData.elapsed = 0;`
`@@ -1162,14 +1162,12 @@ var Tween = new Class({`
`1162`	`1162`	`}`
`1163`	`1163`
`1164`	`1164`	`var stillRunning = false;`
`1165`		`- var totalTargets = this.totalTargets;`
`1166`	`1165`
`1167`	`1166`	`for (var i = 0; i < this.totalData; i++)`
`1168`	`1167`	`{`
`1169`	`1168`	`var tweenData = this.data[i];`
`1170`		`- var targetIndex = Math.floor(totalTargets / i);`
`1171`	`1169`
`1172`		`- if (this.updateTweenData(this, tweenData, delta, targetIndex, totalTargets))`
	`1170`	`+ if (this.updateTweenData(this, tweenData, delta))`
`1173`	`1171`	`{`
`1174`	`1172`	`stillRunning = true;`
`1175`	`1173`	`}`
`@@ -1284,12 +1282,10 @@ var Tween = new Class({`
`1284`	`1282`	`* @param {Phaser.Tweens.Tween} tween - The Tween to update.`
`1285`	`1283`	`* @param {Phaser.Types.Tweens.TweenDataConfig} tweenData - The TweenData property to update.`
`1286`	`1284`	`* @param {number} diff - Any extra time that needs to be accounted for in the elapsed and progress values.`
`1287`		`- * @param {integer} targetIndex - The index of the target within the Tween.`
`1288`		`- * @param {integer} totalTargets - The total number of targets in this Tween.`
`1289`	`1285`	`*`
`1290`	`1286`	`* @return {integer} The state of this Tween.`
`1291`	`1287`	`*/`
`1292`		`- setStateFromEnd: function (tween, tweenData, diff, targetIndex, totalTargets)`
	`1288`	`+ setStateFromEnd: function (tween, tweenData, diff)`
`1293`	`1289`	`{`
`1294`	`1290`	`if (tweenData.yoyo)`
`1295`	`1291`	`{`
`@@ -1311,7 +1307,7 @@ var Tween = new Class({`
`1311`	`1307`
`1312`	`1308`	`this.dispatchTweenDataEvent(Events.TWEEN_YOYO, tween.callbacks.onYoyo, tweenData);`
`1313`	`1309`
`1314`		`- tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);`
	`1310`	`+ tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);`
`1315`	`1311`
`1316`	`1312`	`return TWEEN_CONST.PLAYING_BACKWARD;`
`1317`	`1313`	`}`
`@@ -1336,9 +1332,9 @@ var Tween = new Class({`
`1336`	`1332`	`tweenData.target.toggleFlipY();`
`1337`	`1333`	`}`
`1338`	`1334`
`1339`		`- tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);`
	`1335`	`+ tweenData.start = tweenData.getStartValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);`
`1340`	`1336`
`1341`		`- tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);`
	`1337`	`+ tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);`
`1342`	`1338`
`1343`	`1339`	`// Delay?`
`1344`	`1340`	`if (tweenData.repeatDelay > 0)`
`@@ -1372,12 +1368,10 @@ var Tween = new Class({`
`1372`	`1368`	`* @param {Phaser.Tweens.Tween} tween - The Tween to update.`
`1373`	`1369`	`* @param {Phaser.Types.Tweens.TweenDataConfig} tweenData - The TweenData property to update.`
`1374`	`1370`	`* @param {number} diff - Any extra time that needs to be accounted for in the elapsed and progress values.`
`1375`		`- * @param {integer} targetIndex - The index of the target within the Tween.`
`1376`		`- * @param {integer} totalTargets - The total number of targets in this Tween.`
`1377`	`1371`	`*`
`1378`	`1372`	`* @return {integer} The state of this Tween.`
`1379`	`1373`	`*/`
`1380`		`- setStateFromStart: function (tween, tweenData, diff, targetIndex, totalTargets)`
	`1374`	`+ setStateFromStart: function (tween, tweenData, diff)`
`1381`	`1375`	`{`
`1382`	`1376`	`if (tweenData.repeatCounter > 0)`
`1383`	`1377`	`{`
`@@ -1397,7 +1391,7 @@ var Tween = new Class({`
`1397`	`1391`	`tweenData.target.toggleFlipY();`
`1398`	`1392`	`}`
`1399`	`1393`
`1400`		`- tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);`
	`1394`	`+ tweenData.end = tweenData.getEndValue(tweenData.target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);`
`1401`	`1395`
`1402`	`1396`	`// Delay?`
`1403`	`1397`	`if (tweenData.repeatDelay > 0)`
`@@ -1432,12 +1426,10 @@ var Tween = new Class({`
`1432`	`1426`	`* @param {Phaser.Tweens.Tween} tween - The Tween to update.`
`1433`	`1427`	`* @param {Phaser.Types.Tweens.TweenDataConfig} tweenData - The TweenData property to update.`
`1434`	`1428`	`* @param {number} delta - Either a value in ms, or 1 if Tween.useFrames is true.`
`1435`		`- * @param {integer} targetIndex - The index of the target within the Tween.`
`1436`		`- * @param {integer} totalTargets - The total number of targets in this Tween.`
`1437`	`1429`	`*`
`1438`	`1430`	`* @return {boolean} True if the tween is not complete (e.g., playing), or false if the tween is complete.`
`1439`	`1431`	`*/`
`1440`		`- updateTweenData: function (tween, tweenData, delta, targetIndex, totalTargets)`
	`1432`	`+ updateTweenData: function (tween, tweenData, delta)`
`1441`	`1433`	`{`
`1442`	`1434`	`var target = tweenData.target;`
`1443`	`1435`
`@@ -1485,15 +1477,15 @@ var Tween = new Class({`
`1485`	`1477`	`}`
`1486`	`1478`	`else`
`1487`	`1479`	`{`
`1488`		`- tweenData.state = this.setStateFromEnd(tween, tweenData, diff, targetIndex, totalTargets);`
	`1480`	`+ tweenData.state = this.setStateFromEnd(tween, tweenData, diff);`
`1489`	`1481`	`}`
`1490`	`1482`	`}`
`1491`	`1483`	`else`
`1492`	`1484`	`{`
`1493`	`1485`	`tweenData.current = tweenData.start;`
`1494`	`1486`	`target[tweenData.key] = tweenData.start;`
`1495`	`1487`
`1496`		`- tweenData.state = this.setStateFromStart(tween, tweenData, diff, targetIndex, totalTargets);`
	`1488`	`+ tweenData.state = this.setStateFromStart(tween, tweenData, diff);`
`1497`	`1489`	`}`
`1498`	`1490`	`}`
`1499`	`1491`	`else`
`@@ -1543,7 +1535,7 @@ var Tween = new Class({`
`1543`	`1535`
`1544`	`1536`	`if (tweenData.elapsed <= 0)`
`1545`	`1537`	`{`
`1546`		`- tweenData.state = this.setStateFromEnd(tween, tweenData, Math.abs(tweenData.elapsed), targetIndex, totalTargets);`
	`1538`	`+ tweenData.state = this.setStateFromEnd(tween, tweenData, Math.abs(tweenData.elapsed));`
`1547`	`1539`	`}`
`1548`	`1540`
`1549`	`1541`	`break;`
`@@ -1552,9 +1544,9 @@ var Tween = new Class({`
`1552`	`1544`
`1553`	`1545`	`if (target)`
`1554`	`1546`	`{`
`1555`		`- tweenData.start = tweenData.getStartValue(target, tweenData.key, target[tweenData.key], targetIndex, totalTargets, tween);`
	`1547`	`+ tweenData.start = tweenData.getStartValue(target, tweenData.key, target[tweenData.key], tweenData.index, tween.totalTargets, tween);`
`1556`	`1548`
`1557`		`- tweenData.end = tweenData.getEndValue(target, tweenData.key, tweenData.start, targetIndex, totalTargets, tween);`
	`1549`	`+ tweenData.end = tweenData.getEndValue(target, tweenData.key, tweenData.start, tweenData.index, tween.totalTargets, tween);`
`1558`	`1550`
`1559`	`1551`	`tweenData.current = tweenData.start;`
`1560`	`1552`