Skip to content

Commit 9636310

Browse files
ibgreenibgreen
authored
chore: Bump to luma.gl@9.1.0-beta, math.gl@4.1.0 (visgl#9161)
1 parent 2a08804 commit 9636310

25 files changed

Lines changed: 15318 additions & 11016 deletions

File tree

‎examples/playground/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@loaders.gl/csv": "^4.2.0",
1515
"@loaders.gl/draco": "^4.2.0",
1616
"@loaders.gl/gltf": "^4.2.0",
17-
"@luma.gl/constants": "^9.1.0-alpha.19",
17+
"@luma.gl/constants": "^9.1.0-beta.9",
1818
"brace": "^0.11.1",
1919
"deck.gl": "^9.0.0",
2020
"maplibre-gl": "^3.0.0",

‎examples/website/mesh/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@loaders.gl/obj": "^4.2.0",
13-
"@math.gl/core": "^4.1.0-alpha.3",
13+
"@math.gl/core": "^4.1.0",
1414
"deck.gl": "^9.0.0",
1515
"react": "^18.0.0",
1616
"react-dom": "^18.0.0"

‎modules/aggregation-layers/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3939
},
4040
"dependencies": {
41-
"@luma.gl/constants": "^9.1.0-alpha.19",
42-
"@luma.gl/shadertools": "^9.1.0-alpha.19",
43-
"@math.gl/core": "^4.1.0-alpha.3",
44-
"@math.gl/web-mercator": "^4.1.0-alpha.3",
41+
"@luma.gl/constants": "^9.1.0-beta.9",
42+
"@luma.gl/shadertools": "^9.1.0-beta.9",
43+
"@math.gl/core": "^4.1.0",
44+
"@math.gl/web-mercator": "^4.1.0",
4545
"d3-hexbin": "^0.2.1"
4646
},
4747
"peerDependencies": {
4848
"@deck.gl/core": "9.0.0-alpha.0",
4949
"@deck.gl/layers": "9.0.0-alpha.0",
50-
"@luma.gl/core": "^9.1.0-alpha.19",
51-
"@luma.gl/engine": "^9.1.0-alpha.19"
50+
"@luma.gl/core": "^9.1.0-beta.9",
51+
"@luma.gl/engine": "^9.1.0-beta.9"
5252
},
5353
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
5454
}

‎modules/arcgis/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3737
},
3838
"dependencies": {
39-
"@luma.gl/constants": "^9.1.0-alpha.19",
39+
"@luma.gl/constants": "^9.1.0-beta.9",
4040
"esri-loader": "^3.7.0"
4141
},
4242
"peerDependencies": {
4343
"@arcgis/core": "^4.0.0",
4444
"@deck.gl/core": "9.0.0-alpha.0",
45-
"@luma.gl/core": "^9.1.0-alpha.19",
46-
"@luma.gl/engine": "^9.1.0-alpha.19"
45+
"@luma.gl/core": "^9.1.0-beta.9",
46+
"@luma.gl/engine": "^9.1.0-beta.9"
4747
},
4848
"devDependencies": {
4949
"@arcgis/core": "^4.21.0"

‎modules/carto/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
"@loaders.gl/mvt": "^4.2.0",
4949
"@loaders.gl/schema": "^4.2.0",
5050
"@loaders.gl/tiles": "^4.2.0",
51-
"@luma.gl/core": "^9.1.0-alpha.19",
52-
"@luma.gl/shadertools": "^9.1.0-alpha.19",
53-
"@math.gl/web-mercator": "^4.1.0-alpha.3",
51+
"@luma.gl/core": "^9.1.0-beta.9",
52+
"@luma.gl/shadertools": "^9.1.0-beta.9",
53+
"@math.gl/web-mercator": "^4.1.0",
5454
"@types/d3-array": "^3.0.2",
5555
"@types/d3-color": "^1.4.2",
5656
"@types/d3-scale": "^3.0.0",
@@ -72,7 +72,7 @@
7272
"@deck.gl/geo-layers": "9.0.0-alpha.0",
7373
"@deck.gl/layers": "9.0.0-alpha.0",
7474
"@loaders.gl/core": "^4.2.0",
75-
"@luma.gl/core": "^9.1.0-alpha.19"
75+
"@luma.gl/core": "^9.1.0-beta.9"
7676
},
7777
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
7878
}

‎modules/core/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
"dependencies": {
4343
"@loaders.gl/core": "^4.2.0",
4444
"@loaders.gl/images": "^4.2.0",
45-
"@luma.gl/constants": "^9.1.0-alpha.19",
46-
"@luma.gl/core": "^9.1.0-alpha.19",
47-
"@luma.gl/engine": "^9.1.0-alpha.19",
48-
"@luma.gl/shadertools": "^9.1.0-alpha.19",
49-
"@luma.gl/webgl": "^9.1.0-alpha.19",
50-
"@math.gl/core": "^4.1.0-alpha.3",
51-
"@math.gl/sun": "^4.1.0-alpha.3",
52-
"@math.gl/types": "^4.1.0-alpha.3",
53-
"@math.gl/web-mercator": "^4.1.0-alpha.3",
45+
"@luma.gl/constants": "^9.1.0-beta.9",
46+
"@luma.gl/core": "^9.1.0-beta.9",
47+
"@luma.gl/engine": "^9.1.0-beta.9",
48+
"@luma.gl/shadertools": "^9.1.0-beta.9",
49+
"@luma.gl/webgl": "^9.1.0-beta.9",
50+
"@math.gl/core": "^4.1.0",
51+
"@math.gl/sun": "^4.1.0",
52+
"@math.gl/types": "^4.1.0",
53+
"@math.gl/web-mercator": "^4.1.0",
5454
"@probe.gl/env": "^4.0.9",
5555
"@probe.gl/log": "^4.0.9",
5656
"@probe.gl/stats": "^4.0.9",

‎modules/core/src/lib/layer.ts‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,14 @@ export type UpdateParameters<LayerT extends Layer> = {
169169
changeFlags: ChangeFlags;
170170
};
171171

172+
type DrawOptions = {
173+
renderPass: RenderPass;
174+
shaderModuleProps: any;
175+
uniforms: any;
176+
parameters: any;
177+
context: LayerContext;
178+
};
179+
172180
type SharedLayerState = {
173181
[key: string]: unknown;
174182
};
@@ -321,15 +329,6 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
321329
return (state && (state.models || (state.model && [state.model]))) || [];
322330
}
323331

324-
// TODO deprecate in favour of setShaderModuleProps
325-
/** Update shader module parameters */
326-
setModuleParameters(moduleParameters: any): void {
327-
for (const model of this.getModels()) {
328-
// HACK as fp64 is not yet ported to UBO
329-
model.uniforms = {ONE: 1};
330-
}
331-
}
332-
333332
/** Update shader input parameters */
334333
setShaderModuleProps(...props: Parameters<Model['shaderInputs']['setProps']>): void {
335334
for (const model of this.getModels()) {
@@ -531,9 +530,9 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
531530
}
532531

533532
// If state has a model, draw it with supplied uniforms
534-
draw(opts) {
533+
draw(opts: DrawOptions) {
535534
for (const model of this.getModels()) {
536-
model.draw(opts);
535+
model.draw(opts.renderPass);
537536
}
538537
}
539538

@@ -1056,7 +1055,6 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
10561055
try {
10571056
// TODO/ib - hack move to luma Model.draw
10581057
if (shaderModuleProps) {
1059-
this.setModuleParameters({});
10601058
this.setShaderModuleProps(shaderModuleProps);
10611059
}
10621060

@@ -1076,7 +1074,7 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
10761074
// Call subclass lifecycle method
10771075
if (context.device instanceof WebGLDevice) {
10781076
context.device.withParametersWebGL(parameters, () => {
1079-
const opts = {renderPass, shaderModuleProps, uniforms, parameters, context};
1077+
const opts: DrawOptions = {renderPass, shaderModuleProps, uniforms, parameters, context};
10801078

10811079
// extensions
10821080
for (const extension of this.props.extensions) {
@@ -1086,7 +1084,7 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
10861084
this.draw(opts);
10871085
});
10881086
} else {
1089-
const opts = {renderPass, shaderModuleProps, uniforms, parameters, context};
1087+
const opts: DrawOptions = {renderPass, shaderModuleProps, uniforms, parameters, context};
10901088

10911089
// extensions
10921090
for (const extension of this.props.extensions) {

‎modules/core/src/shaderlib/project/project.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,5 @@ export default {
4242
commonOrigin: 'vec3<f32>',
4343
pseudoMeters: 'f32'
4444
}
45+
// @ts-ignore TODO v9.1
4546
} as const satisfies ShaderModule<ProjectProps, ProjectUniforms, {}>;

‎modules/core/src/transitions/gpu-interpolation-transition.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ function getTransform(device: Device, attribute: Attribute): BufferTransform {
197197
]
198198
}
199199
],
200+
// @ts-expect-error fp64 module only sets ONE uniform via defaultUniforms
200201
modules: [fp64arithmetic, interpolationUniforms],
201202
defines: {
202203
ATTRIBUTE_TYPE: attributeType,
@@ -205,7 +206,6 @@ function getTransform(device: Device, attribute: Attribute): BufferTransform {
205206
// Default uniforms are not set without this
206207
moduleSettings: {},
207208
varyings: ['vCurrent', 'vCurrent64Low'],
208-
// @ts-expect-error WebGLRenderPipeline only prop TODO - support in RenderPipeline?
209209
bufferMode: GL.INTERLEAVED_ATTRIBS,
210210
disableWarnings: true
211211
});

‎modules/extensions/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3939
},
4040
"dependencies": {
41-
"@luma.gl/constants": "^9.1.0-alpha.19",
42-
"@luma.gl/shadertools": "^9.1.0-alpha.19",
43-
"@math.gl/core": "^4.1.0-alpha.3"
41+
"@luma.gl/constants": "^9.1.0-beta.9",
42+
"@luma.gl/shadertools": "^9.1.0-beta.9",
43+
"@math.gl/core": "^4.1.0"
4444
},
4545
"peerDependencies": {
4646
"@deck.gl/core": "9.0.0-alpha.0",
47-
"@luma.gl/core": "^9.1.0-alpha.19",
48-
"@luma.gl/engine": "^9.1.0-alpha.19"
47+
"@luma.gl/core": "^9.1.0-beta.9",
48+
"@luma.gl/engine": "^9.1.0-beta.9"
4949
},
5050
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
5151
}

0 commit comments

Comments
 (0)