@deck.gl/extensions 9.0.35 → 9.1.0-beta.1

package/dist/fill-style/fill-style-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fill-style-extension.d.ts","sourceRoot":"","sources":["../../src/fill-style/fill-style-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAI7C,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAkBvB,MAAM,MAAM,uBAAuB,CAAC,KAAK,GAAG,GAAG,IAAI;IACjD;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IAC1C,wFAAwF;IACxF,kBAAkB,CAAC,EACf,MAAM,GACN,MAAM,CACJ,MAAM,EACN;QACE,gDAAgD;QAChD,CAAC,EAAE,MAAM,CAAC;QACV,+CAA+C;QAC/C,CAAC,EAAE,MAAM,CAAC;QACV,2BAA2B;QAC3B,KAAK,EAAE,MAAM,CAAC;QACd,4BAA4B;QAC5B,MAAM,EAAE,MAAM,CAAC;KAChB,CACF,CAAC;IACN;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD;;OAEG;IACH,mBAAmB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,gHAAgH;AAChH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc,CAAC,yBAAyB,CAAC;IACvF,MAAM,CAAC,YAAY,6CAAgB;IACnC,MAAM,CAAC,aAAa,SAAwB;gBAEhC,EAAC,OAAe,EAAC,GAAE,OAAO,CAAC,yBAAyB,CAAM;IAItE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,GAAG,OAAO;IAIzD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAUtE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAqC5F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACpC,EAAC,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,EACnE,SAAS,EAAE,IAAI;IAWjB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;IAWvE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC;IAKlD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM;CAKnE"}
+{"version":3,"file":"fill-style-extension.d.ts","sourceRoot":"","sources":["../../src/fill-style/fill-style-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAI7C,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAkBvB,MAAM,MAAM,uBAAuB,CAAC,KAAK,GAAG,GAAG,IAAI;IACjD;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IAC1C,wFAAwF;IACxF,kBAAkB,CAAC,EACf,MAAM,GACN,MAAM,CACJ,MAAM,EACN;QACE,gDAAgD;QAChD,CAAC,EAAE,MAAM,CAAC;QACV,+CAA+C;QAC/C,CAAC,EAAE,MAAM,CAAC;QACV,2BAA2B;QAC3B,KAAK,EAAE,MAAM,CAAC;QACd,4BAA4B;QAC5B,MAAM,EAAE,MAAM,CAAC;KAChB,CACF,CAAC;IACN;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD;;OAEG;IACH,mBAAmB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,gHAAgH;AAChH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc,CAAC,yBAAyB,CAAC;IACvF,MAAM,CAAC,YAAY,6CAAgB;IACnC,MAAM,CAAC,aAAa,SAAwB;gBAEhC,EAAC,OAAe,EAAC,GAAE,OAAO,CAAC,yBAAyB,CAAM;IAItE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,GAAG,OAAO;IAIzD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAUtE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAqC5F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACpC,EAAC,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,EACnE,SAAS,EAAE,IAAI;IAWjB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;IAevE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC;IAKlD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM;CAKnE"}

package/dist/fill-style/fill-style-extension.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { LayerExtension } from '@deck.gl/core';
 import { patternShaders } from "./shader-module.js";
 const defaultProps = {
@@ -76,10 +79,14 @@ class FillStyleExtension extends LayerExtension {
         if (!extension.isEnabled(this)) {
             return;
         }
-        const { fillPatternAtlas } = this.props;
-        this.setModuleParameters({
-            fillPatternTexture: fillPatternAtlas || this.state.emptyTexture
-        });
+        const { fillPatternAtlas, fillPatternEnabled, fillPatternMask } = this.props;
+        const fillProps = {
+            project: params.shaderModuleProps.project,
+            fillPatternEnabled,
+            fillPatternMask,
+            fillPatternTexture: (fillPatternAtlas || this.state.emptyTexture)
+        };
+        this.setShaderModuleProps({ fill: fillProps });
     }
     finalizeState() {
         const emptyTexture = this.state.emptyTexture;

package/dist/fill-style/shader-module.d.ts

@@ -1,13 +1,71 @@
-import type { ShaderModule } from '@luma.gl/shadertools';
-import type { Viewport } from '@deck.gl/core';
+import type { ProjectProps } from '@deck.gl/core';
 import type { Texture } from '@luma.gl/core';
-type FillStyleModuleSettings = {
-    viewport: Viewport;
+export type FillStyleModuleProps = {
+    project: ProjectProps;
     fillPatternEnabled?: boolean;
     fillPatternMask?: boolean;
-} | {
     fillPatternTexture: Texture;
 };
-export declare const patternShaders: ShaderModule<FillStyleModuleSettings>;
+type FillStyleModuleUniforms = {
+    patternTextureSize?: [number, number];
+    patternEnabled?: boolean;
+    patternMask?: boolean;
+    uvCoordinateOrigin?: [number, number];
+    uvCoordinateOrigin64Low?: [number, number];
+};
+type FillStyleModuleBindings = {
+    fill_patternTexture?: Texture;
+};
+declare function getPatternUniforms(opts?: FillStyleModuleProps | {}): FillStyleModuleBindings & FillStyleModuleUniforms;
+export declare const patternShaders: {
+    readonly name: "fill";
+    readonly vs: "\nuniform fillUniforms {\n  vec2 patternTextureSize;\n  bool patternEnabled;\n  bool patternMask;\n  vec2 uvCoordinateOrigin;\n  vec2 uvCoordinateOrigin64Low;\n} fill;\n\n\nin vec4 fillPatternFrames;\nin float fillPatternScales;\nin vec2 fillPatternOffsets;\n\nout vec2 fill_uv;\nout vec4 fill_patternBounds;\nout vec4 fill_patternPlacement;\n\n";
+    readonly fs: "\nuniform fillUniforms {\n  vec2 patternTextureSize;\n  bool patternEnabled;\n  bool patternMask;\n  vec2 uvCoordinateOrigin;\n  vec2 uvCoordinateOrigin64Low;\n} fill;\n\n\nuniform sampler2D fill_patternTexture;\n\nin vec4 fill_patternBounds;\nin vec4 fill_patternPlacement;\nin vec2 fill_uv;\n\nconst float FILL_UV_SCALE = 512.0 / 40000000.0;\n\n";
+    readonly inject: {
+        'vs:DECKGL_FILTER_GL_POSITION': string;
+        'vs:DECKGL_FILTER_COLOR': string;
+        'fs:DECKGL_FILTER_COLOR': string;
+    };
+    readonly dependencies: [{
+        readonly name: "project";
+        readonly dependencies: [{
+            name: string;
+            vs: string;
+        }, {
+            readonly name: "geometry";
+            readonly vs: "\n#define SMOOTH_EDGE_RADIUS 0.5\n\nstruct VertexGeometry {\n  vec4 position;\n  vec3 worldPosition;\n  vec3 worldPositionAlt;\n  vec3 normal;\n  vec2 uv;\n  vec3 pickingColor;\n} geometry = VertexGeometry(\n  vec4(0.0, 0.0, 1.0, 0.0),\n  vec3(0.0),\n  vec3(0.0),\n  vec3(0.0),\n  vec2(0.0),\n  vec3(0.0)\n);\n";
+            readonly fs: "\n#define SMOOTH_EDGE_RADIUS 0.5\n\nstruct FragmentGeometry {\n  vec2 uv;\n} geometry;\n\nfloat smoothedge(float edge, float x) {\n  return smoothstep(edge - SMOOTH_EDGE_RADIUS, edge + SMOOTH_EDGE_RADIUS, x);\n}\n";
+        }];
+        readonly vs: string;
+        readonly getUniforms: (opts?: ProjectProps | {}) => {};
+        readonly uniformTypes: {
+            readonly wrapLongitude: "f32";
+            readonly coordinateSystem: "i32";
+            readonly commonUnitsPerMeter: "vec3<f32>";
+            readonly projectionMode: "i32";
+            readonly scale: "f32";
+            readonly commonUnitsPerWorldUnit: "vec3<f32>";
+            readonly commonUnitsPerWorldUnit2: "vec3<f32>";
+            readonly center: "vec4<f32>";
+            readonly modelMatrix: "mat4x4<f32>";
+            readonly viewProjectionMatrix: "mat4x4<f32>";
+            readonly viewportSize: "vec2<f32>";
+            readonly devicePixelRatio: "f32";
+            readonly focalDistance: "f32";
+            readonly cameraPosition: "vec3<f32>";
+            readonly coordinateOrigin: "vec3<f32>";
+            readonly commonOrigin: "vec3<f32>";
+            readonly pseudoMeters: "f32";
+        };
+    }];
+    readonly getUniforms: typeof getPatternUniforms;
+    readonly uniformTypes: {
+        readonly patternTextureSize: "vec2<f32>";
+        readonly patternEnabled: "i32";
+        readonly patternMask: "i32";
+        readonly uvCoordinateOrigin: "vec2<f32>";
+        readonly uvCoordinateOrigin64Low: "vec2<f32>";
+    };
+};
 export {};
 //# sourceMappingURL=shader-module.d.ts.map

package/dist/fill-style/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/fill-style/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AA+D3C,KAAK,uBAAuB,GACxB;IACE,QAAQ,EAAE,QAAQ,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACD;IACE,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoCN,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,uBAAuB,CAQhE,CAAC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/fill-style/shader-module.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAkB,MAAM,eAAe,CAAC;AAEjE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AA2E3C,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,YAAY,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAC;AAGF,iBAAS,kBAAkB,CACzB,IAAI,CAAC,EAAE,oBAAoB,GAAG,EAAE,GAC/B,uBAAuB,GAAG,uBAAuB,CA0BnD;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkB1B,CAAC"}

package/dist/fill-style/shader-module.js

@@ -1,88 +1,110 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { project, fp64LowPart } from '@deck.gl/core';
-import { glsl } from "../utils/syntax-tags.js";
+const uniformBlock = /* glsl */ `\
+uniform fillUniforms {
+  vec2 patternTextureSize;
+  bool patternEnabled;
+  bool patternMask;
+  vec2 uvCoordinateOrigin;
+  vec2 uvCoordinateOrigin64Low;
+} fill;
+`;
 /*
  * fill pattern shader module
  */
-const patternVs = `
+const patternVs = /* glsl */ `
 in vec4 fillPatternFrames;
 in float fillPatternScales;
 in vec2 fillPatternOffsets;
-uniform bool fill_patternEnabled;
-uniform vec2 fill_patternTextureSize;
+
 out vec2 fill_uv;
 out vec4 fill_patternBounds;
 out vec4 fill_patternPlacement;
 `;
-const patternFs = `
-uniform bool fill_patternEnabled;
-uniform bool fill_patternMask;
+const vs = `
+${uniformBlock}
+${patternVs}
+`;
+const patternFs = /* glsl */ `
 uniform sampler2D fill_patternTexture;
-uniform vec2 fill_uvCoordinateOrigin;
-uniform vec2 fill_uvCoordinateOrigin64Low;
+
 in vec4 fill_patternBounds;
 in vec4 fill_patternPlacement;
 in vec2 fill_uv;
+
 const float FILL_UV_SCALE = 512.0 / 40000000.0;
 `;
+const fs = `
+${uniformBlock}
+${patternFs}
+`;
 const inject = {
-    'vs:DECKGL_FILTER_GL_POSITION': `
-fill_uv = geometry.position.xy;
-`,
-    'vs:DECKGL_FILTER_COLOR': `
-if (fill_patternEnabled) {
-fill_patternBounds = fillPatternFrames / vec4(fill_patternTextureSize, fill_patternTextureSize);
-fill_patternPlacement.xy = fillPatternOffsets;
-fill_patternPlacement.zw = fillPatternScales * fillPatternFrames.zw;
-}
-`,
-    'fs:DECKGL_FILTER_COLOR': `
-if (fill_patternEnabled) {
-vec2 scale = FILL_UV_SCALE * fill_patternPlacement.zw;
-vec2 patternUV = mod(mod(fill_uvCoordinateOrigin, scale) + fill_uvCoordinateOrigin64Low + fill_uv, scale) / scale;
-patternUV = mod(fill_patternPlacement.xy + patternUV, 1.0);
-vec2 texCoords = fill_patternBounds.xy + fill_patternBounds.zw * patternUV;
-vec4 patternColor = texture(fill_patternTexture, texCoords);
-color.a *= patternColor.a;
-if (!fill_patternMask) {
-color.rgb = patternColor.rgb;
-}
-}
-`
+    'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
+    fill_uv = geometry.position.xy;
+  `,
+    'vs:DECKGL_FILTER_COLOR': /* glsl */ `
+    if (fill.patternEnabled) {
+      fill_patternBounds = fillPatternFrames / vec4(fill.patternTextureSize, fill.patternTextureSize);
+      fill_patternPlacement.xy = fillPatternOffsets;
+      fill_patternPlacement.zw = fillPatternScales * fillPatternFrames.zw;
+    }
+  `,
+    'fs:DECKGL_FILTER_COLOR': /* glsl */ `
+    if (fill.patternEnabled) {
+      vec2 scale = FILL_UV_SCALE * fill_patternPlacement.zw;
+      vec2 patternUV = mod(mod(fill.uvCoordinateOrigin, scale) + fill.uvCoordinateOrigin64Low + fill_uv, scale) / scale;
+      patternUV = mod(fill_patternPlacement.xy + patternUV, 1.0);
+
+      vec2 texCoords = fill_patternBounds.xy + fill_patternBounds.zw * patternUV;
+
+      vec4 patternColor = texture(fill_patternTexture, texCoords);
+      color.a *= patternColor.a;
+      if (!fill.patternMask) {
+        color.rgb = patternColor.rgb;
+      }
+    }
+  `
 };
 /* eslint-disable camelcase */
-function getPatternUniforms(opts, uniforms) {
+function getPatternUniforms(opts) {
     if (!opts) {
         return {};
     }
+    const uniforms = {};
     if ('fillPatternTexture' in opts) {
         const { fillPatternTexture } = opts;
-        return {
-            fill_patternTexture: fillPatternTexture,
-            fill_patternTextureSize: [fillPatternTexture.width, fillPatternTexture.height]
-        };
+        uniforms.fill_patternTexture = fillPatternTexture;
+        uniforms.patternTextureSize = [fillPatternTexture.width, fillPatternTexture.height];
     }
-    if ('viewport' in opts) {
+    if ('project' in opts) {
         const { fillPatternMask = true, fillPatternEnabled = true } = opts;
-        const { project_uCommonOrigin: coordinateOriginCommon } = uniforms;
+        const projectUniforms = project.getUniforms(opts.project);
+        const { commonOrigin: coordinateOriginCommon } = projectUniforms;
         const coordinateOriginCommon64Low = [
             fp64LowPart(coordinateOriginCommon[0]),
             fp64LowPart(coordinateOriginCommon[1])
         ];
-        return {
-            fill_uvCoordinateOrigin: coordinateOriginCommon.slice(0, 2),
-            fill_uvCoordinateOrigin64Low: coordinateOriginCommon64Low,
-            fill_patternMask: fillPatternMask,
-            fill_patternEnabled: fillPatternEnabled
-        };
+        uniforms.uvCoordinateOrigin = coordinateOriginCommon.slice(0, 2);
+        uniforms.uvCoordinateOrigin64Low = coordinateOriginCommon64Low;
+        uniforms.patternMask = fillPatternMask;
+        uniforms.patternEnabled = fillPatternEnabled;
     }
-    return {};
+    return uniforms;
 }
 export const patternShaders = {
-    name: 'fill-pattern',
-    vs: patternVs,
-    fs: patternFs,
+    name: 'fill',
+    vs,
+    fs,
     inject,
     dependencies: [project],
-    // @ts-expect-error stricter luma gl types
-    getUniforms: getPatternUniforms
+    getUniforms: getPatternUniforms,
+    uniformTypes: {
+        patternTextureSize: 'vec2<f32>',
+        patternEnabled: 'i32',
+        patternMask: 'i32',
+        uvCoordinateOrigin: 'vec2<f32>',
+        uvCoordinateOrigin64Low: 'vec2<f32>'
+    }
 };

package/dist/fp64/fp64-extension.d.ts

@@ -4,5 +4,6 @@ import type { Layer } from '@deck.gl/core';
 export default class Fp64Extension extends LayerExtension {
     static extensionName: string;
     getShaders(this: Layer): any;
+    draw(this: Layer, params: any, extension: this): void;
 }
 //# sourceMappingURL=fp64-extension.d.ts.map

package/dist/fp64/fp64-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fp64-extension.d.ts","sourceRoot":"","sources":["../../src/fp64/fp64-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAoB,MAAM,eAAe,CAAC;AAGhE,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAEzC,yEAAyE;AACzE,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,cAAc;IACvD,MAAM,CAAC,aAAa,SAAmB;IAEvC,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,GAAG;CAa7B"}
+{"version":3,"file":"fp64-extension.d.ts","sourceRoot":"","sources":["../../src/fp64/fp64-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAoB,MAAM,eAAe,CAAC;AAGhE,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAEzC,yEAAyE;AACzE,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,cAAc;IACvD,MAAM,CAAC,aAAa,SAAmB;IAEvC,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,GAAG;IAc5B,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI;CAItD"}

package/dist/fp64/fp64-extension.js

@@ -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 { LayerExtension, COORDINATE_SYSTEM } from '@deck.gl/core';
 import project64 from "./project64.js";
 /** @deprecated Adds the legacy 64-bit precision to geospatial layers. */
@@ -31,6 +15,10 @@ class Fp64Extension extends LayerExtension {
             modules: [project64]
         };
     }
+    draw(params, extension) {
+        const { viewport } = params.context;
+        this.setShaderModuleProps({ project64: { viewport } });
+    }
 }
 Fp64Extension.extensionName = 'Fp64Extension';
 export default Fp64Extension;

package/dist/fp64/project64.d.ts

@@ -1,8 +1,8 @@
 import type { ShaderModule } from '@luma.gl/shadertools';
 import type { Viewport } from '@deck.gl/core';
-type Project64ModuleSettings = {
+type Project64ModuleProps = {
     viewport: Viewport;
 };
-declare const _default: ShaderModule<Project64ModuleSettings>;
+declare const _default: ShaderModule<Project64ModuleProps>;
 export default _default;
 //# sourceMappingURL=project64.d.ts.map

package/dist/fp64/project64.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project64.d.ts","sourceRoot":"","sources":["../../src/fp64/project64.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAIvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAG5C,KAAK,uBAAuB,GAAG;IAC7B,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;;AAEF,wBAK2C"}
+{"version":3,"file":"project64.d.ts","sourceRoot":"","sources":["../../src/fp64/project64.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAIvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAG5C,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;wBAaG,YAAY,CAAC,oBAAoB,CAAC;AAXvC,wBAWwC"}

package/dist/fp64/project64.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "\nconst vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);\n\nuniform vec2 project_uViewProjectionMatrixFP64[16];\n\n// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw\nvoid mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {\n\n#if defined(NVIDIA_FP64_WORKAROUND)\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);\n#else\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);\n#endif\n  out_val[1] = sum_fp64(PI_FP64,\n    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));\n  return;\n}\n\nvoid project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {\n  vec2 pos_fp64[2];\n  mercatorProject_fp64(position_fp64, pos_fp64);\n  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);\n  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);\n\n  return;\n}\n\nvoid project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {\n  vec4 position64xy = vec4(\n    position.x, position64xyLow.x,\n    position.y, position64xyLow.y);\n\n  project_position_fp64(position64xy, out_val);\n}\n\nvec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {\n  vec2 vertex_pos_clipspace[4];\n  mat4_vec4_mul_fp64(project_uViewProjectionMatrixFP64, vertex_pos_modelspace,\n    vertex_pos_clipspace);\n  return vec4(\n    vertex_pos_clipspace[0].x,\n    vertex_pos_clipspace[1].x,\n    vertex_pos_clipspace[2].x,\n    vertex_pos_clipspace[3].x\n    );\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition\n) {\n  // This is the local offset to the instance position\n  vec2 offset64[4];\n  vec4_fp64(vec4(offset, 0.0), offset64);\n\n  float z = project_size(position.z);\n\n  // Apply web mercator projection (depends on coordinate system imn use)\n  vec2 projectedPosition64xy[2];\n  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);\n\n  vec2 commonPosition64[4];\n  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);\n  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);\n  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));\n  commonPosition64[3] = vec2(1.0, 0.0);\n\n  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);\n\n  return project_common_position_to_clipspace_fp64(commonPosition64);\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset\n) {\n  vec4 commonPosition;\n  return project_position_to_clipspace(\n    position, position64xyLow, offset, commonPosition\n  );\n}\n";
+declare const _default: "\nconst vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);\n\nuniform project64Uniforms {\n  vec2 scale;\n  mat4 viewProjectionMatrix;\n  mat4 viewProjectionMatrix64Low;\n} project64;\n\n// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw\nvoid mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {\n\n#if defined(NVIDIA_FP64_WORKAROUND)\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);\n#else\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);\n#endif\n  out_val[1] = sum_fp64(PI_FP64,\n    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));\n  return;\n}\n\nvoid project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {\n  vec2 pos_fp64[2];\n  mercatorProject_fp64(position_fp64, pos_fp64);\n  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);\n  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);\n\n  return;\n}\n\nvoid project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {\n  vec4 position64xy = vec4(\n    position.x, position64xyLow.x,\n    position.y, position64xyLow.y);\n\n  project_position_fp64(position64xy, out_val);\n}\n\nvec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {\n  vec2 vertex_pos_clipspace[4];\n  vec2 viewProjectionMatrixFP64[16];\n  for (int i = 0; i < 4; i++) {\n    for (int j = 0; j < 4; j++) {\n      viewProjectionMatrixFP64[4 * i + j] = vec2(\n        project64.viewProjectionMatrix[j][i],\n        project64.viewProjectionMatrix64Low[j][i]\n      );\n    }   \n  }\n  mat4_vec4_mul_fp64(viewProjectionMatrixFP64, vertex_pos_modelspace,\n    vertex_pos_clipspace);\n  return vec4(\n    vertex_pos_clipspace[0].x,\n    vertex_pos_clipspace[1].x,\n    vertex_pos_clipspace[2].x,\n    vertex_pos_clipspace[3].x\n    );\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition\n) {\n  // This is the local offset to the instance position\n  vec2 offset64[4];\n  vec4_fp64(vec4(offset, 0.0), offset64);\n\n  float z = project_size(position.z);\n\n  // Apply web mercator projection (depends on coordinate system imn use)\n  vec2 projectedPosition64xy[2];\n  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);\n\n  vec2 commonPosition64[4];\n  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);\n  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);\n  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));\n  commonPosition64[3] = vec2(1.0, 0.0);\n\n  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);\n\n  return project_common_position_to_clipspace_fp64(commonPosition64);\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset\n) {\n  vec4 commonPosition;\n  return project_position_to_clipspace(\n    position, position64xyLow, offset, commonPosition\n  );\n}\n";
 export default _default;
 //# sourceMappingURL=project64.glsl.d.ts.map

package/dist/fp64/project64.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project64.glsl.d.ts","sourceRoot":"","sources":["../../src/fp64/project64.glsl.ts"],"names":[],"mappings":";AAoBA,wBAgFE"}
+{"version":3,"file":"project64.glsl.d.ts","sourceRoot":"","sources":["../../src/fp64/project64.glsl.ts"],"names":[],"mappings":";AAIA,wBA6FE"}

package/dist/fp64/project64.glsl.js

@@ -1,25 +1,13 @@
-// 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
 export default `\
 const vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);
-uniform vec2 project_uViewProjectionMatrixFP64[16];
+uniform project64Uniforms {
+vec2 scale;
+mat4 viewProjectionMatrix;
+mat4 viewProjectionMatrix64Low;
+} project64;
 void mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {
 #if defined(NVIDIA_FP64_WORKAROUND)
 out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);
@@ -45,7 +33,16 @@ project_position_fp64(position64xy, out_val);
 }
 vec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {
 vec2 vertex_pos_clipspace[4];
-mat4_vec4_mul_fp64(project_uViewProjectionMatrixFP64, vertex_pos_modelspace,
+vec2 viewProjectionMatrixFP64[16];
+for (int i = 0; i < 4; i++) {
+for (int j = 0; j < 4; j++) {
+viewProjectionMatrixFP64[4 * i + j] = vec2(
+project64.viewProjectionMatrix[j][i],
+project64.viewProjectionMatrix64Low[j][i]
+);
+}
+}
+mat4_vec4_mul_fp64(viewProjectionMatrixFP64, vertex_pos_modelspace,
 vertex_pos_clipspace);
 return vec4(
 vertex_pos_clipspace[0].x,

package/dist/fp64/project64.js

@@ -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
 /* eslint-disable camelcase */
 import { fp64 } from '@luma.gl/shadertools';
 const { fp64ify, fp64ifyMatrix4 } = fp64;
@@ -26,7 +10,13 @@ export default {
     name: 'project64',
     dependencies: [project, fp64],
     vs: project64Shader,
-    getUniforms
+    getUniforms,
+    uniformTypes: {
+        scale: 'vec2<f32>',
+        // Cannot pass as vec2[16], so instead split into 2 mat4x4
+        viewProjectionMatrix: 'mat4x4<f32>',
+        viewProjectionMatrix64Low: 'mat4x4<f32>'
+    }
 };
 // TODO - this module should calculate the 64 bit uniforms
 // It is currently done by project to minimize duplicated work
@@ -41,10 +31,20 @@ function getUniforms(opts) {
 }
 function calculateUniforms({ viewProjectionMatrix, scale }) {
     const glViewProjectionMatrixFP64 = fp64ifyMatrix4(viewProjectionMatrix);
-    const scaleFP64 = fp64ify(scale);
+    const viewProjectionMatrix64High = new Float32Array(16);
+    const viewProjectionMatrix64Low = new Float32Array(16);
+    for (let i = 0; i < 4; i++) {
+        for (let j = 0; j < 4; j++) {
+            // Match order used in project.viewProjectionMatrix
+            const from = 4 * i + j;
+            const to = 4 * j + i;
+            viewProjectionMatrix64High[to] = glViewProjectionMatrixFP64[2 * from];
+            viewProjectionMatrix64Low[to] = glViewProjectionMatrixFP64[2 * from + 1];
+        }
+    }
     return {
-        project_uViewProjectionMatrixFP64: glViewProjectionMatrixFP64,
-        project64_uViewProjectionMatrix: glViewProjectionMatrixFP64,
-        project64_uScale: scaleFP64
+        scale: fp64ify(scale),
+        viewProjectionMatrix: [...viewProjectionMatrix64High],
+        viewProjectionMatrix64Low: [...viewProjectionMatrix64Low]
     };
 }