@deck.gl/extensions 9.0.0-beta.4 → 9.0.0-beta.6

package/dist/mask/mask-pass.js

@@ -28,8 +28,8 @@ export default class MaskPass extends LayersPass {
         const clearColor = [255, 255, 255, 255];
         return this.device.withParametersWebGL({
             blend: true,
-            blendFunc: [GL.ZERO, GL.ONE],
-            blendEquation: GL.FUNC_SUBTRACT,
+            blendFunc: [0, 1],
+            blendEquation: 32778,
             colorMask,
             depthTest: false
         }, () => super.render({ ...options, clearColor, target: this.fbo, pass: 'mask' }));

package/dist/mask/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/mask/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAoE3C,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;;AAYF,wBAOsC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/mask/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAqE3C,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;;AAYF,wBAOsC"}

package/dist/mask/shader-module.js

@@ -1,9 +1,10 @@
 import { project } from '@deck.gl/core';
+import { glsl } from "../utils/syntax-tags.js";
 const vs = `
 uniform vec4 mask_bounds;
 uniform bool mask_maskByInstance;
 vec2 mask_getCoords(vec4 position) {
-  return (position.xy - mask_bounds.xy) / (mask_bounds.zw - mask_bounds.xy);
+return (position.xy - mask_bounds.xy) / (mask_bounds.zw - mask_bounds.xy);
 }
 `;
 const fs = `
@@ -12,26 +13,25 @@ uniform int mask_channel;
 uniform bool mask_enabled;
 uniform bool mask_inverted;
 bool mask_isInBounds(vec2 texCoords) {
-  if (!mask_enabled) {
-    return true;
-  }
-  vec4 maskColor = texture(mask_texture, texCoords);
-  float maskValue = 1.0;
-  if (mask_channel == 0) {
-    maskValue = maskColor.r;
-  } else if (mask_channel == 1) {
-    maskValue = maskColor.g;
-  } else if (mask_channel == 2) {
-    maskValue = maskColor.b;
-  } else if (mask_channel == 3) {
-    maskValue = maskColor.a;
-  }
-
-  if (mask_inverted) {
-    return maskValue >= 0.5;
-  } else {
-    return maskValue < 0.5;
-  }
+if (!mask_enabled) {
+return true;
+}
+vec4 maskColor = texture(mask_texture, texCoords);
+float maskValue = 1.0;
+if (mask_channel == 0) {
+maskValue = maskColor.r;
+} else if (mask_channel == 1) {
+maskValue = maskColor.g;
+} else if (mask_channel == 2) {
+maskValue = maskColor.b;
+} else if (mask_channel == 3) {
+maskValue = maskColor.a;
+}
+if (mask_inverted) {
+return maskValue >= 0.5;
+} else {
+return maskValue < 0.5;
+}
 }
 `;
 const inject = {
@@ -39,27 +39,23 @@ const inject = {
 out vec2 mask_texCoords;
 `,
     'vs:#main-end': `
-   vec4 mask_common_position;
-   if (mask_maskByInstance) {
-     mask_common_position = project_position(vec4(geometry.worldPosition, 1.0));
-   } else {
-     mask_common_position = geometry.position;
-   }
-   mask_texCoords = mask_getCoords(mask_common_position);
+vec4 mask_common_position;
+if (mask_maskByInstance) {
+mask_common_position = project_position(vec4(geometry.worldPosition, 1.0));
+} else {
+mask_common_position = geometry.position;
+}
+mask_texCoords = mask_getCoords(mask_common_position);
 `,
     'fs:#decl': `
 in vec2 mask_texCoords;
 `,
     'fs:#main-start': `
-  if (mask_enabled) {
-    bool mask = mask_isInBounds(mask_texCoords);
-
-    // Debug: show extent of render target
-    // fragColor = vec4(mask_texCoords, 0.0, 1.0);
-    fragColor = texture(mask_texture, mask_texCoords);
-
-    if (!mask) discard;
-  }
+if (mask_enabled) {
+bool mask = mask_isInBounds(mask_texCoords);
+fragColor = texture(mask_texture, mask_texCoords);
+if (!mask) discard;
+}
 `
 };
 /* eslint-disable camelcase */

package/dist/path-style/shaders.glsl.js

@@ -26,41 +26,36 @@ in float vDashOffset;
         // 1 - stretch to fit, draw half dash at each end for nicer joints
         // o--    ----    ----    ----    --o--      --o--     ----     --o
         'fs:#main-start': `
-  float solidLength = vDashArray.x;
-  float gapLength = vDashArray.y;
-  float unitLength = solidLength + gapLength;
-
-  float offset;
-
-  if (unitLength > 0.0) {
-    if (dashAlignMode == 0.0) {
-      offset = vDashOffset;
-    } else {
-      unitLength = vPathLength / round(vPathLength / unitLength);
-      offset = solidLength / 2.0;
-    }
-
-    float unitOffset = mod(vPathPosition.y + offset, unitLength);
-
-    if (gapLength > 0.0 && unitOffset > solidLength) {
-      if (capType <= 0.5) {
-        if (!(dashGapPickable && bool(picking.isActive))) {
-          discard;
-        }
-      } else {
-        // caps are rounded, test the distance to solid ends
-        float distToEnd = length(vec2(
-          min(unitOffset - solidLength, unitLength - unitOffset),
-          vPathPosition.x
-        ));
-        if (distToEnd > 1.0) {
-          if (!(dashGapPickable && bool(picking.isActive))) {
-            discard;
-          }
-        }
-      }
-    }
-  }
+float solidLength = vDashArray.x;
+float gapLength = vDashArray.y;
+float unitLength = solidLength + gapLength;
+float offset;
+if (unitLength > 0.0) {
+if (dashAlignMode == 0.0) {
+offset = vDashOffset;
+} else {
+unitLength = vPathLength / round(vPathLength / unitLength);
+offset = solidLength / 2.0;
+}
+float unitOffset = mod(vPathPosition.y + offset, unitLength);
+if (gapLength > 0.0 && unitOffset > solidLength) {
+if (capType <= 0.5) {
+if (!(dashGapPickable && bool(picking.isActive))) {
+discard;
+}
+} else {
+float distToEnd = length(vec2(
+min(unitOffset - solidLength, unitLength - unitOffset),
+vPathPosition.x
+));
+if (distToEnd > 1.0) {
+if (!(dashGapPickable && bool(picking.isActive))) {
+discard;
+}
+}
+}
+}
+}
 `
     }
 };
@@ -70,22 +65,22 @@ export const offsetShaders = {
 in float instanceOffsets;
 `,
         'vs:DECKGL_FILTER_SIZE': `
-  float offsetWidth = abs(instanceOffsets * 2.0) + 1.0;
-  size *= offsetWidth;
+float offsetWidth = abs(instanceOffsets * 2.0) + 1.0;
+size *= offsetWidth;
 `,
         'vs:#main-end': `
-  float offsetWidth = abs(instanceOffsets * 2.0) + 1.0;
-  float offsetDir = sign(instanceOffsets);
-  vPathPosition.x = (vPathPosition.x + offsetDir) * offsetWidth - offsetDir;
-  vPathPosition.y *= offsetWidth;
-  vPathLength *= offsetWidth;
+float offsetWidth = abs(instanceOffsets * 2.0) + 1.0;
+float offsetDir = sign(instanceOffsets);
+vPathPosition.x = (vPathPosition.x + offsetDir) * offsetWidth - offsetDir;
+vPathPosition.y *= offsetWidth;
+vPathLength *= offsetWidth;
 `,
         'fs:#main-start': `
-  float isInside;
-  isInside = step(-1.0, vPathPosition.x) * step(vPathPosition.x, 1.0);
-  if (isInside == 0.0) {
-    discard;
-  }
+float isInside;
+isInside = step(-1.0, vPathPosition.x) * step(vPathPosition.x, 1.0);
+if (isInside == 0.0) {
+discard;
+}
 `
     }
 };

package/dist/terrain/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/terrain/shader-module.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGvD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,MAAM,EAAC,qCAAkC;AACtD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAElD,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,kDAAkD;AAClD,eAAO,MAAM,YAAY;;IAEvB,6EAA6E;;IAE7E,2EAA2E;;IAE3E,6FAA6F;;IAE7F,0EAA0E;;IAE1E,mEAAmE;;CAEpE,CAAC;AAOF,eAAO,MAAM,aAAa,qCA6Hc,CAAC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/terrain/shader-module.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGvD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,MAAM,EAAC,qCAAkC;AACtD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAGlD,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,kDAAkD;AAClD,eAAO,MAAM,YAAY;;IAEvB,6EAA6E;;IAE7E,2EAA2E;;IAE3E,6FAA6F;;IAE7F,0EAA0E;;IAE1E,mEAAmE;;CAEpE,CAAC;AAOF,eAAO,MAAM,aAAa,qCA6Hc,CAAC"}

package/dist/terrain/shader-module.js

@@ -1,5 +1,6 @@
 /* eslint-disable camelcase */
 import { project } from '@deck.gl/core';
+import { glsl } from "../utils/syntax-tags.js";
 /** A model can have one of the following modes */
 export const TERRAIN_MODE = {
     NONE: 0,
@@ -27,59 +28,56 @@ uniform float terrain_mode;
 uniform sampler2D terrain_map;
 uniform vec4 terrain_bounds;
 out vec3 commonPos;
-${TERRAIN_MODE_CONSTANTS}
-    `,
+` + TERRAIN_MODE_CONSTANTS,
         'vs:#main-start': `
 if (terrain_mode == TERRAIN_MODE_SKIP) {
-  gl_Position = vec4(0.0);
-  return;
+gl_Position = vec4(0.0);
+return;
 }
 `,
         'vs:DECKGL_FILTER_GL_POSITION': `
 commonPos = geometry.position.xyz;
 if (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
-  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
-  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);
-  commonPos.z += project_uCommonOrigin.z;
+vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
+position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);
+commonPos.z += project_uCommonOrigin.z;
 }
 if (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {
-  vec3 anchor = geometry.worldPosition;
-  anchor.z = 0.0;
-  vec3 anchorCommon = project_position(anchor);
-  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;
-  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {
-    float terrainZ = texture(terrain_map, texCoords).r;
-    geometry.position.z += terrainZ;
-    position = project_common_position_to_clipspace(geometry.position);
-  }
+vec3 anchor = geometry.worldPosition;
+anchor.z = 0.0;
+vec3 anchorCommon = project_position(anchor);
+vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;
+if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {
+float terrainZ = texture(terrain_map, texCoords).r;
+geometry.position.z += terrainZ;
+position = project_common_position_to_clipspace(geometry.position);
 }
-    `,
+}
+`,
         'fs:#decl': `
 uniform float terrain_mode;
 uniform sampler2D terrain_map;
 uniform vec4 terrain_bounds;
 in vec3 commonPos;
-${TERRAIN_MODE_CONSTANTS}
-    `,
+` + TERRAIN_MODE_CONSTANTS,
         'fs:#main-start': `
 if (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
-  fragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);
-  return;
+fragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);
+return;
 }
-    `,
+`,
         'fs:DECKGL_FILTER_COLOR': `
 if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {
-  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
-  vec4 pixel = texture(terrain_map, texCoords);
-  if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {
-    color = pixel;
-  } else {
-    // pixel is premultiplied
-    color = pixel + color * (1.0 - pixel.a);
-  }
-  return;
+vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
+vec4 pixel = texture(terrain_map, texCoords);
+if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {
+color = pixel;
+} else {
+color = pixel + color * (1.0 - pixel.a);
+}
+return;
 }
-    `
+`
     },
     // eslint-disable-next-line complexity
     getUniforms: (opts = {}, uniforms) => {

package/dist/terrain/terrain-pass.js

@@ -25,8 +25,8 @@ export class TerrainPass extends LayersPass {
         this.device.withParametersWebGL({
             clearColor: [0, 0, 0, 0],
             blend: true,
-            blendFunc: [GL.ONE, GL.ONE],
-            blendEquation: GL.MAX,
+            blendFunc: [1, 1],
+            blendEquation: 32776,
             depthTest: false
         }, () => this.render({
             ...opts,

package/dist/terrain/utils.js

@@ -5,8 +5,8 @@ export function createRenderTarget(device, opts) {
         colorAttachments: [
             device.createTexture({
                 ...(opts.float && {
-                    format: device.info.type === 'webgl2' ? 'rgba32float' : 'rgba8unorm',
-                    type: GL.FLOAT
+                    format: 'rgba32float',
+                    type: 5126
                 }),
                 mipmaps: false,
                 sampler: {

package/dist/utils/syntax-tags.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Marks GLSL shaders for syntax highlighting: glsl`...`
+ * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
+ */
+export declare const glsl: (s: TemplateStringsArray) => string;
+//# sourceMappingURL=syntax-tags.d.ts.map

package/dist/utils/syntax-tags.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"syntax-tags.d.ts","sourceRoot":"","sources":["../../src/utils/syntax-tags.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,IAAI,MAAO,oBAAoB,WAAW,CAAC"}

package/dist/utils/syntax-tags.js

@@ -0,0 +1,5 @@
+/**
+ * Marks GLSL shaders for syntax highlighting: glsl`...`
+ * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
+ */
+export const glsl = (s) => `${s}`;