Version 1.6.1: Fix for animationDuration and Delay

derpylz · Apr 2, 2022 · 48ab985 · 48ab985
1 parent 9984ff4
commit 48ab985
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 31 deletions.
diff --git a/dist/babyplots.js b/dist/babyplots.js
diff --git a/dist/babyplots.js.map b/dist/babyplots.js.map
diff --git a/dist/examples/semantleExample.js b/dist/examples/semantleExample.js
diff --git a/index.html b/index.html
@@ -6,13 +6,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>babyplots example</title>
   <script src="dist/CCapture.all.min.js"></script>
-  <script src="dist/examples/surface.js"></script>
-  <script src="dist/examples/heatMap.js"></script>
-  <script src="dist/examples/pointCloud.js"></script>
-  <script src="dist/examples/pointCloud_sm.js"></script>
-  <script src="dist/examples/shapeCloud.js"></script>
-  <script src="dist/examples/shapeCloudInfo.js"></script>
-  <script src="dist/examples/imagestack.js"></script>
+  <!-- <script src="dist/examples/surface.js"></script> -->
+  <!-- <script src="dist/examples/heatMap.js"></script> -->
+  <!-- <script src="dist/examples/pointCloud.js"></script> -->
+  <script src="dist/examples/semantleExample.js"></script>
+  <!-- <script src="dist/examples/shapeCloud.js"></script> -->
+  <!-- <script src="dist/examples/shapeCloudInfo.js"></script> -->
+  <!-- <script src="dist/examples/imagestack.js"></script> -->
   <script src="dist/babyplots.js"></script>
   <style>
     html,
@@ -254,25 +254,25 @@
     // vis.camera.radius = 800;
     // vis.camera.alpha = 0;
     // vis.camera.beta = 1;
-    vis.addPlot([
-        [6.671802, -4.664322, 4.977584],
-        [6.397511, -5.695337, 5.750157],
-        [6.834549, -4.452236, 5.134693],
-        [5.876275, -6.303131, 4.273763],
-        [5.795466, -6.470013, 4.276352]
-    ], "line", "values", [
-        0.285020,
-        0.317455,
-        0.417574,
-        0.602124,
-        1
-    ], {
-        labels: ["cannon", "man", "rifle", "shoot", "shot"],
-        labelColor: "match",
-        labelSize: 50,
-        hasAnimation: true
-    })
-    vis.fromJSON(pointCloudSmData);
+    // vis.addPlot([
+    //     [6.671802, -4.664322, 4.977584],
+    //     [6.397511, -5.695337, 5.750157],
+    //     [6.834549, -4.452236, 5.134693],
+    //     [5.876275, -6.303131, 4.273763],
+    //     [5.795466, -6.470013, 4.276352]
+    // ], "line", "values", [
+    //     0.285020,
+    //     0.317455,
+    //     0.417574,
+    //     0.602124,
+    //     1
+    // ], {
+    //     labels: ["cannon", "man", "rifle", "shoot", "shot"],
+    //     labelColor: "match",
+    //     labelSize: 50,
+    //     hasAnimation: true
+    // })
+    vis.fromJSON(semantleExampleData);
     vis.doRender();
     vis.createButtons(["turntable", "json", "label"]);
     window.onresize = function () {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babyplots",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Easy interactive 3d plots.",
   "main": "build/babyplots.js",
   "scripts": {

diff --git a/src/plotTypes/Line.ts b/src/plotTypes/Line.ts
@@ -57,8 +57,12 @@ export class Line extends CoordinatePlot {
     ) {
         super(name, "line", scene, coordinates, colorVar, size, legendData, xScale, yScale, zScale);
         this._hasAnimation = hasAnimation;
-        this._animationDelay = this._animationDelay ?? animationDelay;
-        this._animationFrames = this._animationFrames ?? animationDuration;
+        if (animationDelay) {
+            this._animationDelay = animationDelay;
+        }
+        if (animationDuration) {
+            this._animationFrames = animationDuration;
+        }
         if (labels && labels.length === coordinates.length && annotationManager) {
             this.labels = labels;
             this.labelSize = labelSize;