Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
fix: fix regressions after deck.gl 9.3.1 upgrade (#3396)
Igor Dykhta57278d231456
diff --git a/src/components/src/effects/surface-fog-section.tsx b/src/components/src/effects/surface-fog-section.tsxindex 9cc39bafe..db2873d01 100644--- a/src/components/src/effects/surface-fog-section.tsx+++ b/src/components/src/effects/surface-fog-section.tsx@@ -196,7 +196,7 @@ export default function SurfaceFogElevationSectionFactory(if (!heightDesc || !heightEndDesc) return null;const rangeMin = heightDesc.min ?? -200;- const rangeMax = heightDesc.max ?? 3000;+ const rangeMax = heightDesc.max ?? 6000;const rangeSpan = rangeMax - rangeMin;const step = rangeSpan > 10 ? 1 : 0.001;diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsxindex f3e085e40..fe945ad51 100644--- a/src/components/src/map-container.tsx+++ b/src/components/src/map-container.tsx@@ -965,11 +965,7 @@ export default function MapContainerFactory(const views = deckGlProps?.views? deckGlProps?.views()- : new MapView({legacyMeterSizes: true, farZMultiplier: 1.2} as ConstructorParameters<- typeof MapView- >[0] & {- legacyMeterSizes: boolean;- });+ : new MapView({farZMultiplier: 1.2});let allDeckGlProps = {...deckGlProps,diff --git a/src/components/src/modals/export-video-modal.tsx b/src/components/src/modals/export-video-modal.tsxindex b8160f5ac..d1b16cd43 100644--- a/src/components/src/modals/export-video-modal.tsx+++ b/src/components/src/modals/export-video-modal.tsx@@ -257,8 +257,23 @@ const ExportVideoModalFactory = () => {if (mapStyle?.styleType === NO_MAP_ID) {const noMapEntry = mapStyle.mapStyles?.[NO_MAP_ID];if (noMapEntry && !noMapEntry.url) {+ const bg = mapStyle.backgroundColor;+ const bgStyle = {+ ...EMPTY_MAPBOX_STYLE,+ layers: bg+ ? [+ {+ id: 'background',+ type: 'background',+ paint: {+ 'background-color': `rgb(${bg[0]},${bg[1]},${bg[2]})`+ }+ }+ ]+ : []+ };const emptyStyleUrl = `data:application/json,${encodeURIComponent(- JSON.stringify(EMPTY_MAPBOX_STYLE)+ JSON.stringify(bgStyle))}`;return {visState,diff --git a/src/components/src/modals/hubble-utils.ts b/src/components/src/modals/hubble-utils.tsindex 5da41b4e3..21f1957d9 100644--- a/src/components/src/modals/hubble-utils.ts+++ b/src/components/src/modals/hubble-utils.ts@@ -181,7 +181,10 @@ export function getHubbleDeckGlProps(return {parameters: getHubbleParameters(keplerState),controller: true,- views: new MapView({farZMultiplier: 1.2})+ views: new MapView({+ id: 'mapbox',+ farZMultiplier: 1.2+ })};}diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.tsindex 669cf0dfa..4b91c614a 100644--- a/src/constants/src/default-settings.ts+++ b/src/constants/src/default-settings.ts@@ -1649,7 +1649,7 @@ export const POSTPROCESSING_EFFECTS: {[key: string]: EffectDescription} = {description: 'effectDescription.surfaceFog',parameters: [{name: 'density', defaultValue: 0.6, min: 0, max: 1},- {name: 'height', label: 'Elevation (m)', defaultValue: 50, min: -200, max: 3000},+ {name: 'height', label: 'Elevation (m)', defaultValue: 50, min: -200, max: 6000},{name: 'animateHeight',type: 'checkbox',@@ -1660,7 +1660,7 @@ export const POSTPROCESSING_EFFECTS: {[key: string]: EffectDescription} = {min: 0,max: 1},- {name: 'heightEnd', label: 'End Elevation (m)', defaultValue: 100, min: -200, max: 3000},+ {name: 'heightEnd', label: 'End Elevation (m)', defaultValue: 100, min: -200, max: 6000},{name: 'linearEasing',type: 'checkbox',diff --git a/src/effects/src/shader-passes/distance-fog.ts b/src/effects/src/shader-passes/distance-fog.tsindex 2c4fed180..9bfbd5f8e 100644--- a/src/effects/src/shader-passes/distance-fog.ts+++ b/src/effects/src/shader-passes/distance-fog.ts@@ -3,7 +3,7 @@import {ClipSpace} from '@luma.gl/engine';import type {ShaderModule} from '@luma.gl/shadertools';-import {patchTileViewportIds} from '../tile-viewport-fix';+import {patchTileViewportIds, resetDepthRange} from '../tile-viewport-fix';export type DistanceFogProps = {density: number;@@ -84,12 +84,13 @@ void main() {return;}- // Porter-Duff source-over for correct compositing over transparent basemap pixels.+ // Composite fog over the scene. Transparent pixels (basemap gaps) are treated+ // as if they already contain the fog color, so we un-premultiply, blend in+ // straight RGB space, then re-premultiply for the framebuffer.vec3 baseRgb = color.a > 0.001 ? color.rgb / color.a : fogColor;- vec3 blended = mix(baseRgb, fogColor, fogFactor);- vec3 outRgb = blended * fogFactor + color.rgb * (1.0 - fogFactor);+ vec3 straightRgb = mix(baseRgb, fogColor, fogFactor);float outAlpha = fogFactor + color.a * (1.0 - fogFactor);- fragColor = vec4(outRgb, outAlpha);+ fragColor = vec4(straightRgb * outAlpha, outAlpha);}`;@@ -206,6 +207,7 @@ export class DeckDistanceFogEffect {if (this.isExportMode && opts) {this._unpatchViewports = patchTileViewportIds(opts);}+ resetDepthRange(this.model);}postRender(params: any): any {diff --git a/src/effects/src/shader-passes/surface-fog.ts b/src/effects/src/shader-passes/surface-fog.tsindex 4088125fe..9c3d25dad 100644--- a/src/effects/src/shader-passes/surface-fog.ts+++ b/src/effects/src/shader-passes/surface-fog.ts@@ -3,7 +3,7 @@import {ClipSpace} from '@luma.gl/engine';import type {ShaderModule} from '@luma.gl/shadertools';-import {patchTileViewportIds} from '../tile-viewport-fix';+import {patchTileViewportIds, resetDepthRange} from '../tile-viewport-fix';export type SurfaceFogProps = {density: number;@@ -194,13 +194,11 @@ void main() {vec3 fogColorNorm = surfaceFog.fogColor / 255.0;if (!usePattern) {- // Plain fog — Porter-Duff source-over for basemap coverage.float ff = clamp(fogFactor, 0.0, 1.0);vec3 baseRgb = color.a > 0.001 ? color.rgb / color.a : fogColorNorm;- vec3 blended = mix(baseRgb, fogColorNorm, ff);- vec3 outRgb = blended * ff + color.rgb * (1.0 - ff);+ vec3 straightRgb = mix(baseRgb, fogColorNorm, ff);float outAlpha = ff + color.a * (1.0 - ff);- fragColor = vec4(outRgb, outAlpha);+ fragColor = vec4(straightRgb * outAlpha, outAlpha);return;}@@ -216,12 +214,10 @@ void main() {vec3 tinted = mix(baseRgb, fogColorNorm, submersion);vec3 waterSurface = clamp(tinted * (diffuse + vec3(0.1)) + specular, 0.0, 1.0);- // Porter-Duff source-over so the effect is visible on transparent basemap areas.float wf = clamp(fogFactor, 0.0, 1.0);- vec3 outRgb = waterSurface * wf + color.rgb * (1.0 - wf);+ vec3 straightRgb = mix(baseRgb, waterSurface, wf);float outAlpha = wf + color.a * (1.0 - wf);-- fragColor = vec4(outRgb, outAlpha);+ fragColor = vec4(straightRgb * outAlpha, outAlpha);}`;@@ -290,7 +286,7 @@ const surfaceFogModule = {* When `pattern` is false the effect behaves as a classic flat-colour fog layer.* When `pattern` is true a static wave pattern (layered sine trains + FBM noise,* lit with diffuse+specular sun shading) replaces the flat tint and the- * effect also renders over basemap areas via Porter-Duff compositing.+ * effect also renders over basemap areas via straight-alpha compositing.*/export class DeckSurfaceFogEffect {id = 'surface-fog-effect';@@ -339,6 +335,7 @@ export class DeckSurfaceFogEffect {if (this.isExportMode && opts) {this._unpatchViewports = patchTileViewportIds(opts);}+ resetDepthRange(this.model);}postRender(params: any): any {diff --git a/src/effects/src/tile-viewport-fix.ts b/src/effects/src/tile-viewport-fix.tsindex ce70d3b65..a1747dc87 100644--- a/src/effects/src/tile-viewport-fix.ts+++ b/src/effects/src/tile-viewport-fix.ts@@ -45,3 +45,19 @@ export function patchTileViewportIds(opts: {}};}++/**+ * Reset WebGL depthRange to [0, 1].+ *+ * Maplibre/Mapbox basemap rendering compresses the depth range (e.g. [0, 0.979])+ * and doesn't restore it. When deck.gl layers subsequently render to the offscreen+ * FBO, their depth values inherit that compressed range, causing the fog shader's+ * depth reconstruction (depth * 2 − 1) to produce incorrect z values.+ */+export function resetDepthRange(model: {device: any} | null): void {+ if (!model) return;+ const gl = (model.device as any).gl as WebGL2RenderingContext | undefined;+ if (gl) {+ gl.depthRange(0, 1);+ }+}