Merge pull request #367 from Animatron/refactor-timing

Refactor timing: Code review issues, masks refactoring in progress
Animatron · Dec 17, 2015 · 8eb2285 · 8eb2285
2 parents 83cd314 + e558ce6
commit 8eb2285
Show file tree

Hide file tree

Showing 10 changed files with 208 additions and 211 deletions.
diff --git a/src/anm/animation/animation.js b/src/anm/animation/animation.js
@@ -72,7 +72,7 @@ function Animation() {
     //this.fps = undefined;
     this.__lastOverElm = null;
     this._laters = [];
-    this.time = new Timeline(this);
+    this.timeline = new Timeline(this);
 
     var defaultScene = new Scene(this, '', 0);
     this.scenes = [];
@@ -139,7 +139,7 @@ Animation.prototype.addScene = function(name, duration) {
 };
 
 Animation.prototype.getDuration = function() {
-    return this.time.getDuration();
+    return this.timeline.getDuration();
 };
 
 /*Animation.prototype.getTotalDurationFromScenes = function() {
@@ -202,9 +202,9 @@ Animation.prototype.traverse = function(visitor, data) {
  * @param {Object} [data]
  */
 Animation.prototype.traverseVisible = function(visitor, data) {
-    if (this.currentScene && this.currentScene.time.fits()) {
+    if (this.currentScene && this.currentScene.isActive()) {
         this.currentScene.traverse(function(child) {
-            return (child.time.fits() && (visitor(child, data) === false)) ? false : true;
+            return (child.isActive() && (visitor(child, data) === false)) ? false : true;
         });
     }
     return this;
@@ -225,9 +225,9 @@ Animation.prototype.traverseVisible = function(visitor, data) {
  * @param {Object} [data]
  */
 Animation.prototype.reverseTraverseVisible = function(visitor, data) {
-    if (this.currentScene && this.currentScene.time.fits()) {
+    if (this.currentScene && this.currentScene.isActive()) {
         this.currentScene.reverseTraverse(function(child) {
-            return (child.time.fits() && (visitor(child, data) === false)) ? false : true;
+            return (child.isActive() && (visitor(child, data) === false)) ? false : true;
         });
     }
     return this;
@@ -317,10 +317,10 @@ Animation.prototype.render = function(ctx) {
 };
 
 Animation.prototype.tick = function(dt) {
-    var curSceneTime = this.currentScene.time;
-    if ((curSceneTime.pos + dt) < curSceneTime.duration) {
-        this.currentScene.tick(dt);
-        this.time.tick(dt);
+    var currentScene = this.currentScene;
+    if ((currentScene.getTime() + dt) < currentScene.getDuration()) {
+        currentScene.tick(dt);
+        this.timeline.tick(dt);
     } else {
         this._changeToNextScene(dt);
     }
@@ -329,26 +329,25 @@ Animation.prototype.tick = function(dt) {
 Animation.prototype._changeToNextScene = function(dt) {
     var nextScene = (this.currentSceneIdx < this.scenes.length)
                     ? this.scenes[this.currentSceneIdx + 1] : null;
+    var currentScene = this.currentScene;
+    var left = (currentScene.getDuration() - currentScene.getTime());
+    currentScene.tick(left);
     if (nextScene) {
-        var currentSceneTime = this.currentScene.time;
-        var left = (currentSceneTime.duration - currentSceneTime.pos);
-        this.currentScene.tick(left);
         this.currentSceneIdx++;
         this.currentScene = nextScene;
         this.currentScene.tick(dt - left); // tick the remainder in the next scene
     } else {
-        this.currentScene.tick(dt);
-        if (this.endOnLastScene) this.time.endNow();
+        if (this.endOnLastScene) this.timeline.endNow();
     }
 };
 
 Animation.prototype.pause = function() {
-    this.time.pause();
+    this.timeline.pause();
     this.currentScene.pause();
 };
 
 Animation.prototype.continue = function() {
-    this.time.continue();
+    this.timeline.continue();
     this.currentScene.continue();
 };
 
@@ -363,7 +362,7 @@ Animation.prototype.continue = function() {
  */
 Animation.prototype.jump = function(t) {
     var prev_time = this.getTime();
-    this.time.jump(t);
+    this.timeline.jump(t);
     this.goToSceneAt(t);
 };
 
@@ -379,31 +378,31 @@ Animation.prototype.jump = function(t) {
 Animation.prototype.jumpTo = function(selector) {
     var elm = is.str(selector) ? this.find(selector) : selector;
     if (!elm) return;
-    //this.jump(elm.time.getGlobalStart());
+    //this.jump(elm.timeline.getGlobalStart());
     if (elm instanceof Scene) {
         this.goToScene(elm);
     } else {
-        this.time.jumpTo(elm);
+        this.timeline.jumpTo(elm);
         this.goToSceneAt(this.getTime());
     }
 };
 
 Animation.prototype.jumpToStart = function() {
-    this.time.jumpToStart();
+    this.timeline.jumpToStart();
     this.setCurrentScene(0);
     this.currentScene.jumpToStart();
 };
 
 Animation.prototype.getTime = function() {
-    return this.time.getLastPosition();
+    return this.timeline.getLastPosition();
 };
 
 Animation.prototype.setDuration = function(duration) {
-    this.time.setDuration(duration);
+    this.timeline.setDuration(duration);
 };
 
 Animation.prototype.setSpeed = function(speed) {
-    this.time.setSpeed(speed);
+    this.timeline.setSpeed(speed);
 };
 
 Animation.prototype.goToScene = function(scene) {
@@ -421,8 +420,8 @@ Animation.prototype.goToSceneAt = function(t) {
         var loc_t = t;
         var i = 0,
             cursor = this.scenes[i];
-        while (/*(i < this.scenes.length) && */cursor && (loc_t > cursor.time.duration)) {
-            loc_t = loc_t - cursor.time.duration;
+        while (/*(i < this.scenes.length) && */cursor && (loc_t > cursor.timeline.getDuration())) {
+            loc_t = loc_t - cursor.timeline.getDuration();
             i++; cursor = this.scenes[i];
         }
         if (cursor) {
@@ -445,7 +444,7 @@ Animation.prototype.goToSceneAt = function(t) {
  * Reset all render-related data for itself, and the data of all the elements.
  */
 Animation.prototype.reset = function() {
-    this.time.reset();
+    this.timeline.reset();
     this.eachScene(function(scene) {
         scene.reset();
     });