From 653cee1a00033f2c4e96ecdd5e9372a825ab4a5b Mon Sep 17 00:00:00 2001 From: archmoj Date: Sun, 9 Dec 2018 20:41:04 -0500 Subject: [PATCH 1/3] fixes issue 3232 by disabling color palette --- package-lock.json | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cc24650b6d..afa2a81e698 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8780,9 +8780,8 @@ } }, "regl-scatter2d": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.0.6.tgz", - "integrity": "sha512-l2/OcCRKTxsCtrGtb2TKUKYnDHzI07qOm2eK2kiRYKyDwiWiGyiLC6p3SlOxDoqhQ/8gbIue9BABPXuCJ0lpRQ==", + "version": "git://github.com/gl-vis/regl-scatter2d.git#22c218464af8a50a0fbbd8e6a983edb24f21fdab", + "from": "git://github.com/gl-vis/regl-scatter2d.git#22c218464af8a50a0fbbd8e6a983edb24f21fdab", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index ba09779f6fc..e58004faa63 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "regl": "^1.3.7", "regl-error2d": "^2.0.5", "regl-line2d": "^3.0.12", - "regl-scatter2d": "^3.0.6", + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#22c218464af8a50a0fbbd8e6a983edb24f21fdab", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From 111d163d109180bcf4787b8d41bccb089871a9c1 Mon Sep 17 00:00:00 2001 From: archmoj Date: Wed, 12 Dec 2018 13:25:07 -0500 Subject: [PATCH 2/3] re enabled color palette max size is 256 --- package-lock.json | 45 +++++++++++++++++++++++++++++++++++++++++++-- package.json | 2 +- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index afa2a81e698..f48df23ec0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8780,8 +8780,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/gl-vis/regl-scatter2d.git#22c218464af8a50a0fbbd8e6a983edb24f21fdab", - "from": "git://github.com/gl-vis/regl-scatter2d.git#22c218464af8a50a0fbbd8e6a983edb24f21fdab", + "version": "git://github.com/gl-vis/regl-scatter2d.git#39382a1dbdbf3c58cab5210f5d52505ba52e732f", + "from": "git://github.com/gl-vis/regl-scatter2d.git#39382a1dbdbf3c58cab5210f5d52505ba52e732f", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", @@ -8835,6 +8835,47 @@ "clamp": "^1.0.1", "parse-rect": "^1.1.1" } + }, + "regl-scatter2d": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.0.6.tgz", + "integrity": "sha512-l2/OcCRKTxsCtrGtb2TKUKYnDHzI07qOm2eK2kiRYKyDwiWiGyiLC6p3SlOxDoqhQ/8gbIue9BABPXuCJ0lpRQ==", + "requires": { + "array-range": "^1.0.1", + "array-rearrange": "^2.2.2", + "bubleify": "^1.0.0", + "clamp": "^1.0.1", + "color-id": "^1.1.0", + "color-normalize": "^1.0.3", + "flatten-vertex-data": "^1.0.0", + "glslify": "^6.1.1", + "is-iexplorer": "^1.0.0", + "object-assign": "^4.1.1", + "parse-rect": "^1.1.0", + "pick-by-alias": "^1.0.0", + "point-cluster": "^3.1.2", + "to-float32": "^1.0.0", + "update-diff": "^1.1.0" + }, + "dependencies": { + "point-cluster": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/point-cluster/-/point-cluster-3.1.4.tgz", + "integrity": "sha512-jVjzC1vYoZlvcLWi170i41he5LhJTncOgFPaZx1uoqNn+8q+24xjLS9yG68XfN6/U1F52kliD6a3oXjJduerTQ==", + "requires": { + "array-bounds": "^1.0.1", + "array-normalize": "^1.1.3", + "binary-search-bounds": "^2.0.4", + "bubleify": "^1.1.0", + "clamp": "^1.0.1", + "dtype": "^2.0.0", + "flatten-vertex-data": "^1.0.0", + "is-obj": "^1.0.1", + "math-log2": "^1.0.1", + "parse-rect": "^1.2.0" + } + } + } } } }, diff --git a/package.json b/package.json index e58004faa63..91211ecbc81 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "regl": "^1.3.7", "regl-error2d": "^2.0.5", "regl-line2d": "^3.0.12", - "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#22c218464af8a50a0fbbd8e6a983edb24f21fdab", + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#39382a1dbdbf3c58cab5210f5d52505ba52e732f", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From a9934313af78d3e58ac0a38567097d627da28a53 Mon Sep 17 00:00:00 2001 From: archmoj Date: Wed, 12 Dec 2018 13:51:24 -0500 Subject: [PATCH 3/3] using regl-scatter2d with upgraded dependencies --- package-lock.json | 27 +++++++++++++++++---------- package.json | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index f48df23ec0d..0e85542c4f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8780,24 +8780,31 @@ } }, "regl-scatter2d": { - "version": "git://github.com/gl-vis/regl-scatter2d.git#39382a1dbdbf3c58cab5210f5d52505ba52e732f", - "from": "git://github.com/gl-vis/regl-scatter2d.git#39382a1dbdbf3c58cab5210f5d52505ba52e732f", + "version": "git://github.com/gl-vis/regl-scatter2d.git#1cb7d93015e164d83d9beabaedcb5f56fe4cb00c", + "from": "git://github.com/gl-vis/regl-scatter2d.git#1cb7d93015e164d83d9beabaedcb5f56fe4cb00c", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", - "bubleify": "^1.0.0", + "bubleify": "^1.2.0", "clamp": "^1.0.1", "color-id": "^1.1.0", - "color-normalize": "^1.0.3", - "flatten-vertex-data": "^1.0.0", - "glslify": "^6.1.1", + "color-normalize": "^1.3.0", + "flatten-vertex-data": "^1.0.2", + "glslify": "^6.3.1", "is-iexplorer": "^1.0.0", "object-assign": "^4.1.1", - "parse-rect": "^1.1.0", - "pick-by-alias": "^1.0.0", - "point-cluster": "^3.1.2", - "to-float32": "^1.0.0", + "parse-rect": "^1.2.0", + "pick-by-alias": "^1.2.0", + "point-cluster": "^3.1.4", + "to-float32": "^1.0.1", "update-diff": "^1.1.0" + }, + "dependencies": { + "to-float32": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/to-float32/-/to-float32-1.0.1.tgz", + "integrity": "sha512-nOy2WSwae3xhZbc+05xiCuU3ZPPmH0L4Rg4Q1qiOGFSuNSCTB9nVJaGgGl3ZScxAclX/L8hJuDHJGDAzbfuKCQ==" + } } }, "regl-splom": { diff --git a/package.json b/package.json index 91211ecbc81..d1a0283cfbf 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "regl": "^1.3.7", "regl-error2d": "^2.0.5", "regl-line2d": "^3.0.12", - "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#39382a1dbdbf3c58cab5210f5d52505ba52e732f", + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#1cb7d93015e164d83d9beabaedcb5f56fe4cb00c", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3",