Merge pull request #4929 from plotly/no-cwise

bump gl-plot2d & gl-plot3d and drop ndarray-fill

Author: archmoj

package-lock.json

@@ -81,8 +81,8 @@
     "gl-line3d": "1.2.1",
     "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.3.1",
-    "gl-plot2d": "^1.4.4",
-    "gl-plot3d": "^2.4.5",
+    "gl-plot2d": "^1.4.5",
+    "gl-plot3d": "^2.4.6",
     "gl-pointcloud2d": "^1.0.3",
     "gl-scatter3d": "^1.2.3",
     "gl-select-box": "^1.0.4",
@@ -100,7 +100,6 @@
     "mouse-event-offset": "^3.0.2",
     "mouse-wheel": "^1.2.0",
     "ndarray": "^1.0.19",
-    "ndarray-fill": "^1.0.2",
     "ndarray-homography": "^1.0.0",
     "parse-svg-path": "^0.1.2",
     "point-cluster": "^3.1.8",

package.json

@@ -13,7 +13,6 @@ var createSurface = require('gl-surface3d');
 
 var ndarray = require('ndarray');
 var homography = require('ndarray-homography');
-var fill = require('ndarray-fill');
 
 var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
@@ -511,9 +510,13 @@ proto.update = function(data) {
         ndarray(new Float32Array(xlen * ylen), [xlen, ylen]),
         ndarray(new Float32Array(xlen * ylen), [xlen, ylen])
     ];
-    fill(coords[0], function(row, col) { return rawCoords[0][row][col]; });
-    fill(coords[1], function(row, col) { return rawCoords[1][row][col]; });
-    fill(coords[2], function(row, col) { return rawCoords[2][row][col]; });
+    for(i = 0; i < 3; i++) {
+        for(j = 0; j < xlen; j++) {
+            for(k = 0; k < ylen; k++) {
+                coords[i].set(j, k, rawCoords[i][j][k]);
+            }
+        }
+    }
     rawCoords = []; // free memory
 
     var params = {
@@ -543,9 +546,11 @@ proto.update = function(data) {
     if(data.surfacecolor) {
         var intensity = ndarray(new Float32Array(xlen * ylen), [xlen, ylen]);
 
-        fill(intensity, function(row, col) {
-            return data.surfacecolor[col][row];
-        });
+        for(j = 0; j < xlen; j++) {
+            for(k = 0; k < ylen; k++) {
+                intensity.set(j, k, data.surfacecolor[k][j]);
+            }
+        }
 
         coords.push(intensity);
     } else {