diff --git a/package-lock.json b/package-lock.json index 381b502d49a..a4a223be925 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4640,15 +4640,15 @@ } }, "gl-line3d": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gl-line3d/-/gl-line3d-1.1.2.tgz", - "integrity": "sha512-OEkE5dsTunz0JApcx/+T57kOXWY+jNUS4nntnhEy14OcRCb4K6gz53HB+Oi8Cz9nb/95f805QLNgnkhDpdz8uw==", + "version": "git://github.com/gl-vis/gl-line3d.git#33b9e850de754cde38d859328ae562125edc90f2", + "from": "git://github.com/gl-vis/gl-line3d.git#33b9e850de754cde38d859328ae562125edc90f2", "requires": { "binary-search-bounds": "^1.0.0", "gl-buffer": "^2.0.8", "gl-shader": "^4.2.1", "gl-texture2d": "^2.0.2", "gl-vao": "^1.1.3", + "glsl-out-of-range": "^1.0.2", "glsl-read-float": "^1.0.0", "glslify": "^6.1.0", "ndarray": "^1.0.16" @@ -5050,6 +5050,11 @@ "resolved": "https://registry.npmjs.org/glsl-inverse/-/glsl-inverse-1.0.0.tgz", "integrity": "sha1-EsCx0GX1WERNHm/q95td34qRiuY=" }, + "glsl-out-of-range": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/glsl-out-of-range/-/glsl-out-of-range-1.0.2.tgz", + "integrity": "sha512-Qej48sfhSajxvfOmFNz5RV37DEHUjVTz38id1Y/Nt0kAXEe8IQSOXhKvlnD+uDpU5JKS6fLxlxLy8lJ/bepqAQ==" + }, "glsl-read-float": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/glsl-read-float/-/glsl-read-float-1.1.0.tgz", diff --git a/package.json b/package.json index 56fb105d8cf..cf69151e390 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gl-contour2d": "^1.1.4", "gl-error3d": "^1.0.7", "gl-heatmap2d": "^1.0.4", - "gl-line3d": "^1.1.2", + "gl-line3d": "git://github.com/gl-vis/gl-line3d.git#33b9e850de754cde38d859328ae562125edc90f2", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.0", "gl-plot2d": "^1.3.1", diff --git a/test/image/baselines/gl3d_cube.png b/test/image/baselines/gl3d_cube.png index 7dcd976113a..ac98389aad1 100644 Binary files a/test/image/baselines/gl3d_cube.png and b/test/image/baselines/gl3d_cube.png differ diff --git a/test/image/baselines/gl3d_line_rectangle_render.png b/test/image/baselines/gl3d_line_rectangle_render.png new file mode 100644 index 00000000000..bba445842e8 Binary files /dev/null and b/test/image/baselines/gl3d_line_rectangle_render.png differ diff --git a/test/image/baselines/gl3d_projection-traces.png b/test/image/baselines/gl3d_projection-traces.png index df67a5dcc29..a8831f83652 100644 Binary files a/test/image/baselines/gl3d_projection-traces.png and b/test/image/baselines/gl3d_projection-traces.png differ diff --git a/test/image/baselines/gl3d_scatter-color-mono-and-palette.png b/test/image/baselines/gl3d_scatter-color-mono-and-palette.png index 1214ea17624..dba67d4390e 100644 Binary files a/test/image/baselines/gl3d_scatter-color-mono-and-palette.png and b/test/image/baselines/gl3d_scatter-color-mono-and-palette.png differ diff --git a/test/image/baselines/gl3d_scatter3d-connectgaps.png b/test/image/baselines/gl3d_scatter3d-connectgaps.png index f27c1f34675..67326cf8abc 100644 Binary files a/test/image/baselines/gl3d_scatter3d-connectgaps.png and b/test/image/baselines/gl3d_scatter3d-connectgaps.png differ diff --git a/test/image/baselines/gl3d_set-ranges.png b/test/image/baselines/gl3d_set-ranges.png index 534d2b58fa7..5c4dfea6444 100644 Binary files a/test/image/baselines/gl3d_set-ranges.png and b/test/image/baselines/gl3d_set-ranges.png differ diff --git a/test/image/baselines/plot_types.png b/test/image/baselines/plot_types.png index 79a35b7af79..6623f724f62 100644 Binary files a/test/image/baselines/plot_types.png and b/test/image/baselines/plot_types.png differ diff --git a/test/image/mocks/gl3d_line_rectangle_render.json b/test/image/mocks/gl3d_line_rectangle_render.json new file mode 100644 index 00000000000..0584a1fcf87 --- /dev/null +++ b/test/image/mocks/gl3d_line_rectangle_render.json @@ -0,0 +1,72 @@ +{ + "data": [ + { + "x":[-2,-1.867,-1.5,-1,-0.5,-0.134,0,-0.134,-0.5,-1,-1.5,-1.867,-2], + "y":[-0.001,-0.5,-0.867,-1,-0.867,-0.5,0,0.499,0.866,1,0.866,0.499,0], + "z":[-2,-1.667,-1.334,-1,-0.667,-0.334,0,0.333,0.666,1,1.333,1.666,2], + "type": "scatter3d", "mode": "lines", "line": {"width": 20, "dash": "dash"} + }, + { + "x":[-0.001,-0.5,-0.867,-1,-0.867,-0.5,0,0.499,0.866,1,0.866,0.499,0], + "y":[-2,-1.667,-1.334,-1,-0.667,-0.334,0,0.333,0.666,1,1.333,1.666,2], + "z":[-2,-1.867,-1.5,-1,-0.5,-0.134,0,-0.134,-0.5,-1,-1.5,-1.867,-2], + "type": "scatter3d", "mode": "lines", "line": {"width": 20, "dash": "dash"} + }, + { + "x":[-2,-1.667,-1.334,-1,-0.667,-0.334,0,0.333,0.666,1,1.333,1.666,2], + "y":[-2,-1.867,-1.5,-1,-0.5,-0.134,0,-0.134,-0.5,-1,-1.5,-1.867,-2], + "z":[-0.001,-0.5,-0.867,-1,-0.867,-0.5,0,0.499,0.866,1,0.866,0.499,0], + "type": "scatter3d", "mode": "lines", "line": {"width": 20, "dash": "dash"} + }, + { + "x":[0,0.133,0.5,1,1.5,1.866,2,1.866,1.5,1,0.5,0.133,0], + "y":[-0.001,-0.5,-0.867,-1,-0.867,-0.5,0,0.499,0.866,1,0.866,0.499,0], + "z":[-2,-1.667,-1.334,-1,-0.667,-0.334,0,0.333,0.666,1,1.333,1.666,2], + "type": "scatter3d", "mode": "lines", "line": {"width": 10} + }, + { + "x":[-0.001,-0.5,-0.867,-1,-0.867,-0.5,0,0.499,0.866,1,0.866,0.499,0], + "y":[-2,-1.667,-1.334,-1,-0.667,-0.334,0,0.333,0.666,1,1.333,1.666,2], + "z":[0,0.133,0.5,1,1.5,1.866,2,1.866,1.5,1,0.5,0.133,0], + "type": "scatter3d", "mode": "lines", "line": {"width": 10} + }, + { + "x":[-2,-1.667,-1.334,-1,-0.667,-0.334,0,0.333,0.666,1,1.333,1.666,2], + "y":[0,0.133,0.5,1,1.5,1.866,2,1.866,1.5,1,0.5,0.133,0], + "z":[-0.001,-0.5,-0.867,-1,-0.867,-0.5,0,0.499,0.866,1,0.866,0.499,0], + "type": "scatter3d", "mode": "lines", "line": {"width": 10} + } + ], + "layout": { + "width": 1200, + "height": 900, + "scene": { + "camera": { + "eye": { + "x": -1.0, + "y": -1.0, + "z": -1.0 + }, + "center": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "up": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + "xaxis": { + "title": "<==X.X==>" + }, + "yaxis": { + "title": "<==Y.Y==>" + }, + "zaxis": { + "title": "<==Z.Z==>" + } + } + } +}