diff --git a/package-lock.json b/package-lock.json index f0cd14e60af..c775522fca4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4763,13 +4763,13 @@ } }, "gl-plot2d": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/gl-plot2d/-/gl-plot2d-1.4.4.tgz", - "integrity": "sha512-0UhKiiqeampLtydv6NMNrKEilc0Ui5oaJtvHLbLZ5u/1ttT1XjOY5Yk8LzfqozA/No4a9omxjSKnH+tvSn+rQQ==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/gl-plot2d/-/gl-plot2d-1.4.5.tgz", + "integrity": "sha512-6GmCN10SWtV+qHFQ1gjdnVubeHFVsm6P4zmo0HrPIl9TcdePCUHDlBKWAuE6XtFhiMKMj7R8rApOX8O8uXUYog==", "requires": { "binary-search-bounds": "^2.0.4", "gl-buffer": "^2.1.2", - "gl-select-static": "^2.0.6", + "gl-select-static": "^2.0.7", "gl-shader": "^4.2.1", "glsl-inverse": "^1.0.0", "glslify": "^7.0.0", @@ -4777,16 +4777,16 @@ } }, "gl-plot3d": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-2.4.5.tgz", - "integrity": "sha512-cKAqMXFRHTCFxH8r1/ACdk5hyfnA9djfiAM8zVQrqu0qLEttUu0i1fq0pr+d5m0HPuNcK8wEc4F3VjL2hrDcGQ==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-2.4.6.tgz", + "integrity": "sha512-CkrNvDKu0p74Di2g2Oc9kU+s1Oe+wi4cIfHzXABp8DvfoRl0/bayqJ9q8EcRAqMeQQxQZYGvJkk4hlBwI758Jw==", "requires": { "3d-view": "^2.0.0", "a-big-triangle": "^1.0.3", "gl-axes3d": "^1.5.3", "gl-fbo": "^2.0.5", "gl-mat4": "^1.2.0", - "gl-select-static": "^2.0.6", + "gl-select-static": "^2.0.7", "gl-shader": "^4.2.1", "gl-spikes3d": "^1.0.10", "glslify": "^7.0.0", @@ -4795,7 +4795,7 @@ "mouse-change": "^1.4.0", "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.2.0", - "ndarray": "^1.0.18", + "ndarray": "^1.0.19", "right-now": "^1.0.0" } }, @@ -4847,12 +4847,11 @@ } }, "gl-select-static": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/gl-select-static/-/gl-select-static-2.0.6.tgz", - "integrity": "sha512-p4DmBG1DMo/47/fV3oqPcU6uTqHy0eI1vATH1fm8OVDqlzWnLv3786tdEunZWG6Br7DUdH6NgWhuy4gAlt+TAQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/gl-select-static/-/gl-select-static-2.0.7.tgz", + "integrity": "sha512-OvpYprd+ngl3liEatBTdXhSyNBjwvjMSvV2rN0KHpTU+BTi4viEETXNZXFgGXY37qARs0L28ybk3UQEW6C5Nnw==", "requires": { "bit-twiddle": "^1.0.2", - "cwise": "^1.0.10", "gl-fbo": "^2.0.5", "ndarray": "^1.0.18", "typedarray-pool": "^1.1.0" @@ -7734,14 +7733,6 @@ "typedarray-pool": "^1.0.0" } }, - "ndarray-fill": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ndarray-fill/-/ndarray-fill-1.0.2.tgz", - "integrity": "sha1-owpg9xiODJWC/N1YiWrNy1IqHtY=", - "requires": { - "cwise": "^1.0.10" - } - }, "ndarray-gradient": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ndarray-gradient/-/ndarray-gradient-1.0.0.tgz", diff --git a/package.json b/package.json index 5cc1d2446dd..0318288eafb 100644 --- a/package.json +++ b/package.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", diff --git a/src/traces/surface/convert.js b/src/traces/surface/convert.js index e79e2266a98..a4c53da76f7 100644 --- a/src/traces/surface/convert.js +++ b/src/traces/surface/convert.js @@ -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 {