From bfe70a8774951da0711e94bc9a1acbb7758840ac Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 13 Nov 2018 17:33:24 -0500 Subject: [PATCH 1/6] correct size check in module --- 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 ea60b5991d8..12b439ffddd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8910,9 +8910,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/a-vis/regl-scatter2d.git#0515a47c5468363d19654fcb9383d7135c93c8ad", + "from": "git://github.com/a-vis/regl-scatter2d.git#0515a47c5468363d19654fcb9383d7135c93c8ad", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index ebac0650b22..9ebb04c891b 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/a-vis/regl-scatter2d.git#0515a47c5468363d19654fcb9383d7135c93c8ad", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From 614c6a85c6c87c2c9c296024d9657f511133545f Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 13 Nov 2018 22:53:49 -0500 Subject: [PATCH 2/6] revised regl-scatter2d module for 256 color palette --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 12b439ffddd..4ffe7aafd42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8910,8 +8910,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/a-vis/regl-scatter2d.git#0515a47c5468363d19654fcb9383d7135c93c8ad", - "from": "git://github.com/a-vis/regl-scatter2d.git#0515a47c5468363d19654fcb9383d7135c93c8ad", + "version": "git://github.com/a-vis/regl-scatter2d.git#ed587b94a4697a9797a5485ffa47ce6c763f9cf0", + "from": "git://github.com/a-vis/regl-scatter2d.git#ed587b94a4697a9797a5485ffa47ce6c763f9cf0", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index 9ebb04c891b..588bdd6178c 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/a-vis/regl-scatter2d.git#0515a47c5468363d19654fcb9383d7135c93c8ad", + "regl-scatter2d": "git://github.com/a-vis/regl-scatter2d.git#ed587b94a4697a9797a5485ffa47ce6c763f9cf0", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From f59223297bf320f6bbe5e52c611d217d172cbfd5 Mon Sep 17 00:00:00 2001 From: archmoj Date: Wed, 14 Nov 2018 00:53:23 -0500 Subject: [PATCH 3/6] using palette with 256x256 colors --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ffe7aafd42..64f017cf244 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8910,8 +8910,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/a-vis/regl-scatter2d.git#ed587b94a4697a9797a5485ffa47ce6c763f9cf0", - "from": "git://github.com/a-vis/regl-scatter2d.git#ed587b94a4697a9797a5485ffa47ce6c763f9cf0", + "version": "git://github.com/a-vis/regl-scatter2d.git#8399f43ec3d1f06237645d51f63612fe9c0ec5c2", + "from": "git://github.com/a-vis/regl-scatter2d.git#8399f43ec3d1f06237645d51f63612fe9c0ec5c2", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index 588bdd6178c..d80b2895929 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/a-vis/regl-scatter2d.git#ed587b94a4697a9797a5485ffa47ce6c763f9cf0", + "regl-scatter2d": "git://github.com/a-vis/regl-scatter2d.git#8399f43ec3d1f06237645d51f63612fe9c0ec5c2", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From bcbe705450eb4685cf78f1bb6a2488381c7c6cea Mon Sep 17 00:00:00 2001 From: archmoj Date: Wed, 14 Nov 2018 14:51:13 -0500 Subject: [PATCH 4/6] more fixes in the module --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 64f017cf244..5fa0ad59ead 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8910,8 +8910,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/a-vis/regl-scatter2d.git#8399f43ec3d1f06237645d51f63612fe9c0ec5c2", - "from": "git://github.com/a-vis/regl-scatter2d.git#8399f43ec3d1f06237645d51f63612fe9c0ec5c2", + "version": "git://github.com/a-vis/regl-scatter2d.git#45e7ab163fe8991bca3dfc31fba7e9cb4a62a570", + "from": "git://github.com/a-vis/regl-scatter2d.git#45e7ab163fe8991bca3dfc31fba7e9cb4a62a570", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index d80b2895929..e5e270dfa2c 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/a-vis/regl-scatter2d.git#8399f43ec3d1f06237645d51f63612fe9c0ec5c2", + "regl-scatter2d": "git://github.com/a-vis/regl-scatter2d.git#45e7ab163fe8991bca3dfc31fba7e9cb4a62a570", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From fda744dd3d6b7dead195f2bae1b77f2ae0576460 Mon Sep 17 00:00:00 2001 From: archmoj Date: Wed, 14 Nov 2018 17:31:50 -0500 Subject: [PATCH 5/6] test markers --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5fa0ad59ead..fcaf5c8be55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8910,8 +8910,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/a-vis/regl-scatter2d.git#45e7ab163fe8991bca3dfc31fba7e9cb4a62a570", - "from": "git://github.com/a-vis/regl-scatter2d.git#45e7ab163fe8991bca3dfc31fba7e9cb4a62a570", + "version": "git://github.com/a-vis/regl-scatter2d.git#12ea41d8a80ea743d8a4e5f474a69b89ac14ae2b", + "from": "git://github.com/a-vis/regl-scatter2d.git#12ea41d8a80ea743d8a4e5f474a69b89ac14ae2b", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index e5e270dfa2c..0cc97bf776e 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/a-vis/regl-scatter2d.git#45e7ab163fe8991bca3dfc31fba7e9cb4a62a570", + "regl-scatter2d": "git://github.com/a-vis/regl-scatter2d.git#12ea41d8a80ea743d8a4e5f474a69b89ac14ae2b", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From 71b528e9b70beeae161ca2e220e6710f4e7b3a30 Mon Sep 17 00:00:00 2001 From: archmoj Date: Sat, 24 Nov 2018 20:14:05 -0500 Subject: [PATCH 6/6] test new module would display sdf markers in yellow --- 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 fcaf5c8be55..181d6fc5aaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8910,8 +8910,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/a-vis/regl-scatter2d.git#12ea41d8a80ea743d8a4e5f474a69b89ac14ae2b", - "from": "git://github.com/a-vis/regl-scatter2d.git#12ea41d8a80ea743d8a4e5f474a69b89ac14ae2b", + "version": "git://github.com/a-vis/regl-scatter2d.git#2f7e379931c3979eb7ffdc65e74e1e65825bb317", + "from": "git://github.com/a-vis/regl-scatter2d.git#2f7e379931c3979eb7ffdc65e74e1e65825bb317", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", @@ -8965,6 +8965,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 0cc97bf776e..1ba97f31887 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/a-vis/regl-scatter2d.git#12ea41d8a80ea743d8a4e5f474a69b89ac14ae2b", + "regl-scatter2d": "git://github.com/a-vis/regl-scatter2d.git#2f7e379931c3979eb7ffdc65e74e1e65825bb317", "regl-splom": "^1.0.4", "right-now": "^1.0.0", "robust-orientation": "^1.1.3",