@deck.gl/extensions 9.3.7 → 9.4.0-alpha.2

package/dist/index.cjs

@@ -2354,6 +2354,20 @@ var MaskPass = class extends import_core17._LayersPass {
 
 // dist/utils/projection-utils.js
 var import_core18 = require("@deck.gl/core");
+var MERCATOR_REFERENCE_VIEWPORT = new import_core18.WebMercatorViewport({
+  width: 1,
+  height: 1,
+  longitude: 0,
+  latitude: 0,
+  zoom: 0
+});
+function lngLatToMercatorCommon(lngLat) {
+  const [x, y] = MERCATOR_REFERENCE_VIEWPORT.projectPosition(lngLat);
+  return [x, y];
+}
+function getMercatorReferenceViewport(viewport) {
+  return viewport.isGeospatial ? MERCATOR_REFERENCE_VIEWPORT : viewport;
+}
 function joinLayerBounds(layers, viewport) {
   const bounds = [Infinity, Infinity, -Infinity, -Infinity];
   for (const layer of layers) {
@@ -2379,11 +2393,11 @@ function makeViewport(opts) {
   if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {
     return null;
   }
-  const centerWorld = viewport.unprojectPosition([
+  const centerWorld = isGeospatial ? MERCATOR_REFERENCE_VIEWPORT.unprojectPosition([
     (bounds[0] + bounds[2]) / 2,
     (bounds[1] + bounds[3]) / 2,
     0
-  ]);
+  ]) : viewport.unprojectPosition([(bounds[0] + bounds[2]) / 2, (bounds[1] + bounds[3]) / 2, 0]);
   let { width, height, zoom } = opts;
   if (zoom === void 0) {
     width = width - border * 2;
@@ -2709,10 +2723,10 @@ MaskExtension.extensionName = "MaskExtension";
 var mask_extension_default = MaskExtension;
 
 // dist/terrain/terrain-extension.js
-var import_core26 = require("@deck.gl/core");
+var import_core28 = require("@deck.gl/core");
 
 // dist/terrain/terrain-effect.js
-var import_core25 = require("@deck.gl/core");
+var import_core27 = require("@deck.gl/core");
 
 // dist/terrain/shader-module.js
 var import_core22 = require("@deck.gl/core");
@@ -2745,12 +2759,22 @@ uniform sampler2D terrain_map;
 var terrainModule = {
   name: "terrain",
   dependencies: [import_core22.project],
-  // eslint-disable-next-line prefer-template
-  vs: uniformBlock5 + /* glsl */
-  "out vec3 commonPos;",
-  // eslint-disable-next-line prefer-template
-  fs: uniformBlock5 + /* glsl */
-  "in vec3 commonPos;",
+  vs: `${uniformBlock5}
+out vec3 commonPos;
+// In globe mode, absolute Mercator position for terrain FBO UV lookups
+out vec2 terrainMercPos;
+out float terrainHeight;
+
+vec2 terrain_globe_to_mercator(vec3 globePosition) {
+  float D = length(globePosition);
+  float sinLat = clamp(globePosition.z / D, -0.999998, 0.999998);
+  float x = atan(globePosition.x, -globePosition.y);
+  float y = atanh(sinLat);
+  return (vec2(x, y) + PI) * WORLD_SCALE;
+}
+`,
+  fs: `${uniformBlock5}in vec2 terrainMercPos;
+in float terrainHeight;`,
   inject: {
     "vs:#main-start": (
       /* glsl */
@@ -2765,19 +2789,35 @@ if (terrain.mode == TERRAIN_MODE_SKIP) {
       /* glsl */
       `
 commonPos = geometry.position.xyz;
+terrainHeight = commonPos.z + project.commonOrigin.z;
+if (project.projectionMode == PROJECTION_MODE_GLOBE) {
+  terrainMercPos = terrain_globe_to_mercator(commonPos);
+  terrainHeight = length(commonPos) - GLOBE_RADIUS;
+} else {
+  terrainMercPos = commonPos.xy;
+}
 if (terrain.mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
-  vec2 texCoords = (commonPos.xy - terrain.bounds.xy) / terrain.bounds.zw;
+  vec2 texCoords = (terrainMercPos - terrain.bounds.xy) / terrain.bounds.zw;
   position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);
-  commonPos.z += project.commonOrigin.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;
+  vec2 anchorMercPos = project.projectionMode == PROJECTION_MODE_GLOBE
+    ? terrain_globe_to_mercator(anchorCommon)
+    : anchorCommon.xy;
+  vec2 texCoords = (anchorMercPos - 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;
+    if (project.projectionMode == PROJECTION_MODE_GLOBE) {
+      // Height map is written in Mercator common space (units = TILE_SIZE / EARTH_CIRCUMFERENCE / cos(lat))
+      // Convert to globe radial units (units = GLOBE_RADIUS / EARTH_RADIUS)
+      terrainZ *= cos(radians(geometry.worldPosition.y)) * PI;
+      geometry.position.xyz += normalize(geometry.position.xyz) * terrainZ;
+    } else {
+      geometry.position.z += terrainZ;
+    }
     position = project_common_position_to_clipspace(geometry.position);
   }
 }
@@ -2787,7 +2827,7 @@ if (terrain.mode == TERRAIN_MODE_USE_HEIGHT_MAP) {
       /* glsl */
       `
 if (terrain.mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
-  fragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);
+  fragColor = vec4(terrainHeight, 0.0, 0.0, 1.0);
   return;
 }
     `
@@ -2796,7 +2836,7 @@ if (terrain.mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
       /* glsl */
       `
 if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_USE_COVER_ONLY)) {
-  vec2 texCoords = (commonPos.xy - terrain.bounds.xy) / terrain.bounds.zw;
+  vec2 texCoords = (terrainMercPos - terrain.bounds.xy) / terrain.bounds.zw;
   vec4 pixel = texture(terrain_map, texCoords);
   if (terrain.mode == TERRAIN_MODE_USE_COVER_ONLY) {
     color = pixel;
@@ -2845,7 +2885,7 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
       return {
         mode,
         terrain_map: sampler,
-        // Convert bounds to the common space, as [minX, minY, width, height]
+        // Convert bounds to common space, as [minX, minY, width, height]
         bounds: bounds ? [
           bounds[0] - commonOrigin[0],
           bounds[1] - commonOrigin[1],
@@ -2866,6 +2906,9 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
   }
 };
 
+// dist/terrain/terrain-cover.js
+var import_core23 = require("@deck.gl/core");
+
 // dist/terrain/utils.js
 var import_constants = require("@luma.gl/webgl/constants");
 function createRenderTarget(device, opts) {
@@ -2958,8 +3001,8 @@ var TerrainCover = class {
       if (!this.targetBounds) {
         shouldRedraw = true;
         this.targetBounds = this.tile.boundingBox;
-        const bottomLeftCommon = viewport.projectPosition(this.targetBounds[0]);
-        const topRightCommon = viewport.projectPosition(this.targetBounds[1]);
+        const bottomLeftCommon = lngLatToMercatorCommon(this.targetBounds[0]);
+        const topRightCommon = lngLatToMercatorCommon(this.targetBounds[1]);
         this.targetBoundsCommon = [
           bottomLeftCommon[0],
           bottomLeftCommon[1],
@@ -2970,7 +3013,7 @@ var TerrainCover = class {
     } else if (this.targetBounds !== targetLayer.getBounds()) {
       shouldRedraw = true;
       this.targetBounds = targetLayer.getBounds();
-      this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);
+      this.targetBoundsCommon = joinLayerBounds([targetLayer], getMercatorReferenceViewport(viewport));
     }
     if (!this.targetBoundsCommon) {
       return false;
@@ -2981,7 +3024,7 @@ var TerrainCover = class {
     } else {
       const oldZoom = (_a = this.renderViewport) == null ? void 0 : _a.zoom;
       shouldRedraw = shouldRedraw || newZoom !== oldZoom;
-      const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);
+      const newBounds = viewport instanceof import_core23._GlobeViewport ? this.targetBoundsCommon : getRenderBounds(this.targetBoundsCommon, viewport);
       const oldBounds = this.bounds;
       shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);
       this.bounds = newBounds;
@@ -3058,7 +3101,7 @@ function intersect(b1, b2) {
 }
 
 // dist/terrain/terrain-pass.js
-var import_core23 = require("@deck.gl/core");
+var import_core24 = require("@deck.gl/core");
 var TERRAIN_BLENDING = {
   blendColorOperation: "max",
   blendColorSrcFactor: "one",
@@ -3067,7 +3110,7 @@ var TERRAIN_BLENDING = {
   blendAlphaSrcFactor: "one",
   blendAlphaDstFactor: "one"
 };
-var TerrainPass = class extends import_core23._LayersPass {
+var TerrainPass = class extends import_core24._LayersPass {
   getRenderableLayers(viewport, opts) {
     const { layers } = opts;
     const result = [];
@@ -3132,8 +3175,8 @@ var TerrainPass = class extends import_core23._LayersPass {
 };
 
 // dist/terrain/terrain-picking-pass.js
-var import_core24 = require("@deck.gl/core");
-var TerrainPickingPass = class extends import_core24._PickLayersPass {
+var import_core25 = require("@deck.gl/core");
+var TerrainPickingPass = class extends import_core25._PickLayersPass {
   constructor() {
     super(...arguments);
     this.drawParameters = {};
@@ -3204,6 +3247,7 @@ var TerrainPickingPass = class extends import_core24._PickLayersPass {
 };
 
 // dist/terrain/height-map-builder.js
+var import_core26 = require("@deck.gl/core");
 var MAP_MAX_SIZE = 2048;
 var HeightMapBuilder = class {
   static isSupported(device) {
@@ -3244,13 +3288,13 @@ var HeightMapBuilder = class {
     if (layersChanged) {
       this.layers = layers;
       this.layersBounds = layers.map((layer) => layer.getBounds());
-      this.layersBoundsCommon = joinLayerBounds(layers, viewport);
+      this.layersBoundsCommon = joinLayerBounds(layers, getMercatorReferenceViewport(viewport));
     }
     const viewportChanged = !this.lastViewport || !viewport.equals(this.lastViewport);
     if (!this.layersBoundsCommon) {
       this.renderViewport = null;
     } else if (layersChanged || viewportChanged) {
-      const bounds = getRenderBounds(this.layersBoundsCommon, viewport);
+      const bounds = viewport instanceof import_core26._GlobeViewport ? this.layersBoundsCommon : getRenderBounds(this.layersBoundsCommon, viewport);
       if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {
         this.renderViewport = null;
         return false;
@@ -3260,17 +3304,16 @@ var HeightMapBuilder = class {
       const scale = viewport.scale;
       const pixelWidth = (bounds[2] - bounds[0]) * scale;
       const pixelHeight = (bounds[3] - bounds[1]) * scale;
+      const centerMerc = viewport.isGeospatial ? lngLatToMercatorCommon([
+        viewport.longitude ?? 0,
+        viewport.latitude ?? 0
+      ]) : [viewport.center[0], viewport.center[1]];
       this.renderViewport = pixelWidth > 0 || pixelHeight > 0 ? makeViewport({
         // It's not important whether the geometry is visible in this viewport, because
         // vertices will not use the standard project_to_clipspace in the DRAW_TO_HEIGHT_MAP shader
         // However the viewport must have the same center and zoom as the screen viewport
         // So that projection uniforms used for calculating z are the same
-        bounds: [
-          viewport.center[0] - 1,
-          viewport.center[1] - 1,
-          viewport.center[0] + 1,
-          viewport.center[1] + 1
-        ],
+        bounds: [centerMerc[0] - 1, centerMerc[1] - 1, centerMerc[0] + 1, centerMerc[1] + 1],
         zoom: viewport.zoom,
         width: Math.min(pixelWidth, MAP_MAX_SIZE),
         height: Math.min(pixelHeight, MAP_MAX_SIZE),
@@ -3309,7 +3352,7 @@ var TerrainEffect = class {
     if (HeightMapBuilder.isSupported(device)) {
       this.heightMap = new HeightMapBuilder(device);
     } else {
-      import_core25.log.warn("Terrain offset mode is not supported by this browser")();
+      import_core27.log.warn("Terrain offset mode is not supported by this browser")();
     }
     deck._addDefaultShaderModule(terrainModule);
   }
@@ -3477,7 +3520,7 @@ var TerrainEffect = class {
 var defaultProps8 = {
   terrainDrawMode: void 0
 };
-var TerrainExtension = class extends import_core26.LayerExtension {
+var TerrainExtension = class extends import_core28.LayerExtension {
   getShaders() {
     return {
       modules: [terrainModule]