@tweenjs/tween.js 22.0.0 → 23.1.0

package/dist/tween.amd.js

@@ -415,6 +415,9 @@ define(['exports'], (function (exports) { 'use strict';
         Tween.prototype.isPaused = function () {
             return this._isPaused;
         };
+        Tween.prototype.getDuration = function () {
+            return this._duration;
+        };
         Tween.prototype.to = function (target, duration) {
             if (duration === void 0) { duration = 1000; }
             if (this._isPlaying)
@@ -675,12 +678,13 @@ define(['exports'], (function (exports) { 'use strict';
          * it is still playing, just paused).
          */
         Tween.prototype.update = function (time, autoStart) {
+            var _this = this;
+            var _a;
             if (time === void 0) { time = now(); }
             if (autoStart === void 0) { autoStart = true; }
             if (this._isPaused)
                 return true;
             var property;
-            var elapsed;
             var endTime = this._startTime + this._duration;
             if (!this._goToEnd && !this._isPlaying) {
                 if (time > endTime)
@@ -704,18 +708,37 @@ define(['exports'], (function (exports) { 'use strict';
                 }
                 this._onEveryStartCallbackFired = true;
             }
-            elapsed = (time - this._startTime) / this._duration;
-            elapsed = this._duration === 0 || elapsed > 1 ? 1 : elapsed;
+            var elapsedTime = time - this._startTime;
+            var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
+            var totalTime = this._duration + this._repeat * durationAndDelay;
+            var calculateElapsedPortion = function () {
+                if (_this._duration === 0)
+                    return 1;
+                if (elapsedTime > totalTime) {
+                    return 1;
+                }
+                var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
+                var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
+                // TODO use %?
+                // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
+                var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
+                if (portion === 0 && elapsedTime === _this._duration) {
+                    return 1;
+                }
+                return portion;
+            };
+            var elapsed = calculateElapsedPortion();
             var value = this._easingFunction(elapsed);
             // properties transformations
             this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
             if (this._onUpdateCallback) {
                 this._onUpdateCallback(this._object, elapsed);
             }
-            if (elapsed === 1) {
+            if (this._duration === 0 || elapsedTime >= this._duration) {
                 if (this._repeat > 0) {
+                    var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
                     if (isFinite(this._repeat)) {
-                        this._repeat--;
+                        this._repeat -= completeCount;
                     }
                     // Reassign starting values, restart by making startTime = now
                     for (property in this._valuesStartRepeat) {
@@ -733,12 +756,7 @@ define(['exports'], (function (exports) { 'use strict';
                     if (this._yoyo) {
                         this._reversed = !this._reversed;
                     }
-                    if (this._repeatDelayTime !== undefined) {
-                        this._startTime = time + this._repeatDelayTime;
-                    }
-                    else {
-                        this._startTime = time + this._delayTime;
-                    }
+                    this._startTime += durationAndDelay * completeCount;
                     if (this._onRepeatCallback) {
                         this._onRepeatCallback(this._object);
                     }
@@ -814,7 +832,7 @@ define(['exports'], (function (exports) { 'use strict';
         return Tween;
     }());
 
-    var VERSION = '22.0.0';
+    var VERSION = '23.1.0';
 
     /**
      * Tween.js - Licensed under the MIT license

package/dist/tween.cjs

@@ -417,6 +417,9 @@ var Tween = /** @class */ (function () {
     Tween.prototype.isPaused = function () {
         return this._isPaused;
     };
+    Tween.prototype.getDuration = function () {
+        return this._duration;
+    };
     Tween.prototype.to = function (target, duration) {
         if (duration === void 0) { duration = 1000; }
         if (this._isPlaying)
@@ -677,12 +680,13 @@ var Tween = /** @class */ (function () {
      * it is still playing, just paused).
      */
     Tween.prototype.update = function (time, autoStart) {
+        var _this = this;
+        var _a;
         if (time === void 0) { time = now(); }
         if (autoStart === void 0) { autoStart = true; }
         if (this._isPaused)
             return true;
         var property;
-        var elapsed;
         var endTime = this._startTime + this._duration;
         if (!this._goToEnd && !this._isPlaying) {
             if (time > endTime)
@@ -706,18 +710,37 @@ var Tween = /** @class */ (function () {
             }
             this._onEveryStartCallbackFired = true;
         }
-        elapsed = (time - this._startTime) / this._duration;
-        elapsed = this._duration === 0 || elapsed > 1 ? 1 : elapsed;
+        var elapsedTime = time - this._startTime;
+        var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
+        var totalTime = this._duration + this._repeat * durationAndDelay;
+        var calculateElapsedPortion = function () {
+            if (_this._duration === 0)
+                return 1;
+            if (elapsedTime > totalTime) {
+                return 1;
+            }
+            var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
+            var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
+            // TODO use %?
+            // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
+            var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
+            if (portion === 0 && elapsedTime === _this._duration) {
+                return 1;
+            }
+            return portion;
+        };
+        var elapsed = calculateElapsedPortion();
         var value = this._easingFunction(elapsed);
         // properties transformations
         this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
         if (this._onUpdateCallback) {
             this._onUpdateCallback(this._object, elapsed);
         }
-        if (elapsed === 1) {
+        if (this._duration === 0 || elapsedTime >= this._duration) {
             if (this._repeat > 0) {
+                var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
                 if (isFinite(this._repeat)) {
-                    this._repeat--;
+                    this._repeat -= completeCount;
                 }
                 // Reassign starting values, restart by making startTime = now
                 for (property in this._valuesStartRepeat) {
@@ -735,12 +758,7 @@ var Tween = /** @class */ (function () {
                 if (this._yoyo) {
                     this._reversed = !this._reversed;
                 }
-                if (this._repeatDelayTime !== undefined) {
-                    this._startTime = time + this._repeatDelayTime;
-                }
-                else {
-                    this._startTime = time + this._delayTime;
-                }
+                this._startTime += durationAndDelay * completeCount;
                 if (this._onRepeatCallback) {
                     this._onRepeatCallback(this._object);
                 }
@@ -816,7 +834,7 @@ var Tween = /** @class */ (function () {
     return Tween;
 }());
 
-var VERSION = '22.0.0';
+var VERSION = '23.1.0';
 
 /**
  * Tween.js - Licensed under the MIT license

package/dist/tween.d.ts

@@ -104,6 +104,7 @@ declare class Tween<T extends UnknownProps> {
     getId(): number;
     isPlaying(): boolean;
     isPaused(): boolean;
+    getDuration(): number;
     to(target: UnknownProps, duration?: number): this;
     duration(duration?: number): this;
     dynamic(dynamic?: boolean): this;
@@ -152,7 +153,7 @@ declare class Sequence {
     static nextId(): number;
 }
 
-declare const VERSION = "22.0.0";
+declare const VERSION = "23.1.0";
 
 declare const nextId: typeof Sequence.nextId;
 declare const getAll: () => Tween<UnknownProps>[];

package/dist/tween.esm.js

@@ -413,6 +413,9 @@ var Tween = /** @class */ (function () {
     Tween.prototype.isPaused = function () {
         return this._isPaused;
     };
+    Tween.prototype.getDuration = function () {
+        return this._duration;
+    };
     Tween.prototype.to = function (target, duration) {
         if (duration === void 0) { duration = 1000; }
         if (this._isPlaying)
@@ -673,12 +676,13 @@ var Tween = /** @class */ (function () {
      * it is still playing, just paused).
      */
     Tween.prototype.update = function (time, autoStart) {
+        var _this = this;
+        var _a;
         if (time === void 0) { time = now(); }
         if (autoStart === void 0) { autoStart = true; }
         if (this._isPaused)
             return true;
         var property;
-        var elapsed;
         var endTime = this._startTime + this._duration;
         if (!this._goToEnd && !this._isPlaying) {
             if (time > endTime)
@@ -702,18 +706,37 @@ var Tween = /** @class */ (function () {
             }
             this._onEveryStartCallbackFired = true;
         }
-        elapsed = (time - this._startTime) / this._duration;
-        elapsed = this._duration === 0 || elapsed > 1 ? 1 : elapsed;
+        var elapsedTime = time - this._startTime;
+        var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
+        var totalTime = this._duration + this._repeat * durationAndDelay;
+        var calculateElapsedPortion = function () {
+            if (_this._duration === 0)
+                return 1;
+            if (elapsedTime > totalTime) {
+                return 1;
+            }
+            var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
+            var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
+            // TODO use %?
+            // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
+            var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
+            if (portion === 0 && elapsedTime === _this._duration) {
+                return 1;
+            }
+            return portion;
+        };
+        var elapsed = calculateElapsedPortion();
         var value = this._easingFunction(elapsed);
         // properties transformations
         this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
         if (this._onUpdateCallback) {
             this._onUpdateCallback(this._object, elapsed);
         }
-        if (elapsed === 1) {
+        if (this._duration === 0 || elapsedTime >= this._duration) {
             if (this._repeat > 0) {
+                var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
                 if (isFinite(this._repeat)) {
-                    this._repeat--;
+                    this._repeat -= completeCount;
                 }
                 // Reassign starting values, restart by making startTime = now
                 for (property in this._valuesStartRepeat) {
@@ -731,12 +754,7 @@ var Tween = /** @class */ (function () {
                 if (this._yoyo) {
                     this._reversed = !this._reversed;
                 }
-                if (this._repeatDelayTime !== undefined) {
-                    this._startTime = time + this._repeatDelayTime;
-                }
-                else {
-                    this._startTime = time + this._delayTime;
-                }
+                this._startTime += durationAndDelay * completeCount;
                 if (this._onRepeatCallback) {
                     this._onRepeatCallback(this._object);
                 }
@@ -812,7 +830,7 @@ var Tween = /** @class */ (function () {
     return Tween;
 }());
 
-var VERSION = '22.0.0';
+var VERSION = '23.1.0';
 
 /**
  * Tween.js - Licensed under the MIT license

package/dist/tween.umd.js

@@ -419,6 +419,9 @@
         Tween.prototype.isPaused = function () {
             return this._isPaused;
         };
+        Tween.prototype.getDuration = function () {
+            return this._duration;
+        };
         Tween.prototype.to = function (target, duration) {
             if (duration === void 0) { duration = 1000; }
             if (this._isPlaying)
@@ -679,12 +682,13 @@
          * it is still playing, just paused).
          */
         Tween.prototype.update = function (time, autoStart) {
+            var _this = this;
+            var _a;
             if (time === void 0) { time = now(); }
             if (autoStart === void 0) { autoStart = true; }
             if (this._isPaused)
                 return true;
             var property;
-            var elapsed;
             var endTime = this._startTime + this._duration;
             if (!this._goToEnd && !this._isPlaying) {
                 if (time > endTime)
@@ -708,18 +712,37 @@
                 }
                 this._onEveryStartCallbackFired = true;
             }
-            elapsed = (time - this._startTime) / this._duration;
-            elapsed = this._duration === 0 || elapsed > 1 ? 1 : elapsed;
+            var elapsedTime = time - this._startTime;
+            var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
+            var totalTime = this._duration + this._repeat * durationAndDelay;
+            var calculateElapsedPortion = function () {
+                if (_this._duration === 0)
+                    return 1;
+                if (elapsedTime > totalTime) {
+                    return 1;
+                }
+                var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
+                var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
+                // TODO use %?
+                // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
+                var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
+                if (portion === 0 && elapsedTime === _this._duration) {
+                    return 1;
+                }
+                return portion;
+            };
+            var elapsed = calculateElapsedPortion();
             var value = this._easingFunction(elapsed);
             // properties transformations
             this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
             if (this._onUpdateCallback) {
                 this._onUpdateCallback(this._object, elapsed);
             }
-            if (elapsed === 1) {
+            if (this._duration === 0 || elapsedTime >= this._duration) {
                 if (this._repeat > 0) {
+                    var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
                     if (isFinite(this._repeat)) {
-                        this._repeat--;
+                        this._repeat -= completeCount;
                     }
                     // Reassign starting values, restart by making startTime = now
                     for (property in this._valuesStartRepeat) {
@@ -737,12 +760,7 @@
                     if (this._yoyo) {
                         this._reversed = !this._reversed;
                     }
-                    if (this._repeatDelayTime !== undefined) {
-                        this._startTime = time + this._repeatDelayTime;
-                    }
-                    else {
-                        this._startTime = time + this._delayTime;
-                    }
+                    this._startTime += durationAndDelay * completeCount;
                     if (this._onRepeatCallback) {
                         this._onRepeatCallback(this._object);
                     }
@@ -818,7 +836,7 @@
         return Tween;
     }());
 
-    var VERSION = '22.0.0';
+    var VERSION = '23.1.0';
 
     /**
      * Tween.js - Licensed under the MIT license

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@tweenjs/tween.js",
 	"description": "Simple and fast tweening engine with optimised Robert Penner's equations.",
-	"version": "22.0.0",
+	"version": "23.1.0",
 	"type": "module",
 	"main": "dist/tween.cjs",
 	"types": "dist/tween.d.ts",