From f5dfbcd0d93d71036248f5cbb4ae4e8b877d83d6 Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 19 Nov 2018 17:04:52 -0500 Subject: [PATCH 01/11] updated ndarray-fill module --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b1678767e9..c726da9493c 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.0.2", "ndarray": "^1.0.18", - "ndarray-fill": "^1.0.2", + "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#d61a638a550c83f4fc2add00de34b2848bd5ce9b", "ndarray-homography": "^1.0.0", "ndarray-ops": "^1.2.2", "point-cluster": "^3.1.4", From be055b7b265afdce24e6592664573b2f475dc890 Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 19 Nov 2018 17:26:41 -0500 Subject: [PATCH 02/11] updated some the modules --- package-lock.json | 207 +++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 189 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8f11af4a333..3853991187b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -204,7 +204,6 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz", "integrity": "sha512-krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg==", - "dev": true, "requires": { "acorn": "^5.7.1", "acorn-dynamic-import": "^3.0.0", @@ -443,8 +442,7 @@ "array-from": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", - "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", - "dev": true + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=" }, "array-map": { "version": "0.0.0", @@ -3084,7 +3082,6 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, "requires": { "d": "1", "es5-ext": "~0.10.14", @@ -3103,7 +3100,6 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, "requires": { "d": "1", "es5-ext": "~0.10.14", @@ -3293,8 +3289,7 @@ "estree-is-function": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/estree-is-function/-/estree-is-function-1.0.0.tgz", - "integrity": "sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==", - "dev": true + "integrity": "sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==" }, "esutils": { "version": "2.0.2", @@ -3305,7 +3300,6 @@ "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, "requires": { "d": "1", "es5-ext": "~0.10.14" @@ -4482,8 +4476,7 @@ "get-assigned-identifiers": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz", - "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==", - "dev": true + "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==" }, "get-caller-file": { "version": "1.0.3", @@ -4709,13 +4702,12 @@ } }, "gl-plot2d": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/gl-plot2d/-/gl-plot2d-1.4.0.tgz", - "integrity": "sha512-cO1R6TSMHZKxpsxT2jSxxZ/sN6KdkPLvpzp1t5W5qB5xUs4RiTmAw1jd9s1ogdZYBqYJVIrj6ktCrua3Ligc+Q==", + "version": "git://github.com/gl-vis/gl-plot2d.git#b443a56bd6d8b76ff01ae4d2791da27661ac010f", + "from": "git://github.com/gl-vis/gl-plot2d.git#b443a56bd6d8b76ff01ae4d2791da27661ac010f", "requires": { "binary-search-bounds": "^2.0.3", "gl-buffer": "^2.1.2", - "gl-select-static": "^2.0.2", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", "gl-shader": "^4.2.1", "glsl-inverse": "^1.0.0", "glslify": "^6.1.0", @@ -4726,6 +4718,100 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.4.tgz", "integrity": "sha512-2hg5kgdKql5ClF2ErBcSx0U5bnl5hgS4v7wMnLFodyR47yMtj2w+UAZB+0CiqyHct2q543i7Bi4/aMIegorCCg==" + }, + "cwise": { + "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "requires": { + "cwise-compiler": "^1.1.1", + "cwise-parser": "^1.0.0", + "static-module": "^3.0.0", + "uglify-js": "^2.6.0" + } + }, + "duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "requires": { + "readable-stream": "^2.0.2" + } + }, + "escodegen": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", + "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", + "requires": { + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "gl-select-static": { + "version": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", + "from": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", + "requires": { + "bit-twiddle": "^1.0.2", + "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "gl-fbo": "^2.0.3", + "ndarray": "^1.0.15", + "typedarray-pool": "^1.1.0" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "object-inspect": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", + "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "static-module": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.0.tgz", + "integrity": "sha512-SM757x+T52ye+QNDo80F53rNpir/ZyyFL0NjPXHRXb1hT1eC2Tzq+LV5P2X12UzHJH5SfD248I5/jzUoSey89Q==", + "requires": { + "acorn-node": "^1.3.0", + "concat-stream": "~1.6.0", + "convert-source-map": "^1.5.1", + "duplexer2": "~0.1.4", + "escodegen": "~1.9.0", + "has": "^1.0.1", + "magic-string": "^0.22.4", + "merge-source-map": "1.0.4", + "object-inspect": "~1.4.0", + "readable-stream": "~2.3.3", + "scope-analyzer": "^2.0.1", + "shallow-copy": "~0.0.1", + "static-eval": "^2.0.0", + "through2": "~2.0.3" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -7330,11 +7416,95 @@ } }, "ndarray-fill": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ndarray-fill/-/ndarray-fill-1.0.2.tgz", - "integrity": "sha1-owpg9xiODJWC/N1YiWrNy1IqHtY=", + "version": "git://github.com/archmoj/ndarray-fill.git#d61a638a550c83f4fc2add00de34b2848bd5ce9b", + "from": "git://github.com/archmoj/ndarray-fill.git#d61a638a550c83f4fc2add00de34b2848bd5ce9b", "requires": { - "cwise": "^1.0.10" + "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71" + }, + "dependencies": { + "cwise": { + "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "requires": { + "cwise-compiler": "^1.1.1", + "cwise-parser": "^1.0.0", + "static-module": "^3.0.0", + "uglify-js": "^2.6.0" + } + }, + "duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "requires": { + "readable-stream": "^2.0.2" + } + }, + "escodegen": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", + "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", + "requires": { + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "object-inspect": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", + "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "static-module": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.0.tgz", + "integrity": "sha512-SM757x+T52ye+QNDo80F53rNpir/ZyyFL0NjPXHRXb1hT1eC2Tzq+LV5P2X12UzHJH5SfD248I5/jzUoSey89Q==", + "requires": { + "acorn-node": "^1.3.0", + "concat-stream": "~1.6.0", + "convert-source-map": "^1.5.1", + "duplexer2": "~0.1.4", + "escodegen": "~1.9.0", + "has": "^1.0.1", + "magic-string": "^0.22.4", + "merge-source-map": "1.0.4", + "object-inspect": "~1.4.0", + "readable-stream": "~2.3.3", + "scope-analyzer": "^2.0.1", + "shallow-copy": "~0.0.1", + "static-eval": "^2.0.0", + "through2": "~2.0.3" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, "ndarray-gradient": { @@ -9443,7 +9613,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/scope-analyzer/-/scope-analyzer-2.0.5.tgz", "integrity": "sha512-+U5H0417mnTEstCD5VwOYO7V4vYuSqwqjFap40ythe67bhMFL5C3UgPwyBv7KDJsqUBIKafOD57xMlh1rN7eaw==", - "dev": true, "requires": { "array-from": "^2.1.1", "es6-map": "^0.1.5", diff --git a/package.json b/package.json index c726da9493c..22a20763633 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "gl-line3d": "^1.1.6", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.2", - "gl-plot2d": "^1.4.0", + "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#b443a56bd6d8b76ff01ae4d2791da27661ac010f", "gl-plot3d": "^1.6.0", "gl-pointcloud2d": "^1.0.1", "gl-scatter3d": "^1.1.0", From 25d13483da09cf66c7a2ec3810cd7b90ce770331 Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 19 Nov 2018 17:34:21 -0500 Subject: [PATCH 03/11] updated more modules --- package-lock.json | 99 +++++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 92 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3853991187b..c3795124407 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4816,16 +4816,15 @@ } }, "gl-plot3d": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-1.6.0.tgz", - "integrity": "sha512-SWUXVuWlBE+GIQWysB5HmoqBDkkaCydT8JJl5CWyApau3bTtHzEEafMEBBfkc4THmk/3YXgmjmSlXF5vefTo/g==", + "version": "git://github.com/gl-vis/gl-plot3d.git#02991fd4b8a57047e245cddd2577efcf7440c7d7", + "from": "git://github.com/gl-vis/gl-plot3d.git#02991fd4b8a57047e245cddd2577efcf7440c7d7", "requires": { "3d-view-controls": "^2.2.0", "a-big-triangle": "^1.0.0", "gl-axes3d": "^1.4.0", "gl-fbo": "^2.0.3", "gl-mat4": "^1.1.2", - "gl-select-static": "^2.0.2", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", "gl-shader": "^4.2.1", "gl-spikes3d": "^1.0.3", "glslify": "^6.1.0", @@ -4889,15 +4888,99 @@ } }, "gl-select-static": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/gl-select-static/-/gl-select-static-2.0.2.tgz", - "integrity": "sha1-8+GQHfAxgdUy55WFMjBnnUr1fuk=", + "version": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", + "from": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", "requires": { "bit-twiddle": "^1.0.2", - "cwise": "^1.0.3", + "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", "gl-fbo": "^2.0.3", "ndarray": "^1.0.15", "typedarray-pool": "^1.1.0" + }, + "dependencies": { + "cwise": { + "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "requires": { + "cwise-compiler": "^1.1.1", + "cwise-parser": "^1.0.0", + "static-module": "^3.0.0", + "uglify-js": "^2.6.0" + } + }, + "duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "requires": { + "readable-stream": "^2.0.2" + } + }, + "escodegen": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", + "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", + "requires": { + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "object-inspect": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", + "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "static-module": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.0.tgz", + "integrity": "sha512-SM757x+T52ye+QNDo80F53rNpir/ZyyFL0NjPXHRXb1hT1eC2Tzq+LV5P2X12UzHJH5SfD248I5/jzUoSey89Q==", + "requires": { + "acorn-node": "^1.3.0", + "concat-stream": "~1.6.0", + "convert-source-map": "^1.5.1", + "duplexer2": "~0.1.4", + "escodegen": "~1.9.0", + "has": "^1.0.1", + "magic-string": "^0.22.4", + "merge-source-map": "1.0.4", + "object-inspect": "~1.4.0", + "readable-stream": "~2.3.3", + "scope-analyzer": "^2.0.1", + "shallow-copy": "~0.0.1", + "static-eval": "^2.0.0", + "through2": "~2.0.3" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, "gl-shader": { diff --git a/package.json b/package.json index 22a20763633..1bbf9504c2a 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.2", "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#b443a56bd6d8b76ff01ae4d2791da27661ac010f", - "gl-plot3d": "^1.6.0", + "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#02991fd4b8a57047e245cddd2577efcf7440c7d7", "gl-pointcloud2d": "^1.0.1", "gl-scatter3d": "^1.1.0", "gl-select-box": "^1.0.2", From 310bda5b2ff027237143cc9d16650f7706b57bfc Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 19 Nov 2018 17:37:13 -0500 Subject: [PATCH 04/11] updated another module --- package-lock.json | 233 ++++++++++++++++------------------------------ package.json | 2 +- 2 files changed, 83 insertions(+), 152 deletions(-) diff --git a/package-lock.json b/package-lock.json index c3795124407..08cb9e5b9b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -286,7 +286,8 @@ "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true }, "ansi-escapes": { "version": "3.1.0", @@ -2199,13 +2200,12 @@ "dev": true }, "cwise": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/cwise/-/cwise-1.0.10.tgz", - "integrity": "sha1-JO7mBy69/WuMb12tsXCQtkmxK+8=", + "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", "requires": { "cwise-compiler": "^1.1.1", "cwise-parser": "^1.0.0", - "static-module": "^1.0.0", + "static-module": "^3.0.0", "uglify-js": "^2.6.0" } }, @@ -2793,22 +2793,38 @@ "dev": true }, "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "requires": { - "readable-stream": "~1.1.9" + "readable-stream": "^2.0.2" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "version": "2.3.6", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" } } } @@ -7600,12 +7616,11 @@ } }, "ndarray-homography": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ndarray-homography/-/ndarray-homography-1.0.0.tgz", - "integrity": "sha1-w1UW6oa8KGK06ASiNqJwcwn+KWs=", + "version": "git://github.com/archmoj/ndarray-homography.git#423590db51cba0d30eaa5b6f34b4b3f27a53d3f8", + "from": "git://github.com/archmoj/ndarray-homography.git#423590db51cba0d30eaa5b6f34b4b3f27a53d3f8", "requires": { "gl-matrix-invert": "^1.0.0", - "ndarray-warp": "^1.0.0" + "ndarray-warp": "git://github.com/archmoj/ndarray-warp.git#b72a3dc32101e6f22505dc2cbbcaec67b1e88a69" } }, "ndarray-linear-interpolate": { @@ -7649,11 +7664,10 @@ } }, "ndarray-warp": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ndarray-warp/-/ndarray-warp-1.0.1.tgz", - "integrity": "sha1-qKElqqu6C+v5O9bKg+ar1oIqNOA=", + "version": "git://github.com/archmoj/ndarray-warp.git#b72a3dc32101e6f22505dc2cbbcaec67b1e88a69", + "from": "git://github.com/archmoj/ndarray-warp.git#b72a3dc32101e6f22505dc2cbbcaec67b1e88a69", "requires": { - "cwise": "^1.0.4", + "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", "ndarray-linear-interpolate": "^1.0.0" } }, @@ -8771,44 +8785,6 @@ "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz", "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==" }, - "quote-stream": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz", - "integrity": "sha1-zeKelMQJsW4Z3HCYuJtmWPlyHTs=", - "requires": { - "minimist": "0.0.8", - "through2": "~0.4.1" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" - }, - "through2": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", - "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", - "requires": { - "readable-stream": "~1.0.17", - "xtend": "~2.1.1" - } - }, - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "requires": { - "object-keys": "~0.4.0" - } - } - } - }, "raf": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz", @@ -10308,113 +10284,68 @@ } }, "static-module": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz", - "integrity": "sha1-J9qYg8QajNCSNvhC8MHrxu32PYY=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.0.tgz", + "integrity": "sha512-SM757x+T52ye+QNDo80F53rNpir/ZyyFL0NjPXHRXb1hT1eC2Tzq+LV5P2X12UzHJH5SfD248I5/jzUoSey89Q==", "requires": { + "acorn-node": "^1.3.0", "concat-stream": "~1.6.0", - "duplexer2": "~0.0.2", - "escodegen": "~1.3.2", - "falafel": "^2.1.0", - "has": "^1.0.0", - "object-inspect": "~0.4.0", - "quote-stream": "~0.0.0", - "readable-stream": "~1.0.27-1", + "convert-source-map": "^1.5.1", + "duplexer2": "~0.1.4", + "escodegen": "~1.9.0", + "has": "^1.0.1", + "magic-string": "^0.22.4", + "merge-source-map": "1.0.4", + "object-inspect": "~1.4.0", + "readable-stream": "~2.3.3", + "scope-analyzer": "^2.0.1", "shallow-copy": "~0.0.1", - "static-eval": "~0.2.0", - "through2": "~0.4.1" + "static-eval": "^2.0.0", + "through2": "~2.0.3" }, "dependencies": { "escodegen": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz", - "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", + "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", "requires": { - "esprima": "~1.1.1", - "estraverse": "~1.5.0", - "esutils": "~1.0.0", - "source-map": "~0.1.33" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" } }, - "esprima": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz", - "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=" - }, - "estraverse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", - "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=" - }, - "esutils": { + "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", - "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "object-inspect": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz", - "integrity": "sha1-9RV8EWwUVbJDsG7pdwM5LFrYn+w=" - }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - } - }, - "static-eval": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz", - "integrity": "sha1-t9NNg4k3uWn5ZBygfUj47eJj6ns=", - "requires": { - "escodegen": "~0.0.24" - }, - "dependencies": { - "escodegen": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz", - "integrity": "sha1-Dk/xcV8yh3XWyrUaxEpAbNer/9M=", - "requires": { - "esprima": "~1.0.2", - "estraverse": "~1.3.0", - "source-map": ">= 0.1.2" - } - }, - "esprima": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", - "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=" - }, - "estraverse": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz", - "integrity": "sha1-N8K4k+8T1yPydth41g2FNRUqbEI=" - } - } + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", + "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" }, - "through2": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", - "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "readable-stream": "~1.0.17", - "xtend": "~2.1.1" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "object-keys": "~0.4.0" + "safe-buffer": "~5.1.0" } } } diff --git a/package.json b/package.json index 1bbf9504c2a..79351675ff5 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "mouse-wheel": "^1.0.2", "ndarray": "^1.0.18", "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#d61a638a550c83f4fc2add00de34b2848bd5ce9b", - "ndarray-homography": "^1.0.0", + "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#423590db51cba0d30eaa5b6f34b4b3f27a53d3f8", "ndarray-ops": "^1.2.2", "point-cluster": "^3.1.4", "polybooljs": "^1.2.0", From 897fd2883d5249c7ba6c7498dd137f2e8923165a Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 20 Nov 2018 13:24:27 -0500 Subject: [PATCH 05/11] using another cwise version --- package-lock.json | 312 +++++++--------------------------------------- package.json | 8 +- 2 files changed, 50 insertions(+), 270 deletions(-) diff --git a/package-lock.json b/package-lock.json index 08cb9e5b9b2..88fa4798d5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2200,13 +2200,21 @@ "dev": true }, "cwise": { - "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", - "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "version": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", + "from": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", "requires": { + "acorn": "^6.0.4", "cwise-compiler": "^1.1.1", "cwise-parser": "^1.0.0", "static-module": "^3.0.0", "uglify-js": "^2.6.0" + }, + "dependencies": { + "acorn": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", + "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==" + } } }, "cwise-compiler": { @@ -4718,129 +4726,52 @@ } }, "gl-plot2d": { - "version": "git://github.com/gl-vis/gl-plot2d.git#b443a56bd6d8b76ff01ae4d2791da27661ac010f", - "from": "git://github.com/gl-vis/gl-plot2d.git#b443a56bd6d8b76ff01ae4d2791da27661ac010f", + "version": "git://github.com/gl-vis/gl-plot2d.git#f7d55632e545709cbad4748430a59e159782fa61", + "from": "git://github.com/gl-vis/gl-plot2d.git#f7d55632e545709cbad4748430a59e159782fa61", "requires": { + "acorn": "^6.0.4", "binary-search-bounds": "^2.0.3", "gl-buffer": "^2.1.2", - "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", "gl-shader": "^4.2.1", "glsl-inverse": "^1.0.0", "glslify": "^6.1.0", "text-cache": "^4.2.0" }, "dependencies": { + "acorn": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", + "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==" + }, "binary-search-bounds": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.4.tgz", "integrity": "sha512-2hg5kgdKql5ClF2ErBcSx0U5bnl5hgS4v7wMnLFodyR47yMtj2w+UAZB+0CiqyHct2q543i7Bi4/aMIegorCCg==" }, - "cwise": { - "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", - "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", - "requires": { - "cwise-compiler": "^1.1.1", - "cwise-parser": "^1.0.0", - "static-module": "^3.0.0", - "uglify-js": "^2.6.0" - } - }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "requires": { - "readable-stream": "^2.0.2" - } - }, - "escodegen": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", - "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", - "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - } - }, "gl-select-static": { - "version": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", - "from": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", + "version": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", + "from": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", "requires": { "bit-twiddle": "^1.0.2", - "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", "gl-fbo": "^2.0.3", "ndarray": "^1.0.15", "typedarray-pool": "^1.1.0" } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "object-inspect": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", - "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "static-module": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.0.tgz", - "integrity": "sha512-SM757x+T52ye+QNDo80F53rNpir/ZyyFL0NjPXHRXb1hT1eC2Tzq+LV5P2X12UzHJH5SfD248I5/jzUoSey89Q==", - "requires": { - "acorn-node": "^1.3.0", - "concat-stream": "~1.6.0", - "convert-source-map": "^1.5.1", - "duplexer2": "~0.1.4", - "escodegen": "~1.9.0", - "has": "^1.0.1", - "magic-string": "^0.22.4", - "merge-source-map": "1.0.4", - "object-inspect": "~1.4.0", - "readable-stream": "~2.3.3", - "scope-analyzer": "^2.0.1", - "shallow-copy": "~0.0.1", - "static-eval": "^2.0.0", - "through2": "~2.0.3" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } } } }, "gl-plot3d": { - "version": "git://github.com/gl-vis/gl-plot3d.git#02991fd4b8a57047e245cddd2577efcf7440c7d7", - "from": "git://github.com/gl-vis/gl-plot3d.git#02991fd4b8a57047e245cddd2577efcf7440c7d7", + "version": "git://github.com/gl-vis/gl-plot3d.git#8fc3374afd9a8317e52c64ea4bb01a38c519aa91", + "from": "git://github.com/gl-vis/gl-plot3d.git#8fc3374afd9a8317e52c64ea4bb01a38c519aa91", "requires": { "3d-view-controls": "^2.2.0", "a-big-triangle": "^1.0.0", "gl-axes3d": "^1.4.0", "gl-fbo": "^2.0.3", "gl-mat4": "^1.1.2", - "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", "gl-shader": "^4.2.1", "gl-spikes3d": "^1.0.3", "glslify": "^6.1.0", @@ -4904,99 +4835,14 @@ } }, "gl-select-static": { - "version": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", - "from": "git://github.com/gl-vis/gl-select-static.git#c1a20bcb01ce45da99de17eb21b827f4d8b1d060", + "version": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", + "from": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", "requires": { "bit-twiddle": "^1.0.2", - "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", "gl-fbo": "^2.0.3", "ndarray": "^1.0.15", "typedarray-pool": "^1.1.0" - }, - "dependencies": { - "cwise": { - "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", - "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", - "requires": { - "cwise-compiler": "^1.1.1", - "cwise-parser": "^1.0.0", - "static-module": "^3.0.0", - "uglify-js": "^2.6.0" - } - }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "requires": { - "readable-stream": "^2.0.2" - } - }, - "escodegen": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", - "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", - "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "object-inspect": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", - "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "static-module": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.0.tgz", - "integrity": "sha512-SM757x+T52ye+QNDo80F53rNpir/ZyyFL0NjPXHRXb1hT1eC2Tzq+LV5P2X12UzHJH5SfD248I5/jzUoSey89Q==", - "requires": { - "acorn-node": "^1.3.0", - "concat-stream": "~1.6.0", - "convert-source-map": "^1.5.1", - "duplexer2": "~0.1.4", - "escodegen": "~1.9.0", - "has": "^1.0.1", - "magic-string": "^0.22.4", - "merge-source-map": "1.0.4", - "object-inspect": "~1.4.0", - "readable-stream": "~2.3.3", - "scope-analyzer": "^2.0.1", - "shallow-copy": "~0.0.1", - "static-eval": "^2.0.0", - "through2": "~2.0.3" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } } }, "gl-shader": { @@ -7515,94 +7361,28 @@ } }, "ndarray-fill": { - "version": "git://github.com/archmoj/ndarray-fill.git#d61a638a550c83f4fc2add00de34b2848bd5ce9b", - "from": "git://github.com/archmoj/ndarray-fill.git#d61a638a550c83f4fc2add00de34b2848bd5ce9b", + "version": "git://github.com/archmoj/ndarray-fill.git#5f506a54e13954ed6175bc7ea3fc9816a811bac9", + "from": "git://github.com/archmoj/ndarray-fill.git#5f506a54e13954ed6175bc7ea3fc9816a811bac9", "requires": { - "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71" + "acorn": "^6.0.4", + "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16" }, "dependencies": { + "acorn": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", + "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==" + }, "cwise": { - "version": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", - "from": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "version": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", + "from": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", "requires": { + "acorn": "^6.0.4", "cwise-compiler": "^1.1.1", "cwise-parser": "^1.0.0", "static-module": "^3.0.0", "uglify-js": "^2.6.0" } - }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", - "requires": { - "readable-stream": "^2.0.2" - } - }, - "escodegen": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", - "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", - "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "object-inspect": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz", - "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "static-module": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.0.tgz", - "integrity": "sha512-SM757x+T52ye+QNDo80F53rNpir/ZyyFL0NjPXHRXb1hT1eC2Tzq+LV5P2X12UzHJH5SfD248I5/jzUoSey89Q==", - "requires": { - "acorn-node": "^1.3.0", - "concat-stream": "~1.6.0", - "convert-source-map": "^1.5.1", - "duplexer2": "~0.1.4", - "escodegen": "~1.9.0", - "has": "^1.0.1", - "magic-string": "^0.22.4", - "merge-source-map": "1.0.4", - "object-inspect": "~1.4.0", - "readable-stream": "~2.3.3", - "scope-analyzer": "^2.0.1", - "shallow-copy": "~0.0.1", - "static-eval": "^2.0.0", - "through2": "~2.0.3" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } } } }, @@ -7616,11 +7396,11 @@ } }, "ndarray-homography": { - "version": "git://github.com/archmoj/ndarray-homography.git#423590db51cba0d30eaa5b6f34b4b3f27a53d3f8", - "from": "git://github.com/archmoj/ndarray-homography.git#423590db51cba0d30eaa5b6f34b4b3f27a53d3f8", + "version": "git://github.com/archmoj/ndarray-homography.git#e8c9a0054a778190f421175139edc0289dd1cec2", + "from": "git://github.com/archmoj/ndarray-homography.git#e8c9a0054a778190f421175139edc0289dd1cec2", "requires": { "gl-matrix-invert": "^1.0.0", - "ndarray-warp": "git://github.com/archmoj/ndarray-warp.git#b72a3dc32101e6f22505dc2cbbcaec67b1e88a69" + "ndarray-warp": "git://github.com/archmoj/ndarray-warp.git#9808d11e2b4aee480b2120fddead6b3d4ad82805" } }, "ndarray-linear-interpolate": { @@ -7664,10 +7444,10 @@ } }, "ndarray-warp": { - "version": "git://github.com/archmoj/ndarray-warp.git#b72a3dc32101e6f22505dc2cbbcaec67b1e88a69", - "from": "git://github.com/archmoj/ndarray-warp.git#b72a3dc32101e6f22505dc2cbbcaec67b1e88a69", + "version": "git://github.com/archmoj/ndarray-warp.git#9808d11e2b4aee480b2120fddead6b3d4ad82805", + "from": "git://github.com/archmoj/ndarray-warp.git#9808d11e2b4aee480b2120fddead6b3d4ad82805", "requires": { - "cwise": "git://github.com/archmoj/cwise.git#03dcf53e91ebdeb1df0f62263871b9fd42510c71", + "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", "ndarray-linear-interpolate": "^1.0.0" } }, diff --git a/package.json b/package.json index 79351675ff5..82eca2781e4 100644 --- a/package.json +++ b/package.json @@ -77,8 +77,8 @@ "gl-line3d": "^1.1.6", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.2", - "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#b443a56bd6d8b76ff01ae4d2791da27661ac010f", - "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#02991fd4b8a57047e245cddd2577efcf7440c7d7", + "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#f7d55632e545709cbad4748430a59e159782fa61", + "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#8fc3374afd9a8317e52c64ea4bb01a38c519aa91", "gl-pointcloud2d": "^1.0.1", "gl-scatter3d": "^1.1.0", "gl-select-box": "^1.0.2", @@ -95,8 +95,8 @@ "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.0.2", "ndarray": "^1.0.18", - "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#d61a638a550c83f4fc2add00de34b2848bd5ce9b", - "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#423590db51cba0d30eaa5b6f34b4b3f27a53d3f8", + "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#5f506a54e13954ed6175bc7ea3fc9816a811bac9", + "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#e8c9a0054a778190f421175139edc0289dd1cec2", "ndarray-ops": "^1.2.2", "point-cluster": "^3.1.4", "polybooljs": "^1.2.0", From aae9772564510591101ca933a791162fb8b65d7c Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 20 Nov 2018 18:29:24 -0500 Subject: [PATCH 06/11] updated cwise gl-select-static gl-plot2d and gl-plot3d --- package-lock.json | 41 +++++++++++++++++++++-------------------- package.json | 4 ++-- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 88fa4798d5e..f30b9b3454a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4726,13 +4726,13 @@ } }, "gl-plot2d": { - "version": "git://github.com/gl-vis/gl-plot2d.git#f7d55632e545709cbad4748430a59e159782fa61", - "from": "git://github.com/gl-vis/gl-plot2d.git#f7d55632e545709cbad4748430a59e159782fa61", + "version": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", + "from": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", "requires": { "acorn": "^6.0.4", "binary-search-bounds": "^2.0.3", "gl-buffer": "^2.1.2", - "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", "gl-shader": "^4.2.1", "glsl-inverse": "^1.0.0", "glslify": "^6.1.0", @@ -4748,30 +4748,19 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.4.tgz", "integrity": "sha512-2hg5kgdKql5ClF2ErBcSx0U5bnl5hgS4v7wMnLFodyR47yMtj2w+UAZB+0CiqyHct2q543i7Bi4/aMIegorCCg==" - }, - "gl-select-static": { - "version": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", - "from": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", - "requires": { - "bit-twiddle": "^1.0.2", - "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", - "gl-fbo": "^2.0.3", - "ndarray": "^1.0.15", - "typedarray-pool": "^1.1.0" - } } } }, "gl-plot3d": { - "version": "git://github.com/gl-vis/gl-plot3d.git#8fc3374afd9a8317e52c64ea4bb01a38c519aa91", - "from": "git://github.com/gl-vis/gl-plot3d.git#8fc3374afd9a8317e52c64ea4bb01a38c519aa91", + "version": "git://github.com/gl-vis/gl-plot3d.git#98560ce6bd25cff9c002dd6c310b61ca5d6b5413", + "from": "git://github.com/gl-vis/gl-plot3d.git#98560ce6bd25cff9c002dd6c310b61ca5d6b5413", "requires": { "3d-view-controls": "^2.2.0", "a-big-triangle": "^1.0.0", "gl-axes3d": "^1.4.0", "gl-fbo": "^2.0.3", "gl-mat4": "^1.1.2", - "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", "gl-shader": "^4.2.1", "gl-spikes3d": "^1.0.3", "glslify": "^6.1.0", @@ -4835,14 +4824,26 @@ } }, "gl-select-static": { - "version": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", - "from": "git://github.com/gl-vis/gl-select-static.git#4276d924662a77e21cdbffdf87bfcf162e97007f", + "version": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", + "from": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", "requires": { "bit-twiddle": "^1.0.2", - "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", + "cwise": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", "gl-fbo": "^2.0.3", "ndarray": "^1.0.15", "typedarray-pool": "^1.1.0" + }, + "dependencies": { + "cwise": { + "version": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", + "from": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", + "requires": { + "cwise-compiler": "^1.1.1", + "cwise-parser": "^1.0.0", + "static-module": "^3.0.0", + "uglify-js": "^2.6.0" + } + } } }, "gl-shader": { diff --git a/package.json b/package.json index 82eca2781e4..4c40d627d3e 100644 --- a/package.json +++ b/package.json @@ -77,8 +77,8 @@ "gl-line3d": "^1.1.6", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.0.2", - "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#f7d55632e545709cbad4748430a59e159782fa61", - "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#8fc3374afd9a8317e52c64ea4bb01a38c519aa91", + "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", + "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#98560ce6bd25cff9c002dd6c310b61ca5d6b5413", "gl-pointcloud2d": "^1.0.1", "gl-scatter3d": "^1.1.0", "gl-select-box": "^1.0.2", From a485d69df2d3d13c22be1e2784ea47f95a7c6423 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 20 Nov 2018 18:34:44 -0500 Subject: [PATCH 07/11] updated ndarray-fill --- package-lock.json | 17 +++++------------ package.json | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index f30b9b3454a..51240ab0865 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7362,23 +7362,16 @@ } }, "ndarray-fill": { - "version": "git://github.com/archmoj/ndarray-fill.git#5f506a54e13954ed6175bc7ea3fc9816a811bac9", - "from": "git://github.com/archmoj/ndarray-fill.git#5f506a54e13954ed6175bc7ea3fc9816a811bac9", + "version": "git://github.com/archmoj/ndarray-fill.git#1a77374f63df819bef152c86544bb6660faf5120", + "from": "git://github.com/archmoj/ndarray-fill.git#1a77374f63df819bef152c86544bb6660faf5120", "requires": { - "acorn": "^6.0.4", - "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16" + "cwise": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a" }, "dependencies": { - "acorn": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", - "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==" - }, "cwise": { - "version": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", - "from": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", + "version": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", + "from": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", "requires": { - "acorn": "^6.0.4", "cwise-compiler": "^1.1.1", "cwise-parser": "^1.0.0", "static-module": "^3.0.0", diff --git a/package.json b/package.json index 4c40d627d3e..5264662b39f 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.0.2", "ndarray": "^1.0.18", - "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#5f506a54e13954ed6175bc7ea3fc9816a811bac9", + "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#1a77374f63df819bef152c86544bb6660faf5120", "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#e8c9a0054a778190f421175139edc0289dd1cec2", "ndarray-ops": "^1.2.2", "point-cluster": "^3.1.4", From aa19c5151513f0632d3718a5fae5d99f9a63ac85 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 20 Nov 2018 18:40:03 -0500 Subject: [PATCH 08/11] updated other packages --- package-lock.json | 24 ++++++++---------------- package.json | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 51240ab0865..5321ec009e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2200,21 +2200,13 @@ "dev": true }, "cwise": { - "version": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", - "from": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", + "version": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", + "from": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", "requires": { - "acorn": "^6.0.4", "cwise-compiler": "^1.1.1", "cwise-parser": "^1.0.0", "static-module": "^3.0.0", "uglify-js": "^2.6.0" - }, - "dependencies": { - "acorn": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", - "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==" - } } }, "cwise-compiler": { @@ -7390,11 +7382,11 @@ } }, "ndarray-homography": { - "version": "git://github.com/archmoj/ndarray-homography.git#e8c9a0054a778190f421175139edc0289dd1cec2", - "from": "git://github.com/archmoj/ndarray-homography.git#e8c9a0054a778190f421175139edc0289dd1cec2", + "version": "git://github.com/archmoj/ndarray-homography.git#8c1278df2605c3efb6998bdf3c185b332d94a83b", + "from": "git://github.com/archmoj/ndarray-homography.git#8c1278df2605c3efb6998bdf3c185b332d94a83b", "requires": { "gl-matrix-invert": "^1.0.0", - "ndarray-warp": "git://github.com/archmoj/ndarray-warp.git#9808d11e2b4aee480b2120fddead6b3d4ad82805" + "ndarray-warp": "git://github.com/archmoj/ndarray-warp.git#893cf0cf5a4f981f3230d2ed8c73bbe08386d20c" } }, "ndarray-linear-interpolate": { @@ -7438,10 +7430,10 @@ } }, "ndarray-warp": { - "version": "git://github.com/archmoj/ndarray-warp.git#9808d11e2b4aee480b2120fddead6b3d4ad82805", - "from": "git://github.com/archmoj/ndarray-warp.git#9808d11e2b4aee480b2120fddead6b3d4ad82805", + "version": "git://github.com/archmoj/ndarray-warp.git#893cf0cf5a4f981f3230d2ed8c73bbe08386d20c", + "from": "git://github.com/archmoj/ndarray-warp.git#893cf0cf5a4f981f3230d2ed8c73bbe08386d20c", "requires": { - "cwise": "git://github.com/archmoj/cwise.git#583a044b24e420b602e385e0d77dc76b310b9c16", + "cwise": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", "ndarray-linear-interpolate": "^1.0.0" } }, diff --git a/package.json b/package.json index 5264662b39f..d6b6f10ea77 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "mouse-wheel": "^1.0.2", "ndarray": "^1.0.18", "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#1a77374f63df819bef152c86544bb6660faf5120", - "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#e8c9a0054a778190f421175139edc0289dd1cec2", + "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#8c1278df2605c3efb6998bdf3c185b332d94a83b", "ndarray-ops": "^1.2.2", "point-cluster": "^3.1.4", "polybooljs": "^1.2.0", From f69804de3e7101d1e65603e651501c5c17626411 Mon Sep 17 00:00:00 2001 From: archmoj Date: Tue, 20 Nov 2018 23:12:18 -0500 Subject: [PATCH 09/11] upgraded more gl-vis packages --- package-lock.json | 93 ++++++++++++++++++++--------------------------- package.json | 12 +++--- 2 files changed, 46 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5321ec009e4..bdfd002f9a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4563,15 +4563,14 @@ } }, "gl-cone3d": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/gl-cone3d/-/gl-cone3d-1.2.1.tgz", - "integrity": "sha512-6Hc/l2qHnQXtVWzE/9i3ZmCVrLaBUYO0VTTH3g46jdkBuNlbALr9bo8ZCtHMIkeZhvzfKzfNylQGLiJL7zqdxw==", + "version": "git://github.com/gl-vis/gl-cone3d.git#11ce65d411865a5637acb853a6deb753b071692f", + "from": "git://github.com/gl-vis/gl-cone3d.git#11ce65d411865a5637acb853a6deb753b071692f", "requires": { "gl-shader": "^4.2.1", - "gl-vec3": "^1.0.0", + "gl-vec3": "^1.1.3", "glsl-inverse": "^1.0.0", "glsl-out-of-range": "^1.0.3", - "glslify": "^6.1.0" + "glslify": "^6.3.1" } }, "gl-constants": { @@ -4654,19 +4653,18 @@ } }, "gl-line3d": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/gl-line3d/-/gl-line3d-1.1.6.tgz", - "integrity": "sha512-22DcHvezFTJ0BK1lYyV9FRV4Z2moey0RAiFynGEIrvbUq3EBd7e+Sftv1/A6kxNUqdp5SIWmMdGznoAPD9P8FQ==", + "version": "git://github.com/gl-vis/gl-line3d.git#8a4db0b069814621b4613b927031ad0068d0dbc1", + "from": "git://github.com/gl-vis/gl-line3d.git#8a4db0b069814621b4613b927031ad0068d0dbc1", "requires": { "binary-search-bounds": "^1.0.0", - "gl-buffer": "^2.0.8", + "gl-buffer": "^2.1.2", "gl-shader": "^4.2.1", - "gl-texture2d": "^2.0.2", - "gl-vao": "^1.1.3", + "gl-texture2d": "^2.1.0", + "gl-vao": "^1.3.0", "glsl-out-of-range": "^1.0.3", "glsl-read-float": "^1.0.0", - "glslify": "^6.1.0", - "ndarray": "^1.0.16" + "glslify": "^6.3.1", + "ndarray": "^1.0.18" } }, "gl-mat2": { @@ -4695,25 +4693,24 @@ } }, "gl-mesh3d": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/gl-mesh3d/-/gl-mesh3d-2.0.2.tgz", - "integrity": "sha512-gKkeEDBVP1rp6iDzz/aomAMsDkkoieihsXJccampo0zhfi9To6xhadEDt6axdUpv5rNjM8l02IPp/wuLDuLJOg==", + "version": "git://github.com/gl-vis/gl-mesh3d.git#931cbec5e8ce019c71fa526921b66471343cf8a8", + "from": "git://github.com/gl-vis/gl-mesh3d.git#931cbec5e8ce019c71fa526921b66471343cf8a8", "requires": { "barycentric": "^1.0.1", "colormap": "^2.1.0", - "gl-buffer": "^2.0.8", + "gl-buffer": "^2.1.2", "gl-mat4": "^1.0.0", "gl-shader": "^4.2.1", - "gl-texture2d": "^2.0.8", - "gl-vao": "^1.1.3", + "gl-texture2d": "^2.1.0", + "gl-vao": "^1.3.0", "glsl-face-normal": "^1.0.2", "glsl-out-of-range": "^1.0.3", "glsl-specular-cook-torrance": "^2.0.1", - "glslify": "^6.1.0", - "ndarray": "^1.0.15", - "normals": "^1.0.1", + "glslify": "^6.3.1", + "ndarray": "^1.0.18", + "normals": "^1.1.0", "polytope-closest-point": "^1.0.0", - "simplicial-complex-contour": "^1.0.0", + "simplicial-complex-contour": "^1.0.2", "typedarray-pool": "^1.1.0" } }, @@ -4783,26 +4780,18 @@ } }, "gl-scatter3d": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.1.0.tgz", - "integrity": "sha512-8O/YXxRZloG0LPkmd5hr50IMmgbqdvQZ1axH+E90CpBrqez6D24WFJg74vPka2YJf89DIms8i6kElDlSFHCrCA==", + "version": "git://github.com/gl-vis/gl-scatter3d.git#ca2b4e2789a174eb47b8b67f1351e14ac1c14dfe", + "from": "git://github.com/gl-vis/gl-scatter3d.git#ca2b4e2789a174eb47b8b67f1351e14ac1c14dfe", "requires": { - "gl-buffer": "^2.0.6", + "gl-buffer": "^2.1.2", "gl-mat4": "^1.0.0", - "gl-shader": "^4.2.0", - "gl-vao": "^1.1.2", + "gl-shader": "^4.2.1", + "gl-vao": "^1.3.0", "glsl-out-of-range": "^1.0.3", - "glslify": "^6.1.0", + "glslify": "^6.3.1", "is-string-blank": "^1.0.1", - "typedarray-pool": "^1.0.2", + "typedarray-pool": "^1.1.0", "vectorize-text": "^3.2.0" - }, - "dependencies": { - "glsl-out-of-range": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/glsl-out-of-range/-/glsl-out-of-range-1.0.3.tgz", - "integrity": "sha512-3uSoD4aX4TjHx3uRJnJbUpegePR0tRPf9VWLS7EjDMbHHV+qrKjl8ov93ifG3kqzcxIOmaSXDK248EmM5uoQ/g==" - } } }, "gl-select-box": { @@ -4872,40 +4861,38 @@ } }, "gl-streamtube3d": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/gl-streamtube3d/-/gl-streamtube3d-1.1.1.tgz", - "integrity": "sha512-6UKZ4C9RQVTuVFYhEE/k0vgFvXCm5G0mmw8p+s6vaR+pwAxwU+bTQXLyW6n+gOIy7/F6DiViy1vIq0pc6MZxSw==", + "version": "git://github.com/gl-vis/gl-streamtube3d.git#3bd2aabbb3103c2683a9db3928a68c1895778265", + "from": "git://github.com/gl-vis/gl-streamtube3d.git#3bd2aabbb3103c2683a9db3928a68c1895778265", "requires": { - "gl-vec3": "^1.0.0", + "gl-vec3": "^1.1.3", "glsl-inverse": "^1.0.0", "glsl-out-of-range": "^1.0.3", - "glslify": "^6.1.1" + "glslify": "^6.3.1" } }, "gl-surface3d": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/gl-surface3d/-/gl-surface3d-1.3.7.tgz", - "integrity": "sha512-Q8230JPRBqYb8yDR7ORDZfK3uRY0k0gmqlujPIL36SQdZ1utKSCn/dNIe9SKiqyE7ycfdIBp0Z1otZM23Nn6bA==", + "version": "git://github.com/gl-vis/gl-surface3d.git#7cc81ad9adc23893d89e998019131d8e20dbbf51", + "from": "git://github.com/gl-vis/gl-surface3d.git#7cc81ad9adc23893d89e998019131d8e20dbbf51", "requires": { "binary-search-bounds": "^1.0.0", "bit-twiddle": "^1.0.2", "colormap": "^2.1.0", "dup": "^1.0.0", - "gl-buffer": "^2.0.3", + "gl-buffer": "^2.1.2", "gl-mat4": "^1.0.0", - "gl-shader": "^4.2.0", - "gl-texture2d": "^2.0.0", - "gl-vao": "^1.1.1", + "gl-shader": "^4.2.1", + "gl-texture2d": "^2.1.0", + "gl-vao": "^1.3.0", "glsl-out-of-range": "^1.0.3", "glsl-specular-beckmann": "^1.1.2", - "glslify": "^6.1.0", - "ndarray": "^1.0.16", + "glslify": "^6.3.1", + "ndarray": "^1.0.18", "ndarray-gradient": "^1.0.0", "ndarray-ops": "^1.2.1", "ndarray-pack": "^1.0.1", "ndarray-scratch": "^1.1.1", "surface-nets": "^1.0.2", - "typedarray-pool": "^1.0.0" + "typedarray-pool": "^1.1.0" } }, "gl-text": { diff --git a/package.json b/package.json index d6b6f10ea77..f045e471001 100644 --- a/package.json +++ b/package.json @@ -70,21 +70,21 @@ "es6-promise": "^3.0.2", "fast-isnumeric": "^1.1.2", "font-atlas-sdf": "^1.3.3", - "gl-cone3d": "^1.2.1", + "gl-cone3d": "git://github.com/gl-vis/gl-cone3d.git#11ce65d411865a5637acb853a6deb753b071692f", "gl-contour2d": "^1.1.4", "gl-error3d": "^1.0.9", "gl-heatmap2d": "^1.0.4", - "gl-line3d": "^1.1.6", + "gl-line3d": "git://github.com/gl-vis/gl-line3d.git#8a4db0b069814621b4613b927031ad0068d0dbc1", "gl-mat4": "^1.2.0", - "gl-mesh3d": "^2.0.2", + "gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#931cbec5e8ce019c71fa526921b66471343cf8a8", "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#98560ce6bd25cff9c002dd6c310b61ca5d6b5413", "gl-pointcloud2d": "^1.0.1", - "gl-scatter3d": "^1.1.0", + "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#ca2b4e2789a174eb47b8b67f1351e14ac1c14dfe", "gl-select-box": "^1.0.2", "gl-spikes2d": "^1.0.1", - "gl-streamtube3d": "^1.1.1", - "gl-surface3d": "^1.3.7", + "gl-streamtube3d": "git://github.com/gl-vis/gl-streamtube3d.git#3bd2aabbb3103c2683a9db3928a68c1895778265", + "gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#7cc81ad9adc23893d89e998019131d8e20dbbf51", "gl-text": "^1.1.6", "glslify": "^6.3.1", "has-hover": "^1.0.1", From 1693161b4985ba5794468f6641b6f0ce771d625c Mon Sep 17 00:00:00 2001 From: archmoj Date: Wed, 21 Nov 2018 00:08:58 -0500 Subject: [PATCH 10/11] apply changes in gl-plot3d --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index bdfd002f9a3..9c05d59a01f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4741,21 +4741,21 @@ } }, "gl-plot3d": { - "version": "git://github.com/gl-vis/gl-plot3d.git#98560ce6bd25cff9c002dd6c310b61ca5d6b5413", - "from": "git://github.com/gl-vis/gl-plot3d.git#98560ce6bd25cff9c002dd6c310b61ca5d6b5413", + "version": "git://github.com/gl-vis/gl-plot3d.git#15a740eff949399b5e99d5432769e86c0bc70ece", + "from": "git://github.com/gl-vis/gl-plot3d.git#15a740eff949399b5e99d5432769e86c0bc70ece", "requires": { - "3d-view-controls": "^2.2.0", + "3d-view-controls": "^2.2.2", "a-big-triangle": "^1.0.0", "gl-axes3d": "^1.4.0", "gl-fbo": "^2.0.3", "gl-mat4": "^1.1.2", "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", "gl-shader": "^4.2.1", - "gl-spikes3d": "^1.0.3", - "glslify": "^6.1.0", + "gl-spikes3d": "^1.0.6", + "glslify": "^6.3.1", "is-mobile": "^2.0.0", "mouse-change": "^1.1.1", - "ndarray": "^1.0.16" + "ndarray": "^1.0.18" } }, "gl-pointcloud2d": { diff --git a/package.json b/package.json index f045e471001..c7683be9e45 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "gl-mat4": "^1.2.0", "gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#931cbec5e8ce019c71fa526921b66471343cf8a8", "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", - "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#98560ce6bd25cff9c002dd6c310b61ca5d6b5413", + "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#15a740eff949399b5e99d5432769e86c0bc70ece", "gl-pointcloud2d": "^1.0.1", "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#ca2b4e2789a174eb47b8b67f1351e14ac1c14dfe", "gl-select-box": "^1.0.2", From 7689294d54b7a798d51a8a775ff0c9657bb09dc7 Mon Sep 17 00:00:00 2001 From: archmoj Date: Thu, 22 Nov 2018 01:06:00 -0500 Subject: [PATCH 11/11] apply upgraded cwise ndarray-fill and others --- package-lock.json | 84 +++++++++++++++-------------------------------- package.json | 8 ++--- 2 files changed, 31 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c05d59a01f..382a4abd479 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2200,13 +2200,13 @@ "dev": true }, "cwise": { - "version": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", - "from": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", + "version": "git://github.com/archmoj/cwise.git#8617812463c629115486f1759e6643d2b150d5e5", + "from": "git://github.com/archmoj/cwise.git#8617812463c629115486f1759e6643d2b150d5e5", "requires": { - "cwise-compiler": "^1.1.1", - "cwise-parser": "^1.0.0", + "cwise-compiler": "^1.1.3", + "cwise-parser": "^1.0.3", "static-module": "^3.0.0", - "uglify-js": "^2.6.0" + "uglify-js": "^2.8.29" } }, "cwise-compiler": { @@ -4715,24 +4715,18 @@ } }, "gl-plot2d": { - "version": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", - "from": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", + "version": "git://github.com/gl-vis/gl-plot2d.git#8ff42bee728be05f301e2898dda62166d7a9e1eb", + "from": "git://github.com/gl-vis/gl-plot2d.git#8ff42bee728be05f301e2898dda62166d7a9e1eb", "requires": { - "acorn": "^6.0.4", "binary-search-bounds": "^2.0.3", "gl-buffer": "^2.1.2", - "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#b0ac1b4163477dc6605c42482bcc0674c213f2f3", "gl-shader": "^4.2.1", "glsl-inverse": "^1.0.0", - "glslify": "^6.1.0", + "glslify": "^6.3.1", "text-cache": "^4.2.0" }, "dependencies": { - "acorn": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", - "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==" - }, "binary-search-bounds": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.4.tgz", @@ -4741,15 +4735,15 @@ } }, "gl-plot3d": { - "version": "git://github.com/gl-vis/gl-plot3d.git#15a740eff949399b5e99d5432769e86c0bc70ece", - "from": "git://github.com/gl-vis/gl-plot3d.git#15a740eff949399b5e99d5432769e86c0bc70ece", + "version": "git://github.com/gl-vis/gl-plot3d.git#2779c9f1c4d16f09d319d993e9c2f082ace05322", + "from": "git://github.com/gl-vis/gl-plot3d.git#2779c9f1c4d16f09d319d993e9c2f082ace05322", "requires": { "3d-view-controls": "^2.2.2", "a-big-triangle": "^1.0.0", "gl-axes3d": "^1.4.0", "gl-fbo": "^2.0.3", "gl-mat4": "^1.1.2", - "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", + "gl-select-static": "git://github.com/gl-vis/gl-select-static.git#b0ac1b4163477dc6605c42482bcc0674c213f2f3", "gl-shader": "^4.2.1", "gl-spikes3d": "^1.0.6", "glslify": "^6.3.1", @@ -4805,26 +4799,14 @@ } }, "gl-select-static": { - "version": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", - "from": "git://github.com/gl-vis/gl-select-static.git#7ee3db7a02606fb7e658f4fa2bbc7ead632d7968", + "version": "git://github.com/gl-vis/gl-select-static.git#b0ac1b4163477dc6605c42482bcc0674c213f2f3", + "from": "git://github.com/gl-vis/gl-select-static.git#b0ac1b4163477dc6605c42482bcc0674c213f2f3", "requires": { "bit-twiddle": "^1.0.2", - "cwise": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", - "gl-fbo": "^2.0.3", - "ndarray": "^1.0.15", + "cwise": "git://github.com/archmoj/cwise.git#8617812463c629115486f1759e6643d2b150d5e5", + "gl-fbo": "^2.0.5", + "ndarray": "^1.0.18", "typedarray-pool": "^1.1.0" - }, - "dependencies": { - "cwise": { - "version": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", - "from": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", - "requires": { - "cwise-compiler": "^1.1.1", - "cwise-parser": "^1.0.0", - "static-module": "^3.0.0", - "uglify-js": "^2.6.0" - } - } } }, "gl-shader": { @@ -7341,22 +7323,10 @@ } }, "ndarray-fill": { - "version": "git://github.com/archmoj/ndarray-fill.git#1a77374f63df819bef152c86544bb6660faf5120", - "from": "git://github.com/archmoj/ndarray-fill.git#1a77374f63df819bef152c86544bb6660faf5120", + "version": "git://github.com/archmoj/ndarray-fill.git#ce5b8e1267d5e6148e9d09670effbff029489cdb", + "from": "git://github.com/archmoj/ndarray-fill.git#ce5b8e1267d5e6148e9d09670effbff029489cdb", "requires": { - "cwise": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a" - }, - "dependencies": { - "cwise": { - "version": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", - "from": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", - "requires": { - "cwise-compiler": "^1.1.1", - "cwise-parser": "^1.0.0", - "static-module": "^3.0.0", - "uglify-js": "^2.6.0" - } - } + "cwise": "git://github.com/archmoj/cwise.git#8617812463c629115486f1759e6643d2b150d5e5" } }, "ndarray-gradient": { @@ -7369,11 +7339,11 @@ } }, "ndarray-homography": { - "version": "git://github.com/archmoj/ndarray-homography.git#8c1278df2605c3efb6998bdf3c185b332d94a83b", - "from": "git://github.com/archmoj/ndarray-homography.git#8c1278df2605c3efb6998bdf3c185b332d94a83b", + "version": "git://github.com/archmoj/ndarray-homography.git#1d48c9085e6578d194fe045552440cf8c42bc9e9", + "from": "git://github.com/archmoj/ndarray-homography.git#1d48c9085e6578d194fe045552440cf8c42bc9e9", "requires": { "gl-matrix-invert": "^1.0.0", - "ndarray-warp": "git://github.com/archmoj/ndarray-warp.git#893cf0cf5a4f981f3230d2ed8c73bbe08386d20c" + "ndarray-warp": "git://github.com/archmoj/ndarray-warp.git#ffb7d6c7c5c3fdcd6e41ab97aaa920024fc91fbe" } }, "ndarray-linear-interpolate": { @@ -7417,10 +7387,10 @@ } }, "ndarray-warp": { - "version": "git://github.com/archmoj/ndarray-warp.git#893cf0cf5a4f981f3230d2ed8c73bbe08386d20c", - "from": "git://github.com/archmoj/ndarray-warp.git#893cf0cf5a4f981f3230d2ed8c73bbe08386d20c", + "version": "git://github.com/archmoj/ndarray-warp.git#ffb7d6c7c5c3fdcd6e41ab97aaa920024fc91fbe", + "from": "git://github.com/archmoj/ndarray-warp.git#ffb7d6c7c5c3fdcd6e41ab97aaa920024fc91fbe", "requires": { - "cwise": "git://github.com/archmoj/cwise.git#64f6ca46d8d30a0b8169b171e911c7a47ade721a", + "cwise": "git://github.com/archmoj/cwise.git#8617812463c629115486f1759e6643d2b150d5e5", "ndarray-linear-interpolate": "^1.0.0" } }, @@ -11783,7 +11753,7 @@ }, "yargs": { "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "requires": { "camelcase": "^1.0.2", diff --git a/package.json b/package.json index c7683be9e45..d33a2b2bf15 100644 --- a/package.json +++ b/package.json @@ -77,8 +77,8 @@ "gl-line3d": "git://github.com/gl-vis/gl-line3d.git#8a4db0b069814621b4613b927031ad0068d0dbc1", "gl-mat4": "^1.2.0", "gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#931cbec5e8ce019c71fa526921b66471343cf8a8", - "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#8fec110a96ba4bde9581abae43dac27dcc8c19b1", - "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#15a740eff949399b5e99d5432769e86c0bc70ece", + "gl-plot2d": "git://github.com/gl-vis/gl-plot2d.git#8ff42bee728be05f301e2898dda62166d7a9e1eb", + "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#2779c9f1c4d16f09d319d993e9c2f082ace05322", "gl-pointcloud2d": "^1.0.1", "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#ca2b4e2789a174eb47b8b67f1351e14ac1c14dfe", "gl-select-box": "^1.0.2", @@ -95,8 +95,8 @@ "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.0.2", "ndarray": "^1.0.18", - "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#1a77374f63df819bef152c86544bb6660faf5120", - "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#8c1278df2605c3efb6998bdf3c185b332d94a83b", + "ndarray-fill": "git://github.com/archmoj/ndarray-fill.git#ce5b8e1267d5e6148e9d09670effbff029489cdb", + "ndarray-homography": "git://github.com/archmoj/ndarray-homography.git#1d48c9085e6578d194fe045552440cf8c42bc9e9", "ndarray-ops": "^1.2.2", "point-cluster": "^3.1.4", "polybooljs": "^1.2.0",