Skip to content

Commit 87883cd

Browse files
authored
chore: Bump to [email protected] (#9241)
1 parent af4738a commit 87883cd

File tree

51 files changed

+229
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+229
-179
lines changed

docs/developer-guide/custom-layers/writing-shaders.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
A shader library facilitates creating shaders that work seamlessly with deck.gl. The `modules` parameter passed to the [Model](https://github.com/visgl/luma.gl/blob/8.0-release/docs/api-reference/engine/model.md) class can dynamically include parts from this library into your own GLSL code:
44

55
```js
6-
import {picking, project32, gouraudLighting} from '@deck.gl/core';
6+
import {picking, project32, gouraudMaterial} from '@deck.gl/core';
77

88
const model = new Model(gl, {
99
vs: '// vertex shader GLSL source'
1010
fs: '// fragment shader GLSL source',
11-
modules: [picking, project32, gouraudLighting] // list of optional module names
11+
modules: [picking, project32, gouraudMaterial] // list of optional module names
1212
});
1313
```
1414

@@ -34,8 +34,8 @@ The `project` module also has two extensions, [project32](../../api-reference/co
3434

3535
A simple lighting package is provided in deck.gl, supporting a single directional light in addition to ambient light. Turning on lighting requires normals to be provided for each vertex. There are two flavors:
3636

37-
- [gouraudLighting] - for lighting calculated in the vertex shader
38-
- [phongLighting] - for lighting calculated in the fragment shader
37+
- [gouraudMaterial] - for lighting calculated in the vertex shader
38+
- [phongMaterial] - for lighting calculated in the fragment shader
3939

4040

4141
#### fp64

docs/upgrade-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,11 +515,11 @@ new Model({
515515
Should now become
516516

517517
```js
518-
import {picking, project32, gouraudLighting} from '@deck.gl/core';
518+
import {picking, project32, gouraudMaterial} from '@deck.gl/core';
519519
/// NEW
520520
new Model({
521521
// ...
522-
modules: [picking, project32, gouraudLighting]
522+
modules: [picking, project32, gouraudMaterial]
523523
});
524524
```
525525

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.9",
17+
"@luma.gl/constants": "^9.2.0-alpha.5",
1818
"deck.gl": "^9.0.0",
1919
"maplibre-gl": "^5.0.0",
2020
"monaco-editor": "^0.39.0",

modules/aggregation-layers/package.json

Lines changed: 4 additions & 4 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.9",
42-
"@luma.gl/shadertools": "^9.1.9",
41+
"@luma.gl/constants": "^9.2.0-alpha.5",
42+
"@luma.gl/shadertools": "^9.2.0-alpha.5",
4343
"@math.gl/core": "^4.1.0",
4444
"@math.gl/web-mercator": "^4.1.0",
4545
"d3-hexbin": "^0.2.1"
4646
},
4747
"peerDependencies": {
4848
"@deck.gl/core": "^9.1.0",
4949
"@deck.gl/layers": "^9.1.0",
50-
"@luma.gl/core": "^9.1.9",
51-
"@luma.gl/engine": "^9.1.9"
50+
"@luma.gl/core": "^9.2.0-alpha.5",
51+
"@luma.gl/engine": "^9.2.0-alpha.5"
5252
},
5353
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
5454
}

modules/aggregation-layers/src/common/aggregator/gpu-aggregator/utils.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export function createRenderTarget(device: Device, width: number, height: number
1616
width,
1717
height,
1818
format: 'rgba32float',
19-
mipmaps: false,
2019
sampler: {
2120
minFilter: 'nearest',
2221
magFilter: 'nearest'

modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-aggregation-transform.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,11 @@ void main() {
237237
blendAlphaOperation: 'max'
238238
},
239239
defines: {
240+
// @ts-expect-error TODO fix luma type
240241
NUM_DIMS: props.dimensions,
242+
// @ts-expect-error TODO fix luma type
241243
NUM_CHANNELS: props.channelCount,
244+
// @ts-expect-error TODO fix luma type
242245
SAMPLER_WIDTH: TEXTURE_WIDTH
243246
},
244247
varyings: ['binIds', 'values'],

modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-bin-sorter.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ void main() {
248248
const model = new Model(device, {
249249
bufferLayout: props.bufferLayout,
250250
modules: [...(props.modules || []), binSorterUniforms],
251+
// @ts-expect-error TODO fix luma type
251252
defines: {...props.defines, NON_INSTANCED_MODEL: 1, NUM_CHANNELS: props.channelCount},
252253
isInstanced: false,
253254
vs,

modules/aggregation-layers/src/common/utils/color-utils.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export function createColorRangeTexture(
7272

7373
return device.createTexture({
7474
format: 'rgba8unorm',
75-
mipmaps: false,
7675
sampler: {
7776
minFilter: COLOR_RANGE_FILTER[type],
7877
magFilter: COLOR_RANGE_FILTER[type],

modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ import {
4545
const RESOLUTION = 2; // (number of common space pixels) / (number texels)
4646
const TEXTURE_PROPS: TextureProps = {
4747
format: 'rgba8unorm',
48-
mipmaps: false,
48+
dimension: '2d',
49+
width: 1,
50+
height: 1,
4951
sampler: {
5052
minFilter: 'linear',
5153
magFilter: 'linear',
@@ -561,7 +563,6 @@ export default class HeatmapLayer<
561563
(colorTexture as any).setTexture2DData({data: colors});
562564
} else {
563565
colorTexture?.destroy();
564-
// @ts-expect-error TODO(ib) - texture API change
565566
colorTexture = this.context.device.createTexture({
566567
...TEXTURE_PROPS,
567568
data: colors,

modules/arcgis/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
3737
},
3838
"dependencies": {
39-
"@luma.gl/constants": "^9.1.9",
39+
"@luma.gl/constants": "^9.2.0-alpha.5",
4040
"esri-loader": "^3.7.0"
4141
},
4242
"peerDependencies": {
4343
"@arcgis/core": "^4.0.0",
4444
"@deck.gl/core": "^9.1.0",
45-
"@luma.gl/core": "^9.1.9",
46-
"@luma.gl/engine": "^9.1.9",
47-
"@luma.gl/webgl": "^9.1.9"
45+
"@luma.gl/core": "^9.2.0-alpha.5",
46+
"@luma.gl/engine": "^9.2.0-alpha.5",
47+
"@luma.gl/webgl": "^9.2.0-alpha.5"
4848
},
4949
"devDependencies": {
5050
"@arcgis/core": "^4.21.0"

0 commit comments

Comments
 (0)