diff --git a/package-lock.json b/package-lock.json index 35da1c57c00..7ac26a9fce6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4755,9 +4755,8 @@ } }, "gl-error3d": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/gl-error3d/-/gl-error3d-1.0.12.tgz", - "integrity": "sha512-OaYMB0G9RJx8MfC16x6Q0TnYKZ51nrac4GiUqBlIKyDuNGW1U6YLmiuzY3u6ftQlh0jVhk7lDXCawgAeeYA3JA==", + "version": "git://github.com/gl-vis/gl-error3d.git#9835d7b63d64e5de2b24d9e7f810452151af9a58", + "from": "git://github.com/gl-vis/gl-error3d.git#9835d7b63d64e5de2b24d9e7f810452151af9a58", "requires": { "gl-buffer": "^2.1.2", "gl-shader": "^4.2.1", @@ -4806,9 +4805,8 @@ } }, "gl-line3d": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/gl-line3d/-/gl-line3d-1.1.9.tgz", - "integrity": "sha512-00E3VAxTXGOpn8cGImtMaDnKs6UkyVYEZ2tzUBYwjea9N8UB6wvR1NBoKwb0A/wFNIYUsLhdc3LKZyliB0DVLA==", + "version": "git://github.com/gl-vis/gl-line3d.git#d2ea962c00e9f592ec0506ba33d14c7d25b85659", + "from": "git://github.com/gl-vis/gl-line3d.git#d2ea962c00e9f592ec0506ba33d14c7d25b85659", "requires": { "binary-search-bounds": "^2.0.4", "gl-buffer": "^2.0.8", @@ -4937,9 +4935,8 @@ } }, "gl-scatter3d": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.1.5.tgz", - "integrity": "sha512-i/5Vrd2c9rqvgISkJcrSz3st7eCCIBgCkICb73MBJANd+PI+ptRZ3mgrUttwGB3bQm01HKJPpBr/R4/gQ6PPAw==", + "version": "git://github.com/gl-vis/gl-scatter3d.git#afc69258bef5a458e83b7d031ccfc6ada8e098fb", + "from": "git://github.com/gl-vis/gl-scatter3d.git#afc69258bef5a458e83b7d031ccfc6ada8e098fb", "requires": { "gl-buffer": "^2.0.6", "gl-mat4": "^1.0.0", diff --git a/package.json b/package.json index 9958f7c2080..4b330114c0a 100644 --- a/package.json +++ b/package.json @@ -73,15 +73,15 @@ "font-atlas-sdf": "^1.3.3", "gl-cone3d": "^1.2.2", "gl-contour2d": "^1.1.5", - "gl-error3d": "^1.0.12", + "gl-error3d": "git://github.com/gl-vis/gl-error3d.git#9835d7b63d64e5de2b24d9e7f810452151af9a58", "gl-heatmap2d": "^1.0.5", - "gl-line3d": "^1.1.9", + "gl-line3d": "git://github.com/gl-vis/gl-line3d.git#d2ea962c00e9f592ec0506ba33d14c7d25b85659", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.7", "gl-plot2d": "^1.4.2", "gl-plot3d": "^1.6.3", "gl-pointcloud2d": "^1.0.2", - "gl-scatter3d": "^1.1.5", + "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#afc69258bef5a458e83b7d031ccfc6ada8e098fb", "gl-select-box": "^1.0.3", "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.1.2", diff --git a/test/image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png b/test/image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png new file mode 100644 index 00000000000..9d108595e6a Binary files /dev/null and b/test/image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png differ diff --git a/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png b/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png index e73533b4c2f..a224543595a 100644 Binary files a/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png and b/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png differ diff --git a/test/image/mocks/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.json b/test/image/mocks/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.json new file mode 100644 index 00000000000..530718305b4 --- /dev/null +++ b/test/image/mocks/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.json @@ -0,0 +1,43 @@ +{ + "data": [ + { + "x": [0, 1, 2, 3, 4], + "y": [0, 1, 2, 3, 4], + "z": [0,-1,-2,-3,-4], + "mode": "markers+lines", + "marker": { + "size": 50, + "color": ["rgb(0, 255, 0, 1.0)", "rgb(255, 0, 0, 1.0)", "rgb(255, 0, 0, 0.2)", "rgb(255, 0, 0, 1.0)", "rgb(0, 0, 255, 1.0)"] + }, + "line": { + "width": 50, + "color": ["rgb(0, 255, 0, 1.0)", "rgb(255, 0, 0, 1.0)", "rgb(255, 0, 0, 0.2)", "rgb(255, 0, 0, 1.0)", "rgb(0, 0, 255, 1.0)"] + }, + "error_z": { + "type": "sqrt", + "line": { "thickness": 10 }, + "color": "rgb(255, 127, 0, 0.75)" + }, + "error_x": { + "type": "sqrt" + }, + "error_y": { + "type": "sqrt" + }, + "type": "scatter3d" + } + ], + "layout": { + "title": { + "text": "Should draw transparent scatter3d markers and lines
when having transparent rgba color" + }, + "width": 600, + "height": 600, + "scene": { + "xaxis": { "nticks": 12 }, + "yaxis": { "nticks": 12 }, + "zaxis": { "nticks": 12 } + } + } + +}