@deck.gl/geo-layers 8.8.0 → 8.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.dev.js +25 -7
- package/dist/es5/mesh-layer/mesh-layer.js +21 -2
- package/dist/es5/mesh-layer/mesh-layer.js.map +1 -1
- package/dist/es5/tile-layer/tile-layer.js.map +1 -1
- package/dist/esm/mesh-layer/mesh-layer.js +20 -2
- package/dist/esm/mesh-layer/mesh-layer.js.map +1 -1
- package/dist/esm/tile-layer/tile-layer.js.map +1 -1
- package/dist.min.js +1 -1
- package/package.json +2 -2
- package/src/mesh-layer/mesh-layer.ts +17 -3
- package/src/tile-layer/tile-layer.ts +1 -1
- package/typed/mesh-layer/mesh-layer.d.ts +2 -1
- package/typed/mesh-layer/mesh-layer.d.ts.map +1 -1
- package/typed/tile-layer/tile-layer.d.ts +1 -1
- package/typed/tile-layer/tile-layer.d.ts.map +1 -1
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@deck.gl/geo-layers",
|
|
3
3
|
"description": "deck.gl layers supporting geospatial use cases and GIS formats",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"version": "8.8.
|
|
5
|
+
"version": "8.8.3",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
8
8
|
},
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"@loaders.gl/core": "^3.0.0",
|
|
55
55
|
"@luma.gl/core": "^8.0.0"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "e31e8c1885597eed40dcc404a5b3d05265995713"
|
|
58
58
|
}
|
|
@@ -3,7 +3,7 @@ import {GLTFMaterialParser} from '@luma.gl/experimental';
|
|
|
3
3
|
import {Model, pbr} from '@luma.gl/core';
|
|
4
4
|
import GL from '@luma.gl/constants';
|
|
5
5
|
import type {MeshAttribute, MeshAttributes} from '@loaders.gl/schema';
|
|
6
|
-
import type {UpdateParameters, DefaultProps} from '@deck.gl/core';
|
|
6
|
+
import type {UpdateParameters, DefaultProps, LayerContext} from '@deck.gl/core';
|
|
7
7
|
import {SimpleMeshLayer, SimpleMeshLayerProps} from '@deck.gl/mesh-layers';
|
|
8
8
|
|
|
9
9
|
import vs from './mesh-layer-vertex.glsl';
|
|
@@ -102,6 +102,8 @@ export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshL
|
|
|
102
102
|
protected getModel(mesh: Mesh): Model {
|
|
103
103
|
const {id, pbrMaterial} = this.props;
|
|
104
104
|
const materialParser = this.parseMaterial(pbrMaterial, mesh);
|
|
105
|
+
// Keep material parser to explicitly remove textures
|
|
106
|
+
this.setState({materialParser});
|
|
105
107
|
const shaders = this.getShaders();
|
|
106
108
|
validateGeometryAttributes(mesh.attributes);
|
|
107
109
|
const model = new Model(this.context.gl, {
|
|
@@ -125,6 +127,8 @@ export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshL
|
|
|
125
127
|
if (model) {
|
|
126
128
|
const {mesh} = this.props;
|
|
127
129
|
const materialParser = this.parseMaterial(pbrMaterial, mesh);
|
|
130
|
+
// Keep material parser to explicitly remove textures
|
|
131
|
+
this.setState({materialParser});
|
|
128
132
|
model.setUniforms(materialParser.uniforms);
|
|
129
133
|
}
|
|
130
134
|
}
|
|
@@ -133,7 +137,11 @@ export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshL
|
|
|
133
137
|
const unlit = Boolean(
|
|
134
138
|
pbrMaterial.pbrMetallicRoughness && pbrMaterial.pbrMetallicRoughness.baseColorTexture
|
|
135
139
|
);
|
|
136
|
-
|
|
140
|
+
|
|
141
|
+
// @ts-expect-error - Need to add delete method to the luma gltf-material-parser.d.ts
|
|
142
|
+
this.state.materialParser?.delete();
|
|
143
|
+
|
|
144
|
+
return new GLTFMaterialParser(this.context.gl, {
|
|
137
145
|
attributes: {NORMAL: mesh.attributes.normals, TEXCOORD_0: mesh.attributes.texCoords},
|
|
138
146
|
material: {unlit, ...pbrMaterial},
|
|
139
147
|
pbrDebug: false,
|
|
@@ -141,7 +149,6 @@ export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshL
|
|
|
141
149
|
lights: true,
|
|
142
150
|
useTangents: false
|
|
143
151
|
});
|
|
144
|
-
return materialParser;
|
|
145
152
|
}
|
|
146
153
|
|
|
147
154
|
calculateFeatureIdsPickingColors(attribute) {
|
|
@@ -160,4 +167,11 @@ export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshL
|
|
|
160
167
|
|
|
161
168
|
attribute.value = value;
|
|
162
169
|
}
|
|
170
|
+
|
|
171
|
+
finalizeState(context: LayerContext) {
|
|
172
|
+
super.finalizeState(context);
|
|
173
|
+
// @ts-expect-error - Need to add delete method to the luma gltf-material-parser.d.ts
|
|
174
|
+
this.state.materialParser?.delete();
|
|
175
|
+
this.setState({materialParser: null});
|
|
176
|
+
}
|
|
163
177
|
}
|
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
_flatten as flatten
|
|
12
12
|
} from '@deck.gl/core';
|
|
13
13
|
import {GeoJsonLayer} from '@deck.gl/layers';
|
|
14
|
-
import {LayersList} from '
|
|
14
|
+
import {LayersList} from '@deck.gl/core';
|
|
15
15
|
import Tile2DHeader from './tile-2d-header';
|
|
16
16
|
|
|
17
17
|
import Tileset2D, {RefinementStrategy, STRATEGY_DEFAULT, Tileset2DProps} from './tileset-2d';
|
|
@@ -2,7 +2,7 @@ import type { NumericArray } from '@math.gl/core';
|
|
|
2
2
|
import { GLTFMaterialParser } from '@luma.gl/experimental';
|
|
3
3
|
import { Model } from '@luma.gl/core';
|
|
4
4
|
import type { MeshAttribute, MeshAttributes } from '@loaders.gl/schema';
|
|
5
|
-
import type { UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
|
|
5
|
+
import type { UpdateParameters, DefaultProps, LayerContext } from '@deck.gl/core/typed';
|
|
6
6
|
import { SimpleMeshLayer, SimpleMeshLayerProps } from '@deck.gl/mesh-layers/typed';
|
|
7
7
|
export declare type Mesh = {
|
|
8
8
|
attributes: MeshAttributes;
|
|
@@ -32,6 +32,7 @@ export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshL
|
|
|
32
32
|
updatePbrMaterialUniforms(pbrMaterial: any): void;
|
|
33
33
|
parseMaterial(pbrMaterial: any, mesh: any): GLTFMaterialParser;
|
|
34
34
|
calculateFeatureIdsPickingColors(attribute: any): void;
|
|
35
|
+
finalizeState(context: LayerContext): void;
|
|
35
36
|
}
|
|
36
37
|
export {};
|
|
37
38
|
//# sourceMappingURL=mesh-layer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,KAAK,EAAM,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,KAAK,EAAM,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAK3E,oBAAY,IAAI,GAAG;IACjB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAcF,6CAA6C;AAC7C,oBAAY,cAAc,CAAC,KAAK,GAAG,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAE/F,qCAAqC;AACrC,aAAK,eAAe,CAAC,KAAK,IAAI;IAC5B;;OAEG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,eAAe,CAClF,KAAK,EACL,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAC9C;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,oCAAgB;IAEnC,UAAU;IAOV,eAAe;IAmBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,IAAI,CAAC,IAAI,KAAA;IAeT,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK;IAuBrC,yBAAyB,CAAC,WAAW,KAAA;IAWrC,aAAa,CAAC,WAAW,KAAA,EAAE,IAAI,KAAA;IAkB/B,gCAAgC,CAAC,SAAS,KAAA;IAiB1C,aAAa,CAAC,OAAO,EAAE,YAAY;CAMpC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CompositeLayer, CompositeLayerProps, Layer, LayerProps, UpdateParameters, PickingInfo, GetPickingInfoParams, FilterContext } from '@deck.gl/core/typed';
|
|
2
|
-
import { LayersList } from '
|
|
2
|
+
import { LayersList } from '@deck.gl/core/typed';
|
|
3
3
|
import Tile2DHeader from './tile-2d-header';
|
|
4
4
|
import Tileset2D, { RefinementStrategy, Tileset2DProps } from './tileset-2d';
|
|
5
5
|
import { TileLoadProps, ZRange } from './types';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile-layer.d.ts","sourceRoot":"","sources":["../../src/tile-layer/tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,WAAW,EACX,oBAAoB,EAEpB,aAAa,EAEd,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,UAAU,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"tile-layer.d.ts","sourceRoot":"","sources":["../../src/tile-layer/tile-layer.ts"],"names":[],"mappings":"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"}
|