@deck.gl/geo-layers 9.0.35 → 9.1.0-beta.1

package/package.json

@@ -3,7 +3,7 @@
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.35",
+  "version": "9.1.0-beta.1",
   "publishConfig": {
     "access": "public"
   },
@@ -46,23 +46,23 @@
     "@loaders.gl/terrain": "^4.2.0",
     "@loaders.gl/tiles": "^4.2.0",
     "@loaders.gl/wms": "^4.2.0",
-    "@luma.gl/gltf": "~9.0.27",
-    "@luma.gl/shadertools": "~9.0.27",
-    "@math.gl/core": "^4.0.0",
-    "@math.gl/culling": "^4.0.0",
-    "@math.gl/web-mercator": "^4.0.0",
+    "@luma.gl/gltf": "^9.1.0-beta.11",
+    "@luma.gl/shadertools": "^9.1.0-beta.11",
+    "@math.gl/core": "^4.1.0",
+    "@math.gl/culling": "^4.1.0",
+    "@math.gl/web-mercator": "^4.1.0",
     "@types/geojson": "^7946.0.8",
     "h3-js": "^4.1.0",
     "long": "^3.2.0"
   },
   "peerDependencies": {
-    "@deck.gl/core": "^9.0.0",
-    "@deck.gl/extensions": "^9.0.0",
-    "@deck.gl/layers": "^9.0.0",
-    "@deck.gl/mesh-layers": "^9.0.0",
+    "@deck.gl/core": "9.0.0-alpha.0",
+    "@deck.gl/extensions": "9.0.0-alpha.0",
+    "@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.0.0",
-    "@luma.gl/engine": "~9.0.0"
+    "@luma.gl/core": "^9.1.0-beta.11",
+    "@luma.gl/engine": "^9.1.0-beta.11"
   },
-  "gitHead": "8e8fc65d8fa9b9bf7e6d82a7e89d37c6d0126aae"
+  "gitHead": "a86fb154cf323eacc3f56ef087f636fb9f6c30b6"
 }

package/src/geo-cell-layer/GeoCellLayer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {CompositeLayer, Layer, LayersList, DefaultProps} from '@deck.gl/core';
 import {PolygonLayer, PolygonLayerProps} from '@deck.gl/layers';
 

package/src/geohash-layer/geohash-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {AccessorFunction, DefaultProps} from '@deck.gl/core';
 import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
 import {getGeohashPolygon} from './geohash-utils';

package/src/geohash-layer/geohash-utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 const BASE32_CODES = '0123456789bcdefghjkmnpqrstuvwxyz';
 const BASE32_CODES_DICT = {};
 for (let i = 0; i < BASE32_CODES.length; i++) {

package/src/great-circle-layer/great-circle-layer.ts

@@ -1,22 +1,7 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {DefaultProps} from '@deck.gl/core';
 import {ArcLayer, ArcLayerProps} from '@deck.gl/layers';
 

package/src/h3-layers/h3-cluster-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {cellsToMultiPolygon, H3IndexInput} from 'h3-js';
 
 import {AccessorFunction, createIterable, UpdateParameters, DefaultProps} from '@deck.gl/core';

package/src/h3-layers/h3-hexagon-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {
   getResolution,
   cellToLatLng,

package/src/h3-layers/h3-utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {CoordPair, H3IndexInput, cellToBoundary, cellToLatLng} from 'h3-js';
 import {lerp} from '@math.gl/core';
 

package/src/index.ts

@@ -1,22 +1,7 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 /* eslint-disable max-len */
 
 export {WMSLayer as _WMSLayer} from './wms-layer/wms-layer';

package/src/mesh-layer/mesh-layer-fragment.glsl.ts

@@ -1,12 +1,13 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 export default `#version 300 es
 #define SHADER_NAME simple-mesh-layer-fs
 
 precision highp float;
 
-uniform bool hasTexture;
 uniform sampler2D sampler;
-uniform bool flatShading;
-uniform float opacity;
 
 in vec2 vTexCoord;
 in vec3 cameraPosition;
@@ -18,27 +19,27 @@ out vec4 fragColor;
 
 void main(void) {
   
-#ifdef MODULE_PBR
+#ifdef MODULE_PBRMATERIAL
 
   fragColor = vColor * pbr_filterColor(vec4(0));
   geometry.uv = pbr_vUV;
-  fragColor.a *= opacity;
+  fragColor.a *= layer.opacity;
 
 #else
 
   geometry.uv = vTexCoord;
 
   vec3 normal;
-  if (flatShading) {
+  if (simpleMesh.flatShading) {
 
   normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
   } else {
     normal = normals_commonspace;
   }
 
-  vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;
+  vec4 color = simpleMesh.hasTexture ? texture(sampler, vTexCoord) : vColor;
   vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
-  fragColor = vec4(lightColor, color.a * opacity);
+  fragColor = vec4(lightColor, color.a * layer.opacity);
 
 #endif
 

package/src/mesh-layer/mesh-layer-uniforms.ts

@@ -0,0 +1,24 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {ShaderModule} from '@luma.gl/shadertools';
+
+const uniformBlock = `\
+uniform meshUniforms {
+  bool pickFeatureIds;
+} mesh;
+`;
+
+export type MeshProps = {
+  pickFeatureIds: boolean;
+};
+
+export const meshUniforms = {
+  name: 'mesh',
+  vs: uniformBlock,
+  fs: uniformBlock,
+  uniformTypes: {
+    pickFeatureIds: 'f32'
+  }
+} as const satisfies ShaderModule<MeshProps>;

package/src/mesh-layer/mesh-layer-vertex.glsl.ts

@@ -1,11 +1,10 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 export default `#version 300 es
 #define SHADER_NAME simple-mesh-layer-vs
 
-// Scale the model
-uniform float sizeScale;
-uniform bool composeModelMatrix;
-uniform bool pickFeatureIds;
-
 // Primitive attributes
 in vec3 positions;
 in vec3 normals;
@@ -41,7 +40,7 @@ void main(void) {
   vec2 uv = applyUVRegion(texCoords);
   geometry.uv = uv;
 
-  if (pickFeatureIds) {
+  if (mesh.pickFeatureIds) {
     geometry.pickingColor = featureIdsPickingColors;
   } else {
     geometry.pickingColor = instancePickingColors;
@@ -50,10 +49,10 @@ void main(void) {
   mat3 instanceModelMatrix = mat3(instanceModelMatrixCol0, instanceModelMatrixCol1, instanceModelMatrixCol2);
 
   vTexCoord = uv;
-  cameraPosition = project_uCameraPosition;
+  cameraPosition = project.cameraPosition;
   vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
 
-  vec3 pos = (instanceModelMatrix * positions) * sizeScale;
+  vec3 pos = (instanceModelMatrix * positions) * simpleMesh.sizeScale;
   vec3 projectedPosition = project_position(positions);
   position_commonspace = vec4(projectedPosition, 1.0);
   gl_Position = project_common_position_to_clipspace(position_commonspace);
@@ -64,7 +63,7 @@ void main(void) {
 
   DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
 
-  #ifdef MODULE_PBR
+  #ifdef MODULE_PBRMATERIAL
     // set PBR data
     pbr_vPosition = geometry.position.xyz;
     #ifdef HAS_NORMALS

package/src/mesh-layer/mesh-layer.ts

@@ -1,11 +1,16 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {NumericArray} from '@math.gl/core';
 import {parsePBRMaterial, ParsedPBRMaterial} from '@luma.gl/gltf';
-import {pbr} from '@luma.gl/shadertools';
+import {pbrMaterial} from '@luma.gl/shadertools';
 import {Model} from '@luma.gl/engine';
 import type {MeshAttribute, MeshAttributes} from '@loaders.gl/schema';
 import type {UpdateParameters, DefaultProps, LayerContext} from '@deck.gl/core';
 import {SimpleMeshLayer, SimpleMeshLayerProps} from '@deck.gl/mesh-layers';
 
+import {MeshProps, meshUniforms} from './mesh-layer-uniforms';
 import vs from './mesh-layer-vertex.glsl';
 import fs from './mesh-layer-fragment.glsl';
 
@@ -58,7 +63,7 @@ export default class MeshLayer<DataT = any, ExtraProps extends {} = {}> extends
   getShaders() {
     const shaders = super.getShaders();
     const modules = shaders.modules;
-    modules.push(pbr);
+    modules.push(pbrMaterial, meshUniforms);
     return {...shaders, vs, fs};
   }
 
@@ -92,22 +97,28 @@ export default class MeshLayer<DataT = any, ExtraProps extends {} = {}> extends
 
   draw(opts) {
     const {featureIds} = this.props;
-    if (!this.state.model) {
+    const {model} = this.state;
+    if (!model) {
       return;
     }
-    this.state.model.setUniforms({
-      // Needed for PBR (TODO: find better way to get it)
-      // eslint-disable-next-line camelcase
-      u_Camera: this.state.model.uniforms.project_uCameraPosition,
+    const meshProps: MeshProps = {
       pickFeatureIds: Boolean(featureIds)
+    };
+    const pbrProjectionProps = {
+      // Needed for PBR (TODO: find better way to get it)
+      camera: model.uniforms.cameraPosition as [number, number, number]
+    };
+    model.shaderInputs.setProps({
+      pbrProjection: pbrProjectionProps,
+      mesh: meshProps
     });
 
     super.draw(opts);
   }
 
   protected getModel(mesh: Mesh): Model {
-    const {id, pbrMaterial} = this.props;
-    const parsedPBRMaterial = this.parseMaterial(pbrMaterial, mesh);
+    const {id} = this.props;
+    const parsedPBRMaterial = this.parseMaterial(this.props.pbrMaterial, mesh);
     // Keep material to explicitly remove textures
     this.setState({parsedPBRMaterial});
     const shaders = this.getShaders();
@@ -129,26 +140,36 @@ export default class MeshLayer<DataT = any, ExtraProps extends {} = {}> extends
     return model;
   }
 
-  updatePbrMaterialUniforms(pbrMaterial) {
+  updatePbrMaterialUniforms(material) {
     const {model} = this.state;
     if (model) {
       const {mesh} = this.props;
-      const parsedPBRMaterial = this.parseMaterial(pbrMaterial, mesh as Mesh);
+      const parsedPBRMaterial = this.parseMaterial(material, mesh as Mesh);
       // Keep material to explicitly remove textures
       this.setState({parsedPBRMaterial});
-      model.setBindings(parsedPBRMaterial.bindings);
-      model.setUniforms(parsedPBRMaterial.uniforms);
+
+      const {pbr_baseColorSampler} = parsedPBRMaterial.bindings;
+      const {emptyTexture} = this.state;
+      const simpleMeshProps = {
+        sampler: pbr_baseColorSampler || emptyTexture,
+        hasTexture: Boolean(pbr_baseColorSampler)
+      };
+      const {camera, ...pbrMaterialProps} = {
+        ...parsedPBRMaterial.bindings,
+        ...parsedPBRMaterial.uniforms
+      };
+      model.shaderInputs.setProps({simpleMesh: simpleMeshProps, pbrMaterial: pbrMaterialProps});
     }
   }
 
-  parseMaterial(pbrMaterial, mesh: Mesh): ParsedPBRMaterial {
+  parseMaterial(material, mesh: Mesh): ParsedPBRMaterial {
     const unlit = Boolean(
-      pbrMaterial.pbrMetallicRoughness && pbrMaterial.pbrMetallicRoughness.baseColorTexture
+      material.pbrMetallicRoughness && material.pbrMetallicRoughness.baseColorTexture
     );
 
     return parsePBRMaterial(
       this.context.device,
-      {unlit, ...pbrMaterial},
+      {unlit, ...material},
       {NORMAL: mesh.attributes.normals, TEXCOORD_0: mesh.attributes.texCoords},
       {
         pbrDebug: false,

package/src/mvt-layer/coordinate-transform.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Viewport} from '@deck.gl/core';
 import {lerp} from '@math.gl/core';
 import {GeoBoundingBox} from '../tileset-2d/index';

package/src/mvt-layer/find-index-binary.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {
   BinaryFeatureCollection,
   BinaryLineFeature,

package/src/mvt-layer/mvt-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {
   Layer,
   LayersList,

package/src/quadkey-layer/quadkey-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {AccessorFunction, DefaultProps} from '@deck.gl/core';
 import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';
 import {getQuadkeyPolygon} from './quadkey-utils';

package/src/quadkey-layer/quadkey-utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {worldToLngLat} from '@math.gl/web-mercator';
 
 const TILE_SIZE = 512;

package/src/s2-layer/s2-geometry.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 /*
 Adapted from s2-geometry
 

package/src/s2-layer/s2-layer.ts

@@ -1,22 +1,6 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 
 import {AccessorFunction, DefaultProps} from '@deck.gl/core';
 import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';

package/src/s2-layer/s2-utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // s2-geometry is a pure JavaScript port of Google/Niantic's S2 Geometry library
 // which is perfect since it works in the browser.
 import {

package/src/terrain-layer/terrain-layer.ts

@@ -1,22 +1,6 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 
 import {
   Color,

package/src/tile-3d-layer/tile-3d-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Geometry} from '@luma.gl/engine';
 
 import {

package/src/tile-layer/tile-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {
   CompositeLayer,
   CompositeLayerProps,

package/src/tileset-2d/index.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // deck.gl, MIT license
 
 export type {

package/src/tileset-2d/memoize.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // deck.gl, MIT license
 // @note - this is a duplicate of the deck.gl core export (because Tileset2D should be deck.gl independent)
 

package/src/tileset-2d/tile-2d-header.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 /* eslint-env browser */
 import {RequestScheduler} from '@loaders.gl/loader-utils';
 import {TileBoundingBox, TileIndex, TileLoadProps} from './types';

package/src/tileset-2d/tile-2d-traversal.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Viewport, WebMercatorViewport, _GlobeViewport} from '@deck.gl/core';
 
 import {

package/src/tileset-2d/tileset-2d.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Viewport} from '@deck.gl/core';
 
 import {RequestScheduler} from '@loaders.gl/loader-utils';

package/src/tileset-2d/types.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 export type ZRange = [minZ: number, maxZ: number];
 
 export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];

package/src/tileset-2d/utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Viewport} from '@deck.gl/core';
 import {Matrix4} from '@math.gl/core';
 import {getOSMTileIndices} from './tile-2d-traversal';

package/src/trips-layer/trips-layer-uniforms.ts

@@ -0,0 +1,30 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {ShaderModule} from '@luma.gl/shadertools';
+
+const uniformBlock = `\
+uniform tripsUniforms {
+  bool fadeTrail;
+  float trailLength;
+  float currentTime;
+} trips;
+`;
+
+export type TripsProps = {
+  fadeTrail: boolean;
+  trailLength: number;
+  currentTime: number;
+};
+
+export const tripsUniforms = {
+  name: 'trips',
+  vs: uniformBlock,
+  fs: uniformBlock,
+  uniformTypes: {
+    fadeTrail: 'f32',
+    trailLength: 'f32',
+    currentTime: 'f32'
+  }
+} as const satisfies ShaderModule<TripsProps>;