diff --git a/examples/playground/package.json b/examples/playground/package.json index 045ee8de054..7175d957a96 100644 --- a/examples/playground/package.json +++ b/examples/playground/package.json @@ -14,7 +14,7 @@ "@loaders.gl/csv": "^4.2.0", "@loaders.gl/draco": "^4.2.0", "@loaders.gl/gltf": "^4.2.0", - "@luma.gl/constants": "^9.1.0-beta.5", + "@luma.gl/constants": "^9.1.0-beta.6", "brace": "^0.11.1", "deck.gl": "^9.0.0", "maplibre-gl": "^3.0.0", diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json index d1ee753f7c5..aa19a4f61e1 100644 --- a/modules/aggregation-layers/package.json +++ b/modules/aggregation-layers/package.json @@ -38,8 +38,8 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "^9.1.0-beta.5", - "@luma.gl/shadertools": "^9.1.0-beta.5", + "@luma.gl/constants": "^9.1.0-beta.6", + "@luma.gl/shadertools": "^9.1.0-beta.6", "@math.gl/core": "^4.1.0", "@math.gl/web-mercator": "^4.1.0", "d3-hexbin": "^0.2.1" @@ -47,8 +47,8 @@ "peerDependencies": { "@deck.gl/core": "9.0.0-alpha.0", "@deck.gl/layers": "9.0.0-alpha.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/arcgis/package.json b/modules/arcgis/package.json index 643dd131d5a..ac75730ca70 100644 --- a/modules/arcgis/package.json +++ b/modules/arcgis/package.json @@ -36,14 +36,14 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "^9.1.0-beta.5", + "@luma.gl/constants": "^9.1.0-beta.6", "esri-loader": "^3.7.0" }, "peerDependencies": { "@arcgis/core": "^4.0.0", "@deck.gl/core": "9.0.0-alpha.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6" }, "devDependencies": { "@arcgis/core": "^4.21.0" diff --git a/modules/carto/package.json b/modules/carto/package.json index adf463c2ef2..44e89e01b90 100644 --- a/modules/carto/package.json +++ b/modules/carto/package.json @@ -47,8 +47,8 @@ "@loaders.gl/mvt": "^4.2.0", "@loaders.gl/schema": "^4.2.0", "@loaders.gl/tiles": "^4.2.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/shadertools": "^9.1.0-beta.5", + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/shadertools": "^9.1.0-beta.6", "@math.gl/web-mercator": "^4.1.0", "@types/d3-array": "^3.0.2", "@types/d3-color": "^1.4.2", @@ -71,7 +71,7 @@ "@deck.gl/geo-layers": "9.0.0-alpha.0", "@deck.gl/layers": "9.0.0-alpha.0", "@loaders.gl/core": "^4.2.0", - "@luma.gl/core": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/core/package.json b/modules/core/package.json index 00ea9da6b7a..d5f079e1f63 100644 --- a/modules/core/package.json +++ b/modules/core/package.json @@ -42,11 +42,11 @@ "dependencies": { "@loaders.gl/core": "^4.2.0", "@loaders.gl/images": "^4.2.0", - "@luma.gl/constants": "^9.1.0-beta.5", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5", - "@luma.gl/shadertools": "^9.1.0-beta.5", - "@luma.gl/webgl": "^9.1.0-beta.5", + "@luma.gl/constants": "^9.1.0-beta.6", + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6", + "@luma.gl/shadertools": "^9.1.0-beta.6", + "@luma.gl/webgl": "^9.1.0-beta.6", "@math.gl/core": "^4.1.0", "@math.gl/sun": "^4.1.0", "@math.gl/types": "^4.1.0", diff --git a/modules/extensions/package.json b/modules/extensions/package.json index db8b7d8876a..5250d7e0de5 100644 --- a/modules/extensions/package.json +++ b/modules/extensions/package.json @@ -38,14 +38,14 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "^9.1.0-beta.5", - "@luma.gl/shadertools": "^9.1.0-beta.5", + "@luma.gl/constants": "^9.1.0-beta.6", + "@luma.gl/shadertools": "^9.1.0-beta.6", "@math.gl/core": "^4.1.0" }, "peerDependencies": { "@deck.gl/core": "9.0.0-alpha.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/geo-layers/package.json b/modules/geo-layers/package.json index c0f06482275..7e12d256456 100644 --- a/modules/geo-layers/package.json +++ b/modules/geo-layers/package.json @@ -46,8 +46,8 @@ "@loaders.gl/terrain": "^4.2.0", "@loaders.gl/tiles": "^4.2.0", "@loaders.gl/wms": "^4.2.0", - "@luma.gl/gltf": "^9.1.0-beta.5", - "@luma.gl/shadertools": "^9.1.0-beta.5", + "@luma.gl/gltf": "^9.1.0-beta.6", + "@luma.gl/shadertools": "^9.1.0-beta.6", "@math.gl/core": "^4.1.0", "@math.gl/culling": "^4.1.0", "@math.gl/web-mercator": "^4.1.0", @@ -61,8 +61,8 @@ "@deck.gl/layers": "9.0.0-alpha.0", "@deck.gl/mesh-layers": "9.0.0-alpha.0", "@loaders.gl/core": "^4.2.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/google-maps/package.json b/modules/google-maps/package.json index dc7de56063b..3651f84c03d 100644 --- a/modules/google-maps/package.json +++ b/modules/google-maps/package.json @@ -38,13 +38,13 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "^9.1.0-beta.5", + "@luma.gl/constants": "^9.1.0-beta.6", "@math.gl/core": "^4.1.0", "@types/google.maps": "^3.48.6" }, "peerDependencies": { "@deck.gl/core": "9.0.0-alpha.0", - "@luma.gl/core": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/jupyter-widget/package.json b/modules/jupyter-widget/package.json index fe39667c948..f87f002c53d 100644 --- a/modules/jupyter-widget/package.json +++ b/modules/jupyter-widget/package.json @@ -39,7 +39,7 @@ "@loaders.gl/3d-tiles": "^4.2.0", "@loaders.gl/core": "^4.2.0", "@loaders.gl/csv": "^4.2.0", - "@luma.gl/core": "^9.1.0-beta.5", + "@luma.gl/core": "^9.1.0-beta.6", "d3-dsv": "^1.0.8", "mapbox-gl": "^1.13.2" }, diff --git a/modules/layers/package.json b/modules/layers/package.json index 68a11152057..75034f2f841 100644 --- a/modules/layers/package.json +++ b/modules/layers/package.json @@ -48,8 +48,8 @@ "peerDependencies": { "@deck.gl/core": "9.0.0-alpha.0", "@loaders.gl/core": "^4.2.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/main/package.json b/modules/main/package.json index 4d28fffa5cf..ce7ed65c45f 100644 --- a/modules/main/package.json +++ b/modules/main/package.json @@ -53,8 +53,8 @@ "@deck.gl/react": "9.1.0-alpha.0", "@deck.gl/widgets": "9.1.0-alpha.0", "@loaders.gl/core": "^4.2.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6" }, "peerDependencies": { "@arcgis/core": "^4.0.0", diff --git a/modules/mapbox/package.json b/modules/mapbox/package.json index 179c542baed..67924de4388 100644 --- a/modules/mapbox/package.json +++ b/modules/mapbox/package.json @@ -38,12 +38,12 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev" }, "dependencies": { - "@luma.gl/constants": "^9.1.0-beta.5", + "@luma.gl/constants": "^9.1.0-beta.6", "@math.gl/web-mercator": "^4.1.0" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-alpha", - "@luma.gl/core": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/mesh-layers/package.json b/modules/mesh-layers/package.json index 472da715ee7..8e26c3c086f 100644 --- a/modules/mesh-layers/package.json +++ b/modules/mesh-layers/package.json @@ -39,13 +39,13 @@ }, "dependencies": { "@loaders.gl/gltf": "^4.2.0", - "@luma.gl/gltf": "^9.1.0-beta.5", - "@luma.gl/shadertools": "^9.1.0-beta.5" + "@luma.gl/gltf": "^9.1.0-beta.6", + "@luma.gl/shadertools": "^9.1.0-beta.6" }, "peerDependencies": { "@deck.gl/core": "^9.0.0-alpha", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5" + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json index 0007d8e042b..dea3fbd848d 100644 --- a/modules/test-utils/package.json +++ b/modules/test-utils/package.json @@ -32,12 +32,12 @@ "src" ], "dependencies": { - "@luma.gl/test-utils": "^9.1.0-beta.5" + "@luma.gl/test-utils": "^9.1.0-beta.6" }, "peerDependencies": { "@deck.gl/core": "^9.1.0-alpha.0", - "@luma.gl/core": "^9.1.0-beta.5", - "@luma.gl/engine": "^9.1.0-beta.5", + "@luma.gl/core": "^9.1.0-beta.6", + "@luma.gl/engine": "^9.1.0-beta.6", "@probe.gl/test-utils": "^4.0.0" }, "scripts": {}, diff --git a/package.json b/package.json index 298e7504a55..42ba801030d 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,8 @@ "devDependencies": { "@loaders.gl/csv": "^4.2.0", "@loaders.gl/polyfills": "^4.2.0", - "@luma.gl/webgpu": "^9.1.0-beta.5", + "@luma.gl/webgpu": "^9.1.0-beta.6", + "@luma.gl/effects": "^9.1.0-beta.6", "@math.gl/proj4": "^4.1.0", "@probe.gl/bench": "^4.0.9", "jsdom": "^20.0.0", diff --git a/test/apps/glsl-debugger/package.json b/test/apps/glsl-debugger/package.json index e04e5aafb9b..0b2aa893033 100644 --- a/test/apps/glsl-debugger/package.json +++ b/test/apps/glsl-debugger/package.json @@ -4,7 +4,7 @@ "start-local": "vite --config ../vite.config.local.mjs" }, "dependencies": { - "@luma.gl/debug": "^9.1.0-beta.5", + "@luma.gl/debug": "^9.1.0-beta.6", "deck.gl": "^8.4.0", "glsl-transpiler": "^1.8.5" }, diff --git a/test/render/test-cases/effects.js b/test/render/test-cases/effects.js index 81c9d934a0e..642c2c9ce65 100644 --- a/test/render/test-cases/effects.js +++ b/test/render/test-cases/effects.js @@ -1,5 +1,5 @@ import {PostProcessEffect, LightingEffect, AmbientLight, DirectionalLight} from '@deck.gl/core'; -import {zoomBlur, vignette} from '@luma.gl/shadertools'; +import {zoomBlur, vignette} from '@luma.gl/effects'; import {hexagons, points} from 'deck.gl-test/data'; import {ScatterplotLayer, SolidPolygonLayer, ColumnLayer} from '@deck.gl/layers'; diff --git a/yarn.lock b/yarn.lock index 9ab1c0d3857..c7bdb8c3e1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1948,15 +1948,15 @@ jszip "^3.1.5" md5 "^2.3.0" -"@luma.gl/constants@9.1.0-beta.5", "@luma.gl/constants@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-9.1.0-beta.5.tgz#c30122736c3057cf7442ac70122fd63588f2e716" - integrity sha512-EUMNJyOiiIgU27ZLAnviFI8RfBIVMGBTxx/VxU7gU+1H7xqoPlCv/OdrefxDyi9QCxUJRUqeJQA+WcXBPyU1pQ== +"@luma.gl/constants@9.1.0-beta.6", "@luma.gl/constants@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-9.1.0-beta.6.tgz#d9d816b30120bee5538716dc0c92b8280cc854b7" + integrity sha512-kW3tuwUDtHbtfSsk7+vv4Z2fLSdE3vq1fMtT2FUUkeVj6i5Z08l4ElfJn7W8J43ay+A6976xxBOX0B/ep9pgeQ== -"@luma.gl/core@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-9.1.0-beta.5.tgz#8a10e2e855a744e42fbb7014f2bc31b6b7fda39a" - integrity sha512-Xi/ERcNtpTo/CzOn0JeyFNUZLbsQCUO49lvHhrNz/6UTpq5P35ppb6kBAbT2jzUKtrmkd0E3MmdW+b/0xjxbcw== +"@luma.gl/core@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-9.1.0-beta.6.tgz#ed6cd6f6d50399d624d26434a78179854bc2c307" + integrity sha512-ssuYgtD7LBxlh1sRIaytoL+UhPOJqVwL+z5rjMAYvIXssgZD2EWDQYlmtdKeDfucJ6mEljc3pCk9Zbv2132Xtw== dependencies: "@math.gl/types" "^4.1.0" "@probe.gl/env" "^4.0.8" @@ -1964,55 +1964,64 @@ "@probe.gl/stats" "^4.0.8" "@types/offscreencanvas" "^2019.6.4" -"@luma.gl/engine@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-9.1.0-beta.5.tgz#7fae0db4fbe6150872b9587b6aec25cb56aebd7e" - integrity sha512-15+F3vtOQLDSEkzDD7lzdJ0aaKhCW3vkJd4gdFUXj3DCyj8W2d9rVCsfXFROQMZY/u9WS/S6jKWe0j+xiNIloQ== +"@luma.gl/effects@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/effects/-/effects-9.1.0-beta.6.tgz#d332071c3f9e7c9374fbd5b9931cd1e76f04cf2f" + integrity sha512-a4aIuvQHwgINxGHklI/dH6i8aXyv6fqgHRh0uUi1kdT9MIJ9EnDs+uonExhgC22Tbl6nGB4lF/IPh4Kdt4O17g== + dependencies: + "@math.gl/core" "^4.1.0" + "@math.gl/types" "^4.1.0" + wgsl_reflect "^1.0.1" + +"@luma.gl/engine@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-9.1.0-beta.6.tgz#e2d21e7f5c1eb6f586f73289a31a05513f9e1eb4" + integrity sha512-Iaj1dnnyYQNrcy5LeaSa11Q6Dhk9wkUPnrpDRIKuLgNo2cEyPLWvoD3nnKOLBN53Xkq+4geoKFBS235DqrTOqA== dependencies: "@math.gl/core" "^4.1.0" "@math.gl/types" "^4.1.0" "@probe.gl/log" "^4.0.8" "@probe.gl/stats" "^4.0.8" -"@luma.gl/gltf@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/gltf/-/gltf-9.1.0-beta.5.tgz#a79f0c457e3d6a7ec0bb8ce646f5af868ff2ed68" - integrity sha512-afyDGW7z9krcloYlHnUA0v1nQk5PwNbzmAIVZmVK4MSO1aRvVPoXPVF3h2P6QlDzD16xGk8c6xUcbNjnMKpYEA== +"@luma.gl/gltf@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/gltf/-/gltf-9.1.0-beta.6.tgz#81b92273d90f7f83b270a7472cb1b54a494bb475" + integrity sha512-SDJnQVD82l+P/60mTcTE24i7RVkCzHOPKIPy6D/U2TIvWX36eVvfJut29Dx/zISRvoevLN5+GLnNbyqrpfd1Mw== dependencies: "@loaders.gl/core" "^4.2.0" "@loaders.gl/textures" "^4.2.0" "@math.gl/core" "^4.1.0" -"@luma.gl/shadertools@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-9.1.0-beta.5.tgz#a7deda335f261082bfc6aa4517624e08f318fe4b" - integrity sha512-NjTEUfcG0dZOyLxVun4mehzkQyFdKvc7jTKp+8kRSEcmGlTJaneMRWGlTydIFLXSnhj4XN460lYPuMAQ6RpUNA== +"@luma.gl/shadertools@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-9.1.0-beta.6.tgz#fd0a09fcfed34901b3a8fa3e56418a800c9a9803" + integrity sha512-iqfCMqGOYI1ouf6GF4B9ugKavZn8ADhC+INQ1nStXc7QjoZJ1DG7p3PoTHQr8DOAROBKWhGywNyXLlFBZ9ANXA== dependencies: "@math.gl/core" "^4.1.0" "@math.gl/types" "^4.1.0" wgsl_reflect "^1.0.1" -"@luma.gl/test-utils@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-9.1.0-beta.5.tgz#22d27a3ac426b3ed6b790b6c566462c7d066ff2f" - integrity sha512-2Z1AYVt24vTigZ/kIwpkWzVDX7sMPPLp0fW/cxZwi0Vli6T5sI+wSc5vhJmz9dxUJ1O3nqwtd2azXOyQx4VNSw== +"@luma.gl/test-utils@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-9.1.0-beta.6.tgz#2926407794cccbefff4c61990b6b2d61b31d490f" + integrity sha512-Wk0M3DU4pxIkeH7pq0Hj4ph2oW3jUx4al0cQBxZMUAzdWro76SLhR4Sww4LxWWBl+OYSqthcASbnhYum4a7org== dependencies: "@probe.gl/env" "^4.0.8" "@probe.gl/stats" "^4.0.8" -"@luma.gl/webgl@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-9.1.0-beta.5.tgz#61f4f7494da012ba42eeb703b4538dd78021450e" - integrity sha512-snvSO3zWaWsAXC+FMyQwuvf6hDKa9brTu2g6ZZp6M7L8VSAPGb4LWPZVB3Z0QMe8IXNBXzUuBCD/N3BbR5Ai3g== +"@luma.gl/webgl@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-9.1.0-beta.6.tgz#c219446d08657c43610b4d41f41abd31505ae552" + integrity sha512-hBYz3i/Ndzh+l645067ydhBy5AuFg79HVtcOLThvQyTu2Ug/o6upeL5watbRfSPTNOQHfZvkM+LC2zAju9SSMQ== dependencies: - "@luma.gl/constants" "9.1.0-beta.5" + "@luma.gl/constants" "9.1.0-beta.6" "@math.gl/types" "^4.1.0" "@probe.gl/env" "^4.0.8" -"@luma.gl/webgpu@^9.1.0-beta.5": - version "9.1.0-beta.5" - resolved "https://registry.yarnpkg.com/@luma.gl/webgpu/-/webgpu-9.1.0-beta.5.tgz#47e801e91e46cf171239061eee53fb6a23ff6905" - integrity sha512-w7NCv5hBG+SZxVZsHPyYih+yM1RK2H1N7p9TgFLzdrS5mTqn6o/NAgCut6knPQOCWYLpFG9KLMiaTFIEjVPTrw== +"@luma.gl/webgpu@^9.1.0-beta.6": + version "9.1.0-beta.6" + resolved "https://registry.yarnpkg.com/@luma.gl/webgpu/-/webgpu-9.1.0-beta.6.tgz#bde771aae401538d9ea10248a36827db2eb46c48" + integrity sha512-F0a3Cyvg7HnLNudbi3bNvV0Yv/osyNqBhBTfsasYp69XsS9QuIMuawOfSCzcIbOdYk3tePdsHx6GWaIOXtwfgw== dependencies: "@probe.gl/env" "^4.0.8" "@webgpu/types" "^0.1.34"