@luceosports/play-rendering 2.5.7 → 2.6.1

package/src/layers/line/layers/DribbleLineLayer.ts

@@ -1,50 +1,62 @@
-import _ from 'lodash';
-import { animationProgress } from '../../../helpers/common';
-import ActionLineLayer from '../base/ActionLineLayer';
-import DribbleLineTrait from '../../../traits/DribbleLineTrait';
-import { LinePart } from '../../../types';
-import { LinePartAdjusted } from '../../../models/LineModel';
-
-export default class DribbleLineLayer extends ActionLineLayer {
-  // ================ DribbleLineTrait Methods ====================
-  private convertLinePartsToDribble(lineParts: LinePart[]): LinePartAdjusted[] {
-    return [];
-  }
-  // ==============================================================
-
-  drawLineCap() {
-    if (this.allowDrawLineCap()) this.drawArrowLineCap();
-  }
-
-  setLineOptions() {
-    const lineParts = [...this.line.getLineParts()];
-    const dribbleLineParts = this.convertLinePartsToDribble(lineParts);
-
-    this.line.setLinePartsAdjusted([]);
-
-    dribbleLineParts.forEach(lp => {
-      const { controlPoints, lpIndex } = lp;
-      const [firstPoint] = controlPoints;
-
-      let animationSegment: LinePartAdjusted['animationSegment'] | undefined = undefined;
-
-      if (this.options.animationGlobalProgress) {
-        const [start, end] = this.line.animationKeyTimeChunks[lpIndex!];
-
-        if (_.inRange(this.options.animationGlobalProgress, start, end)) {
-          if (animationProgress(this.options.animationGlobalProgress, start, end) > firstPoint.time!) {
-            animationSegment = 'processed';
-          } else {
-            animationSegment = 'active';
-          }
-        } else if (this.options.animationGlobalProgress > end) {
-          animationSegment = 'processed';
-        }
-      }
-
-      this.line.addLinePartAdjusted({ ...lp, controlPoints, animationSegment });
-    });
-  }
-}
-
-Object.assign(DribbleLineLayer.prototype, DribbleLineTrait);
+import _ from 'lodash';
+import { animationProgress } from '../../../helpers/common';
+import ActionLineLayer from '../base/ActionLineLayer';
+import DribbleLineTrait from '../../../traits/DribbleLineTrait';
+import { LinePart, AnimationMode } from '../../../types';
+import { LinePartAdjusted } from '../../../models/LineModel';
+import { getLineAnimationChunks } from '../../../helpers/animation';
+
+export default class DribbleLineLayer extends ActionLineLayer {
+  // ================ DribbleLineTrait Methods ====================
+  private convertLinePartsToDribble(lineParts: LinePart[]): LinePartAdjusted[] {
+    return [];
+  }
+  // ==============================================================
+
+  drawLineCap() {
+    if (this.allowDrawLineCap()) this.drawArrowLineCap();
+  }
+
+  setLineOptions() {
+    const lineParts = [...this.line.getLineParts()];
+    const dribbleLineParts = this.convertLinePartsToDribble(lineParts);
+
+    const mode = this.options.animationMode ?? AnimationMode.SEQUENTIAL;
+
+    const chunks = getLineAnimationChunks({
+      mode,
+      line: this.line.originalData,
+      players: this.playData.players
+    });
+
+    this.line.setLinePartsAdjusted([]);
+
+    dribbleLineParts.forEach(lp => {
+      const { controlPoints, lpIndex } = lp;
+      const [firstPoint] = controlPoints;
+
+      let animationSegment: LinePartAdjusted['animationSegment'] | undefined = undefined;
+
+      if (this.options.animationGlobalProgress && lpIndex != null) {
+        const chunk = chunks[lpIndex];
+        if (chunk) {
+          const [start, end] = chunk;
+
+          if (_.inRange(this.options.animationGlobalProgress, start, end)) {
+            if (animationProgress(this.options.animationGlobalProgress, start, end) > firstPoint.time!) {
+              animationSegment = 'processed';
+            } else {
+              animationSegment = 'active';
+            }
+          } else if (this.options.animationGlobalProgress > end) {
+            animationSegment = 'processed';
+          }
+        }
+      }
+
+      this.line.addLinePartAdjusted({ ...lp, controlPoints, animationSegment });
+    });
+  }
+}
+
+Object.assign(DribbleLineLayer.prototype, DribbleLineTrait);

package/src/models/AnimationModel.ts

@@ -67,22 +67,28 @@ export default class AnimationModel {
 
   get linesPhaseIntervals(): Record<number, { min: number; max: number }> {
     const result: Record<number, { min: number; max: number }> = {};
+    const mode = this.play.options.animationMode;
+
     this.play.playData.lines.forEach(line => {
       if (!result[line.phase]) result[line.phase] = { min: 0, max: 0 };
-      line.animations.forEach(({ keyTimes }) => {
+      line.animations.forEach(animation => {
+        const keyTimes = mode === 'SEQUENTIAL' ? animation.keyTimesSeq || [] : animation.keyTimes;
+
         const [from] = keyTimes;
         const to = [...keyTimes].pop()!;
         if (from < result[line.phase].min || (!result[line.phase].min && line.phase > 1)) result[line.phase].min = from;
         if (to > result[line.phase].max) result[line.phase].max = to;
       });
     });
+
     return result;
   }
 
   get lastLineAnimationMax() {
+    const mode = this.play.options.animationMode;
     return this.play.playData.lines.reduce<number>((result, line) => {
       const lineModel = new LineModel(line);
-      return result > lineModel.lastAnimEndTime! ? result : lineModel.lastAnimEndTime!;
+      return result > lineModel.lastAnimEndTime(mode)! ? result : lineModel.lastAnimEndTime(mode)!;
     }, 0);
   }