From 9bb2344f74a8b8a78baf5f7f2514d6a7a0fa4c3d Mon Sep 17 00:00:00 2001 From: archmoj Date: Sun, 31 Mar 2019 22:59:24 -0400 Subject: [PATCH 1/2] fix issue 3699 - colormap with 256 colors --- package-lock.json | 19 +- package.json | 4 +- test/image/baselines/gl3d_colormap256.png | Bin 0 -> 46873 bytes test/image/mocks/gl3d_colormap256.json | 1041 +++++++++++++++++++++ 4 files changed, 1051 insertions(+), 13 deletions(-) create mode 100644 test/image/baselines/gl3d_colormap256.png create mode 100644 test/image/mocks/gl3d_colormap256.json diff --git a/package-lock.json b/package-lock.json index 8f47a5e04e4..ff7ea413350 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1823,9 +1823,8 @@ } }, "colormap": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/colormap/-/colormap-2.3.0.tgz", - "integrity": "sha512-Mkk6mQUMbCleXEeStFm2xLwv5zbRakZMUFB1T1+iNEv58VKBByfPwYIjMQDwSRmXNM1gvo5y3WTYAhmdMn/rbg==", + "version": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", + "from": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", "requires": { "lerp": "^1.0.3" } @@ -4966,12 +4965,11 @@ } }, "gl-mesh3d": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/gl-mesh3d/-/gl-mesh3d-2.0.9.tgz", - "integrity": "sha512-Kp1V1FVu+hLNaHcmYzU6vNLSmjscpHz7wkRpk3IQj+jBHbxsIS+ZrsNpuoGThl4SnnCz4XLR8j5S/ae/YDrjWg==", + "version": "git://github.com/gl-vis/gl-mesh3d.git#b5654b602b395dd60e4b06f5820834b134030560", + "from": "git://github.com/gl-vis/gl-mesh3d.git#b5654b602b395dd60e4b06f5820834b134030560", "requires": { "barycentric": "^1.0.1", - "colormap": "^2.1.0", + "colormap": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", "gl-buffer": "^2.0.8", "gl-mat4": "^1.0.0", "gl-shader": "^4.2.1", @@ -5135,13 +5133,12 @@ } }, "gl-surface3d": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/gl-surface3d/-/gl-surface3d-1.4.5.tgz", - "integrity": "sha512-uu+s3jxM7kMdTpYvXVJPujOQMo3B/+AOG4KX7niZHVnykuCKO11+haZSDF2ucymrIrRyUGknGIto6CVpLmP7og==", + "version": "git://github.com/gl-vis/gl-surface3d.git#b82222510dcb6a0bc741db0da4e009352ff97242", + "from": "git://github.com/gl-vis/gl-surface3d.git#b82222510dcb6a0bc741db0da4e009352ff97242", "requires": { "binary-search-bounds": "^2.0.4", "bit-twiddle": "^1.0.2", - "colormap": "^2.1.0", + "colormap": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", "dup": "^1.0.0", "gl-buffer": "^2.0.3", "gl-mat4": "^1.0.0", diff --git a/package.json b/package.json index 340278e7658..856dc2b7044 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "gl-heatmap2d": "^1.0.5", "gl-line3d": "^1.1.11", "gl-mat4": "^1.2.0", - "gl-mesh3d": "^2.0.9", + "gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#b5654b602b395dd60e4b06f5820834b134030560", "gl-plot2d": "^1.4.2", "gl-plot3d": "^2.2.1", "gl-pointcloud2d": "^1.0.2", @@ -86,7 +86,7 @@ "gl-select-box": "^1.0.3", "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.2.1", - "gl-surface3d": "^1.4.5", + "gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#b82222510dcb6a0bc741db0da4e009352ff97242", "gl-text": "^1.1.6", "glslify": "^7.0.0", "has-hover": "^1.0.1", diff --git a/test/image/baselines/gl3d_colormap256.png b/test/image/baselines/gl3d_colormap256.png new file mode 100644 index 0000000000000000000000000000000000000000..dd19b129d3ed259e85bd61ab2faed253b5f5b8b6 GIT binary patch literal 46873 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 Date: Tue, 2 Apr 2019 12:06:48 -0400 Subject: [PATCH 2/2] bump colormap - gl-surface3d and gl-mesh3d --- package-lock.json | 19 +++++++++++-------- package.json | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff7ea413350..6813c4f52b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1823,8 +1823,9 @@ } }, "colormap": { - "version": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", - "from": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/colormap/-/colormap-2.3.1.tgz", + "integrity": "sha512-TEzNlo/qYp6pBoR2SK9JiV+DG1cmUcVO/+DEJqVPSHIKNlWh5L5L4FYog7b/h0bAnhKhpOAvx/c1dFp2QE9sFw==", "requires": { "lerp": "^1.0.3" } @@ -4965,11 +4966,12 @@ } }, "gl-mesh3d": { - "version": "git://github.com/gl-vis/gl-mesh3d.git#b5654b602b395dd60e4b06f5820834b134030560", - "from": "git://github.com/gl-vis/gl-mesh3d.git#b5654b602b395dd60e4b06f5820834b134030560", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/gl-mesh3d/-/gl-mesh3d-2.0.10.tgz", + "integrity": "sha512-JJ0NvZbyQXtlAkIYgVFCxJIujjsaAB7HwszCig3MqdDOk6SLkAaT85hLUc+ypGLDXpVpxoSuEKO350oONyx7dg==", "requires": { "barycentric": "^1.0.1", - "colormap": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", + "colormap": "^2.3.1", "gl-buffer": "^2.0.8", "gl-mat4": "^1.0.0", "gl-shader": "^4.2.1", @@ -5133,12 +5135,13 @@ } }, "gl-surface3d": { - "version": "git://github.com/gl-vis/gl-surface3d.git#b82222510dcb6a0bc741db0da4e009352ff97242", - "from": "git://github.com/gl-vis/gl-surface3d.git#b82222510dcb6a0bc741db0da4e009352ff97242", + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/gl-surface3d/-/gl-surface3d-1.4.6.tgz", + "integrity": "sha512-aItWQTNUX3JJc6i2FbXX82ljPZgDV3kXzkzANcBGoAnKwRpJw12WcMKKTL4sOCs9BW+3sx6BhR0P5+2zh5Scfw==", "requires": { "binary-search-bounds": "^2.0.4", "bit-twiddle": "^1.0.2", - "colormap": "git://github.com/archmoj/colormap.git#c8b31f77f88ba1160f30bcd6ba10753ca0ed0404", + "colormap": "^2.3.1", "dup": "^1.0.0", "gl-buffer": "^2.0.3", "gl-mat4": "^1.0.0", diff --git a/package.json b/package.json index 856dc2b7044..b18bae099bc 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "gl-heatmap2d": "^1.0.5", "gl-line3d": "^1.1.11", "gl-mat4": "^1.2.0", - "gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#b5654b602b395dd60e4b06f5820834b134030560", + "gl-mesh3d": "^2.0.10", "gl-plot2d": "^1.4.2", "gl-plot3d": "^2.2.1", "gl-pointcloud2d": "^1.0.2", @@ -86,7 +86,7 @@ "gl-select-box": "^1.0.3", "gl-spikes2d": "^1.0.2", "gl-streamtube3d": "^1.2.1", - "gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#b82222510dcb6a0bc741db0da4e009352ff97242", + "gl-surface3d": "^1.4.6", "gl-text": "^1.1.6", "glslify": "^7.0.0", "has-hover": "^1.0.1",