* Test update

* Reduced memory-leak
* Back to number tweening while keeping most things later

Author: dalisoft

examples/test.html

@@ -26,18 +26,15 @@
 	<div id="container"></div>
 
 	<script src="../dist/Tween.js"></script>
-	<script src="../../es6-tween-plugins/renderer/index.js"></script>
 	<script>
 		TWEEN.autoPlay(true);
 
 		function random(min, max) {
 			return Math.random() * (max - min) + min;
 		}
 
-		function _self (self) {
-		return function update (v, t) {
-			self.node.style.transform = 'translate3d(' + (((v * 10) | 0) / 10) + 'px, 0px, 0px)';
-		}
+		function update (v) {
+			v.el.style.transform = 'translate3d(' + v.x + 'px, 0px, 0px)';
 		}
 
 		var nodes = [],
@@ -66,8 +63,7 @@
 				//div.style.left = l + 'px';
 				div.style.transform = "translate3d(" + l + "px, 0px, 0px)";
 				div.style.backgroundColor = bgC;
-				var a = new TWEEN.Tween(div, l).to(tl, 1000).easing(TWEEN.Easing.Quadratic.InOut);
-				a.on('update', _self(a)).repeat(Infinity).yoyo(true).start();
+				var a = new TWEEN.Tween({ x : l, el: div }).to({ x: tl }, 1000).on('update', update).easing(TWEEN.Easing.Quadratic.InOut).repeat(Infinity).yoyo(true).start();
 
 				frag.appendChild(div);
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "es6-tween",
-	"version": "3.5.0",
+	"version": "3.5.2",
 	"description": "ES6 implementation of amazing tween.js",
 	"browser": "dist/Tween.min.js",
 	"cdn": "dist/Tween.min.js",

src/dist/NodeCache.js

@@ -1,13 +1,17 @@
 let Store = {}
 export default function (node, tween) {
-  if (!node) return tween
-  if (Store[node]) {
+  if (!node || !node.nodeType) return tween
+  var ID = node.queueID || 'queue_' + Math.round(Math.random() * 1000 + Date.now())
+  if (!node.queueID) {
+    node.queueID = ID
+  }
+  if (Store[ID]) {
     if (tween) {
-      return Object.assign(Store[node], tween)
+      Store[ID] = Object.assign(Store[ID], tween)
     }
-    return Store[node]
+    return Store[ID]
   }
 
-  Store[node] = tween
-  return Store[node]
+  Store[ID] = tween
+  return Store[ID]
 };

src/dist/Tween.js

@@ -40,6 +40,8 @@ class Tween extends EventClass {
         this.object = object
       }
     }
+    let isArr = this.isArr = Array.isArray(object)
+    this._valuesStart = isArr ? [] : {}
     this._valuesEnd = null
 
     this._duration = 1000
@@ -158,15 +160,29 @@ class Tween extends EventClass {
 
     let {
       _valuesEnd,
+      _valuesStart,
       object,
       Renderer
     } = this
 
-    if (typeof _valuesEnd === 'object') {
-      for (let property in _valuesEnd) {
-        if (Plugins[property]) {
-          _valuesEnd[property] = new Plugins[property](this, object[property], _valuesEnd[property])
-        }
+    for (let property in _valuesEnd) {
+      let start = object[property]
+      let end = _valuesEnd[property]
+
+      if (Plugins[property]) {
+        _valuesEnd[property] = new Plugins[property](this, start, end)
+        continue
+      }
+
+      if (object[property] === undefined) {
+        continue
+      }
+
+      if (typeof start === 'number' && typeof end === 'number') {
+        _valuesStart[property] = start
+        _valuesEnd[property] = end
+      } else {
+        _valuesEnd[property] = InterTween(start, end)
       }
     }
 
@@ -254,18 +270,21 @@ class Tween extends EventClass {
 
   reassignValues () {
     const {
+      _valuesStart,
       _valuesEnd,
-      object
+      object,
+      isArr
     } = this
 
-    let v0 = _valuesEnd(0)
-
-    if (typeof v0 === 'object') {
-      let isArr = Array.isArray(v0)
-      for (let property in v0) {
-        if (isArr) property *= 1
-        object[property] = v0[property]
+    for (let property in _valuesEnd) {
+      if (isArr) {
+        property *= 1
       }
+
+      let start = _valuesStart[property]
+      let end = _valuesEnd[property]
+
+      object[property] = typeof end === 'function' ? end(0) : start
     }
 
     return this
@@ -287,6 +306,7 @@ class Tween extends EventClass {
       _reversed,
       _startTime,
       _duration,
+      _valuesStart,
       _valuesEnd,
       object,
       _isFinite,
@@ -295,6 +315,7 @@ class Tween extends EventClass {
 
     let elapsed
     let value
+    let property
 
     time = time !== undefined ? time : now()
 
@@ -306,9 +327,6 @@ class Tween extends EventClass {
       if (!this._rendered) {
         this.render()
         this._rendered = true
-        if (typeof _valuesEnd !== 'function') {
-          this._valuesEnd = _valuesEnd = InterTween(object, _valuesEnd)
-        }
       }
 
       this.emit(EVENT_START, object)
@@ -320,15 +338,24 @@ class Tween extends EventClass {
     elapsed = elapsed > 1 ? 1 : elapsed
     elapsed = _reversed ? 1 - elapsed : elapsed
 
-    value = _easingFunction(elapsed)
+    for (property in _valuesEnd) {
+      value = _easingFunction[property] ? _easingFunction[property](elapsed) : _easingFunction(elapsed)
+
+      let start = _valuesStart[property]
+      let end = _valuesEnd[property]
 
-    object = _valuesEnd(value)
+      if (typeof end === 'number') {
+        object[property] = start + (end - start) * value
+      } else if (typeof end === 'function') {
+        object[property] = end(value)
+      }
+    }
 
     if (__render) {
       __render.update(object, elapsed)
     }
 
-    this.emit(EVENT_UPDATE, object, value, elapsed)
+    this.emit(EVENT_UPDATE, object, elapsed)
 
     if (elapsed === 1 || (_reversed && elapsed === 0)) {
       if (_repeat) {

src/dist/core.js

@@ -25,7 +25,6 @@ const autoPlay = (state) => {
 
 const removeAll = () => {
   _tweens.length = 0
-  _stopTicker(_tick)
 }
 
 const get = tween => {
@@ -47,9 +46,6 @@ const remove = tween => {
   if (i !== -1) {
     _tweens.splice(i, 1)
   }
-  if (!_tweens.length) {
-    _stopTicker(_tick)
-  }
 }
 
 let now = (function () {
@@ -80,16 +76,16 @@ const update = (time, preserve) => {
 
   _tick = _ticker(update)
 
-  const len = _tweens.length
-  if (!len) {
-    isStarted = false
+  if (_tweens.length === 0) {
     _stopTicker(_tick)
+    isStarted = false
     return false
   }
 
   let i = 0
-  for (; i < len; i++) {
+  while (i < _tweens.length) {
     _tweens[i].update(time, preserve)
+    i++
   }
 
   return true