@luceosports/play-rendering 1.11.18 → 1.11.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luceosports/play-rendering",
-  "version": "1.11.18",
+  "version": "1.11.19",
   "description": "",
   "main": "dist/play-rendering.js",
   "scripts": {

package/src/layers/line/index.js

@@ -1,11 +1,11 @@
-// require all modules on the path and with the pattern defined
-const req = require.context('./layers/', true, /.js$/);
-
-const modules = {};
-
-req.keys().forEach(key => {
-  const mname = key.replace('./', '').replace('.js', '');
-  modules[mname] = req(key);
-});
-
-module.exports = modules;
+// require all modules on the path and with the pattern defined
+const req = require.context('./layers/', true, /.js$/);
+
+const modules = {};
+
+req.keys().forEach(key => {
+  const mname = key.replace('./', '').replace('.js', '');
+  modules[mname] = req(key);
+});
+
+module.exports = modules;

package/src/models/Animation.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const config = require('../config');
 const Frame = require('./Frame');
+const Line = require('./Line');
 
 class Animation {
   constructor(ctx, play) {
@@ -50,13 +51,11 @@ class Animation {
     return result;
   }
 
-  get linePhaseIntervalMax() {
-    const maxPhase = _.max(Object.keys(this.linesPhaseIntervals));
-    return this.linesPhaseIntervals[maxPhase] ? this.linesPhaseIntervals[maxPhase].max : 0;
-  }
-
-  get linePhaseIntervalMaxRounded() {
-    return this.linePhaseIntervalMax;
+  get lastLineAnimationMax() {
+    return this.play.playData.lines.reduce((result, line) => {
+      const lineModel = new Line(line);
+      return result > lineModel.lastAnimEndTime ? result : lineModel.lastAnimEndTime;
+    }, 0);
   }
 
   start(finishCallback, progressCallback) {
@@ -106,8 +105,8 @@ class Animation {
   drawFrame(finishCallback, progressCallback, timestamp) {
     if (!this.running) return;
 
-    if (this.globalProgress >= this.linePhaseIntervalMaxRounded) {
-      progressCallback(this.linePhaseIntervalMaxRounded);
+    if (this.globalProgress >= this.lastLineAnimationMax) {
+      progressCallback(this.lastLineAnimationMax);
       this.reset();
       cancelAnimationFrame(this.loopId);
       setTimeout(() => {