Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump luma 9.0.0 beta.8 #8586

Merged
merged 4 commits into from Mar 7, 2024
Merged

chore: bump luma 9.0.0 beta.8 #8586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c925093
Bump luma
felixpalmer Mar 6, 2024
54d7f3c
Misc fixes
felixpalmer Mar 6, 2024
3779efb
Revert hack in SolidPolygonLayer
Pessimistress Mar 6, 2024
7b4662f
9.0.0-beta.8
Pessimistress Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/layer-browser/package.json
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@loaders.gl/ply": "^4.1.0",
"@loaders.gl/gltf": "^4.1.0",
"@luma.gl/debug": "9.0.0-beta.6",
"@luma.gl/debug": "9.0.0-beta.8",
"colorbrewer": "^1.0.0",
"d3-request": "^1.0.6",
"d3-scale": "^3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/playground/package.json
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
"@loaders.gl/csv": "^4.1.0",
"@loaders.gl/draco": "^4.1.0",
"@loaders.gl/gltf": "^4.1.0",
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"brace": "^0.11.1",
"deck.gl": "^8.8.0",
"maplibre-gl": "^2.4.0",
Expand Down
8 changes: 4 additions & 4 deletions modules/aggregation-layers/package.json
View file
Open in desktop
Expand Up @@ -38,16 +38,16 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/shadertools": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"@luma.gl/shadertools": "9.0.0-beta.8",
"@math.gl/web-mercator": "^4.0.0",
"d3-hexbin": "^0.2.1"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@deck.gl/layers": "^9.0.0-beta",
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/arcgis/package.json
View file
Open in desktop
Expand Up @@ -36,14 +36,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"esri-loader": "^3.3.0"
},
"peerDependencies": {
"@arcgis/core": "^4.0.0",
"@deck.gl/core": "^9.0.0-beta",
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
4 changes: 2 additions & 2 deletions modules/carto/package.json
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
"@loaders.gl/mvt": "^4.1.0",
"@loaders.gl/schema": "^4.1.0",
"@loaders.gl/tiles": "^4.1.0",
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"@math.gl/web-mercator": "^4.0.0",
"@types/d3-array": "^3.0.2",
"@types/d3-color": "^1.4.2",
Expand All @@ -70,7 +70,7 @@
"@deck.gl/geo-layers": "^9.0.0-beta",
"@deck.gl/layers": "^9.0.0-beta",
"@loaders.gl/core": "^4.1.0",
"@luma.gl/core": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
10 changes: 5 additions & 5 deletions modules/core/package.json
View file
Open in desktop
Expand Up @@ -42,11 +42,11 @@
"dependencies": {
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/images": "^4.1.0",
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/core": "9.0.0-beta.6",
"@luma.gl/engine": "9.0.0-beta.6",
"@luma.gl/shadertools": "9.0.0-beta.6",
"@luma.gl/webgl": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8",
"@luma.gl/shadertools": "9.0.0-beta.8",
"@luma.gl/webgl": "9.0.0-beta.8",
"@math.gl/core": "^4.0.0",
"@math.gl/sun": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/lib/deck.ts
View file
Open in desktop
Expand Up @@ -245,7 +245,7 @@ const defaultProps = {
parameters: {},
parent: null,
device: null,
deviceProps: {type: 'webgl' as const},
deviceProps: {type: 'webgl'} as DeviceProps,
gl: null,
glOptions: {},
canvas: null,
Expand Down
4 changes: 1 addition & 3 deletions modules/core/src/passes/shadow-pass.ts
View file
Open in desktop
@@ -1,10 +1,9 @@
import type {Device, Framebuffer, Texture} from '@luma.gl/core';
import {WEBGLRenderbuffer} from '@luma.gl/webgl';
import {default as LayersPass} from './layers-pass';

export default class ShadowPass extends LayersPass {
shadowMap: Texture;
depthBuffer: WEBGLRenderbuffer;
depthBuffer: Texture;
fbo: Framebuffer;

constructor(
Expand Down Expand Up @@ -45,7 +44,6 @@ export default class ShadowPass extends LayersPass {
height: 1,
colorAttachments: [this.shadowMap],
// Depth attachment has to be specified for depth test to work
// @ts-expect-error Renderbuffer typing not solved in luma.gl
depthStencilAttachment: this.depthBuffer
});
}
Expand Down
8 changes: 4 additions & 4 deletions modules/extensions/package.json
View file
Open in desktop
Expand Up @@ -38,14 +38,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/shadertools": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"@luma.gl/shadertools": "9.0.0-beta.8",
"@math.gl/core": "^4.0.0"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
8 changes: 4 additions & 4 deletions modules/geo-layers/package.json
View file
Open in desktop
Expand Up @@ -46,8 +46,8 @@
"@loaders.gl/terrain": "^4.1.0",
"@loaders.gl/tiles": "^4.1.0",
"@loaders.gl/wms": "^4.1.0",
"@luma.gl/gltf": "9.0.0-beta.6",
"@luma.gl/shadertools": "9.0.0-beta.6",
"@luma.gl/gltf": "9.0.0-beta.8",
"@luma.gl/shadertools": "9.0.0-beta.8",
"@math.gl/core": "^4.0.0",
"@math.gl/culling": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
Expand All @@ -61,8 +61,8 @@
"@deck.gl/layers": "^9.0.0-beta",
"@deck.gl/mesh-layers": "^9.0.0-beta",
"@loaders.gl/core": "^4.1.0",
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
4 changes: 2 additions & 2 deletions modules/google-maps/package.json
View file
Open in desktop
Expand Up @@ -38,13 +38,13 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"@math.gl/core": "^4.0.0",
"@types/google.maps": "^3.48.6"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@luma.gl/core": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
2 changes: 1 addition & 1 deletion modules/jupyter-widget/package.json
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
"@loaders.gl/3d-tiles": "^4.1.0",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/csv": "^4.1.0",
"@luma.gl/core": "9.0.0-beta.6",
"@luma.gl/core": "9.0.0-beta.8",
"d3-dsv": "^1.0.8",
"mapbox-gl": "^1.13.2"
},
Expand Down
4 changes: 2 additions & 2 deletions modules/layers/package.json
View file
Open in desktop
Expand Up @@ -48,8 +48,8 @@
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@loaders.gl/core": "^4.1.0",
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
23 changes: 10 additions & 13 deletions modules/layers/src/solid-polygon-layer/solid-polygon-layer.ts
View file
Open in desktop
Expand Up @@ -456,31 +456,28 @@ export default class SolidPolygonLayer<DataT = any, ExtraPropsT extends {} = {}>
}
});

const geometry = new Geometry({
topology: 'line-strip',
attributes: {
// top right - top left - bottom left - bottom right
positions: {
size: 2,
value: new Float32Array([1, 0, 0, 0, 0, 1, 1, 1])
}
}
});
wireframeModel = new Model(this.context.device, {
...this.getShaders('side'),
id: `${id}-wireframe`,
bufferLayout,
topology: 'line-strip',
uniforms: {
isWireframe: true
},
// geometry, // TODO(v9) investigate why `setGeometry()` is needed
geometry: new Geometry({
topology: 'line-strip',
attributes: {
// top right - top left - bottom left - bottom right
positions: {
size: 2,
value: new Float32Array([1, 0, 0, 0, 0, 1, 1, 1])
}
}
}),
isInstanced: 1,
userData: {
excludeAttributes: {indices: true}
}
});
wireframeModel.setGeometry(geometry);
}

return {
Expand Down
4 changes: 2 additions & 2 deletions modules/mapbox/package.json
View file
Open in desktop
Expand Up @@ -38,12 +38,12 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "9.0.0-beta.6",
"@luma.gl/constants": "9.0.0-beta.8",
"@math.gl/web-mercator": "^4.0.0"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@luma.gl/core": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
8 changes: 4 additions & 4 deletions modules/mesh-layers/package.json
View file
Open in desktop
Expand Up @@ -39,13 +39,13 @@
},
"dependencies": {
"@loaders.gl/gltf": "^4.1.0",
"@luma.gl/gltf": "9.0.0-beta.6",
"@luma.gl/shadertools": "9.0.0-beta.6"
"@luma.gl/gltf": "9.0.0-beta.8",
"@luma.gl/shadertools": "9.0.0-beta.8"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta"
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/test-utils/package.json
View file
Open in desktop
Expand Up @@ -33,12 +33,12 @@
"typed"
],
"dependencies": {
"@luma.gl/test-utils": "9.0.0-beta.6"
"@luma.gl/test-utils": "9.0.0-beta.8"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@luma.gl/core": "^9.0.0-beta",
"@luma.gl/engine": "^9.0.0-beta",
"@luma.gl/core": "9.0.0-beta.8",
"@luma.gl/engine": "9.0.0-beta.8",
"@probe.gl/test-utils": "^4.0.0"
},
"scripts": {},
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -61,8 +61,8 @@
"@babel/register": "^7.13.0",
"@loaders.gl/csv": "^4.1.0",
"@loaders.gl/polyfills": "^4.1.0",
"@luma.gl/test-utils": "9.0.0-beta.6",
"@luma.gl/webgpu": "9.0.0-beta.6",
"@luma.gl/test-utils": "9.0.0-beta.8",
"@luma.gl/webgpu": "9.0.0-beta.8",
"@math.gl/proj4": "^4.0.0",
"@probe.gl/bench": "^4.0.6",
"@probe.gl/test-utils": "^4.0.6",
Expand Down