v3.2.0

.circleci/config.yml

@@ -68,12 +68,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - test-browser:
-          requires:
-            - prepare-linux
-          filters:
-            tags:
-              only: /.*/
       - test-webpack:
           requires:
             - build
@@ -327,27 +321,6 @@ jobs:
             yarn run codegen
             git add -A && git diff --staged --exit-code | tee check.patch
 
-  test-browser:
-    <<: *linux-defaults
-    steps:
-      - attach_workspace:
-          at: ~/
-      - browser-tools/install-browser-tools:
-          chrome-version: "114.0.5735.90"
-      - run: yarn run build-token
-      - run:
-          name: Test Chrome
-          environment:
-            SELENIUM_BROWSER: chrome
-            TAP_COLORS: 1
-          command: yarn run test-browser
-      - run:
-          name: Test Firefox
-          environment:
-            SELENIUM_BROWSER: firefox
-            TAP_COLORS: 1
-          command: yarn run test-browser
-
   test-expressions:
     <<: *linux-defaults
     steps:

.eslintrc

@@ -207,11 +207,7 @@
       }
     }
   ],
-  "globals": {
-    "performance": true
-  },
   "env": {
-    "es6": true,
-    "browser": false
+    "es6": true
   }
 }

.flowconfig

@@ -9,7 +9,6 @@
 .*/node_modules/@mapbox/geojson-types/fixtures/.*
 .*/node_modules/browserify/.*
 .*/node_modules/nyc/.*
-.*/node_modules/jsdom/.*
 .*/node_modules/eslint.*/.*
 .*/node_modules/highlight.*/.*
 .*/node_modules/@?babel.*/.*

.gitignore

@@ -31,3 +31,5 @@ yarn-error.log
 yarn-debug.log
 npm-debug.log
 .idea
+# https://github.com/vitejs/vite/issues/9470
+vitest.config.js.*

3d-style/data/bucket/model_bucket.js

@@ -4,10 +4,18 @@ import EXTENT from '../../../src/style-spec/data/extent.js';
 import {register} from '../../../src/util/web_worker_transfer.js';
 import loadGeometry from '../../../src/data/load_geometry.js';
 import toEvaluationFeature from '../../../src/data/evaluation_feature.js';
-import type {EvaluationFeature} from '../../../src/data/evaluation_feature.js';
 import EvaluationParameters from '../../../src/style/evaluation_parameters.js';
 import Point from '@mapbox/point-geometry';
 import {vec3} from 'gl-matrix';
+import {InstanceVertexArray} from '../../../src/data/array_types.js';
+import assert from 'assert';
+import {warnOnce} from '../../../src/util/util.js';
+import ModelStyleLayer from '../../style/style_layer/model_style_layer.js';
+import {rotationScaleYZFlipMatrix} from '../../util/model_util.js';
+import {tileToMeter} from '../../../src/geo/mercator_coordinate.js';
+import {instanceAttributes} from '../model_attributes.js';
+
+import type {EvaluationFeature} from '../../../src/data/evaluation_feature.js';
 import type {Mat4} from 'gl-matrix';
 import type {CanonicalTileID, OverscaledTileID} from '../../../src/source/tile_id.js';
 import type {
@@ -25,13 +33,6 @@ import type {SpritePositions} from '../../../src/util/image.js';
 import type {ProjectionSpecification} from '../../../src/style-spec/types.js';
 import type {TileTransform} from '../../../src/geo/projection/tile_transform.js';
 import type {IVectorTileLayer} from '@mapbox/vector-tile';
-import {InstanceVertexArray} from '../../../src/data/array_types.js';
-import assert from 'assert';
-import {warnOnce} from '../../../src/util/util.js';
-import ModelStyleLayer from '../../style/style_layer/model_style_layer.js';
-import {rotationScaleYZFlipMatrix} from '../../util/model_util.js';
-import {tileToMeter} from '../../../src/geo/mercator_coordinate.js';
-import {instanceAttributes} from '../model_attributes.js';
 
 class ModelFeature {
     feature: EvaluationFeature;

3d-style/data/bucket/tiled_3d_model_bucket.js

@@ -1,28 +1,29 @@
 // @flow
 
 import {register} from '../../../src/util/web_worker_transfer.js';
-import type {Bucket} from '../../../src/data/bucket.js';
-import type {Node} from '../model.js';
 import {uploadNode, destroyNodeArrays, destroyBuffers, ModelTraits, HEIGHTMAP_DIM} from '../model.js';
-import type {EvaluationFeature} from '../../../src/data/evaluation_feature.js';
 import {OverscaledTileID} from '../../../src/source/tile_id.js';
-import type {CanonicalTileID} from '../../../src/source/tile_id.js';
 import ModelStyleLayer from '../../style/style_layer/model_style_layer.js';
-import type Context from '../../../src/gl/context.js';
-import type {ProjectionSpecification} from '../../../src/style-spec/types.js';
-import type Painter from '../../../src/render/painter.js';
-import type {Vec4} from 'gl-matrix';
 import {ReplacementSource} from '../../source/replacement_source.js';
 import {FeatureVertexArray} from '../../../src/data/array_types.js';
 import {number as interpolate} from '../../../src/style-spec/util/interpolate.js';
 import {clamp} from '../../../src/util/util.js';
 import {DEMSampler} from '../../../src/terrain/elevation.js';
-import type {Terrain} from '../../../src/terrain/terrain.js';
 import {ZoomConstantExpression} from '../../../src/style-spec/expression/index.js';
 import assert from 'assert';
 import Point from '@mapbox/point-geometry';
 import browser from '../../../src/util/browser.js';
 
+import type {Bucket} from '../../../src/data/bucket.js';
+import type {Node} from '../model.js';
+import type {EvaluationFeature} from '../../../src/data/evaluation_feature.js';
+import type {CanonicalTileID} from '../../../src/source/tile_id.js';
+import type Context from '../../../src/gl/context.js';
+import type {ProjectionSpecification} from '../../../src/style-spec/types.js';
+import type Painter from '../../../src/render/painter.js';
+import type {Vec4} from 'gl-matrix';
+import type {Terrain} from '../../../src/terrain/terrain.js';
+
 const lookup = new Float32Array(512 * 512);
 const passLookup = new Uint8Array(512 * 512);
 
@@ -183,7 +184,7 @@ class Tiled3dModelBucket implements Bucket {
         const canonical = this.id.canonical;
         for (const nodeInfo of nodesInfo) {
             const evaluationFeature = nodeInfo.feature;
-            nodeInfo.evaluatedScale = (layer.paint.get('model-scale').evaluate(evaluationFeature, {}, canonical): any);
+            nodeInfo.evaluatedScale = layer.paint.get('model-scale').evaluate(evaluationFeature, {}, canonical);
         }
     }
 
@@ -224,7 +225,7 @@ class Tiled3dModelBucket implements Bucket {
             } else {
                 nodeInfo.evaluatedRMEA[0][2] = layer.paint.get('model-emissive-strength').evaluate(evaluationFeature, {}, canonical);
             }
-            nodeInfo.evaluatedScale = (layer.paint.get('model-scale').evaluate(evaluationFeature, {}, canonical): any);
+            nodeInfo.evaluatedScale = layer.paint.get('model-scale').evaluate(evaluationFeature, {}, canonical);
             if (!this.updatePbrBuffer(nodeInfo.node)) {
                 this.needsUpload = true;
             }

3d-style/data/model.js

@@ -1,27 +1,28 @@
 // @flow
 
-import type Painter from '../../src/render/painter.js';
 import LngLat from '../../src/geo/lng_lat.js';
-import Color from "../../src/style-spec/util/color.js";
+import Color from '../../src/style-spec/util/color.js';
 import Texture from '../../src/render/texture.js';
-import type IndexBuffer from '../../src/gl/index_buffer.js';
 import {ModelLayoutArray, TriangleIndexArray, NormalLayoutArray, TexcoordLayoutArray, FeatureVertexArray} from '../../src/data/array_types.js';
 import {StructArray} from '../../src/util/struct_array.js';
-import type VertexBuffer from '../../src/gl/vertex_buffer.js';
-import type {Mat4, Vec2, Vec3, Vec4, Quat} from 'gl-matrix';
-import type Context from "../../src/gl/context.js";
 import {Aabb} from '../../src/util/primitives.js';
 import {mat4, vec4} from 'gl-matrix';
 import {modelAttributes, normalAttributes, texcoordAttributes, color3fAttributes, color4fAttributes, featureAttributes} from './model_attributes.js';
-import type {TextureImage, TextureWrap, TextureFilter} from '../../src/render/texture.js';
 import SegmentVector from '../../src/data/segment.js';
 import {globeToMercatorTransition} from '../../src/geo/projection/globe_util.js';
 import {number as interpolate} from '../../src/style-spec/util/interpolate.js';
 import MercatorCoordinate, {getMetersPerPixelAtLatitude, getLatitudeScale, mercatorZfromAltitude} from '../../src/geo/mercator_coordinate.js';
 import Transform from '../../src/geo/transform.js';
 import {rotationScaleYZFlipMatrix, getBoxBottomFace, rotationFor3Points, convertModelMatrixForGlobe} from '../util/model_util.js';
+
 import type Point from '@mapbox/point-geometry';
+import type {Mat4, Vec2, Vec3, Vec4, Quat} from 'gl-matrix';
+import type Context from '../../src/gl/context.js';
+import type IndexBuffer from '../../src/gl/index_buffer.js';
+import type Painter from '../../src/render/painter.js';
 import type TriangleGridIndex from '../../src/util/triangle_grid_index.js';
+import type VertexBuffer from '../../src/gl/vertex_buffer.js';
+import type {TextureImage, TextureWrap, TextureFilter} from '../../src/render/texture.js';
 
 export type Sampler = {
     minFilter: TextureFilter;

3d-style/render/draw_model.js

@@ -1,14 +1,7 @@
 // @flow
 
-import type Painter from '../../src/render/painter.js';
-import type {CreateProgramParams} from '../../src/render/painter.js';
-import type SourceCache from '../../src/source/source_cache.js';
-import type ModelStyleLayer from '../style/style_layer/model_style_layer.js';
-
 import {modelUniformValues, modelDepthUniformValues} from './program/model_program.js';
-import type {Mesh, Node, ModelTexture} from '../data/model.js';
 import {ModelTraits, DefaultModelScale} from '../data/model.js';
-import type {DynamicDefinesType} from '../../src/render/program/program_uniforms.js';
 
 import Transform from '../../src/geo/transform.js';
 import EXTENT from '../../src/style-spec/data/extent.js';
@@ -17,13 +10,11 @@ import ColorMode from '../../src/gl/color_mode.js';
 import DepthMode from '../../src/gl/depth_mode.js';
 import CullFaceMode from '../../src/gl/cull_face_mode.js';
 import {mat4, vec3} from 'gl-matrix';
-import type {Mat4} from 'gl-matrix';
 import {getMetersPerPixelAtLatitude, mercatorZfromAltitude} from '../../src/geo/mercator_coordinate.js';
 import TextureSlots from './texture_slots.js';
 import {convertModelMatrixForGlobe} from '../util/model_util.js';
 import {clamp, warnOnce} from '../../src/util/util.js';
 import ModelBucket from '../data/bucket/model_bucket.js';
-import type VertexBuffer from '../../src/gl/vertex_buffer.js';
 import Tiled3dModelBucket from '../data/bucket/tiled_3d_model_bucket.js';
 import assert from 'assert';
 import {DEMSampler} from '../../src/terrain/elevation.js';
@@ -33,6 +24,15 @@ import {getCutoffParams} from '../../src/render/cutoff.js';
 import {FOG_OPACITY_THRESHOLD} from '../../src/style/fog_helpers.js';
 import {ZoomDependentExpression} from '../../src/style-spec/expression/index.js';
 
+import type Painter from '../../src/render/painter.js';
+import type {CreateProgramParams} from '../../src/render/painter.js';
+import type SourceCache from '../../src/source/source_cache.js';
+import type ModelStyleLayer from '../style/style_layer/model_style_layer.js';
+import type {Mesh, Node, ModelTexture} from '../data/model.js';
+import type {DynamicDefinesType} from '../../src/render/program/program_uniforms.js';
+import type {Mat4} from 'gl-matrix';
+import type VertexBuffer from '../../src/gl/vertex_buffer.js';
+
 export default drawModels;
 
 type ModelParameters = {

3d-style/render/lights.js

@@ -1,12 +1,12 @@
 // @flow
 
 import Context from '../../src/gl/context.js';
-import type {UniformValues} from '../../src/render/uniform_binding.js';
 import {Uniform3f} from '../../src/render/uniform_binding.js';
 import {sRGBToLinearAndScale, linearVec3TosRGB, clamp} from '../../src/util/util.js';
 import {vec3} from 'gl-matrix';
 
 import Lights from '../style/lights.js';
+import type {UniformValues} from '../../src/render/uniform_binding.js';
 import type {LightProps as Ambient} from '../style/ambient_light_properties.js';
 import type {LightProps as Directional} from '../style/directional_light_properties.js';
 import type {Vec3} from 'gl-matrix';

3d-style/render/program/model_program.js

@@ -9,13 +9,14 @@ import {
     UniformMatrix4f
 } from '../../../src/render/uniform_binding.js';
 
+import Color from '../../../src/style-spec/util/color.js';
+import ModelStyleLayer from '../../style/style_layer/model_style_layer.js';
+import TextureSlots from '../texture_slots.js';
+
 import type {UniformValues} from '../../../src/render/uniform_binding.js';
 import type Context from '../../../src/gl/context.js';
 import type Painter from '../../../src/render/painter.js';
 import type {Material} from '../../data/model.js';
-import Color from '../../../src/style-spec/util/color.js';
-import ModelStyleLayer from '../../style/style_layer/model_style_layer.js';
-import TextureSlots from '../texture_slots.js';
 
 export type ModelUniformsType = {
     'u_matrix': UniformMatrix4f,

3d-style/render/shadow_renderer.js

@@ -14,25 +14,26 @@ import {FreeCamera} from '../../src/ui/free_camera.js';
 import {OverscaledTileID, UnwrappedTileID} from '../../src/source/tile_id.js';
 import Painter from '../../src/render/painter.js';
 import Program from '../../src/render/program.js';
-import type {UniformValues} from '../../src/render/uniform_binding.js';
 import {mercatorZfromAltitude, tileToMeter} from '../../src/geo/mercator_coordinate.js';
 import {cartesianPositionToSpherical, sphericalPositionToCartesian, clamp, linearVec3TosRGB} from '../../src/util/util.js';
 
-import type {LightProps as Directional} from '../style/directional_light_properties.js';
-import type {LightProps as Ambient} from '../style/ambient_light_properties.js';
 import Lights from '../style/lights.js';
 import {defaultShadowUniformValues} from '../render/shadow_uniforms.js';
-import type {ShadowUniformsType} from '../render/shadow_uniforms.js';
 import TextureSlots from './texture_slots.js';
 
 import assert from 'assert';
 
 import {mat4, vec3} from 'gl-matrix';
-import type {Mat4, Vec3, Vec4} from 'gl-matrix';
 import {groundShadowUniformValues} from './program/ground_shadow_program.js';
 import EXTENT from '../../src/style-spec/data/extent.js';
 import {getCutoffParams} from '../../src/render/cutoff.js';
 
+import type {UniformValues} from '../../src/render/uniform_binding.js';
+import type {LightProps as Directional} from '../style/directional_light_properties.js';
+import type {LightProps as Ambient} from '../style/ambient_light_properties.js';
+import type {ShadowUniformsType} from '../render/shadow_uniforms.js';
+import type {Mat4, Vec3, Vec4} from 'gl-matrix';
+
 type ShadowCascade = {
     framebuffer: Framebuffer,
     texture: Texture,

3d-style/shaders/model.fragment.glsl

@@ -24,6 +24,11 @@ in vec4 v_pos_light_view_1;
 in float v_depth_shadows;
 #endif
 
+#ifdef OCCLUSION_TEXTURE_TRANSFORM
+// offset[0], offset[1], scale[0], scale[1]
+uniform vec4 u_occlusionTextureTransform;
+#endif
+
 #pragma mapbox: define-attribute highp vec3 normal_3f
 #pragma mapbox: define-attribute highp vec3 color_3f
 #pragma mapbox: define-attribute highp vec4 color_4f
@@ -445,7 +450,13 @@ vec4 finalColor;
     // Ambient Occlusion
     float ao = 1.0;
 #if defined (HAS_TEXTURE_u_occlusionTexture) && defined(HAS_ATTRIBUTE_a_uv_2f)
-    ao = (texture(u_occlusionTexture, uv_2f).x - 1.0) * u_aoIntensity + 1.0;
+
+#ifdef OCCLUSION_TEXTURE_TRANSFORM
+    vec2 uv = uv_2f.xy * u_occlusionTextureTransform.zw + u_occlusionTextureTransform.xy;
+#else
+    vec2 uv = uv_2f;
+#endif
+    ao = (texture(u_occlusionTexture, uv).x - 1.0) * u_aoIntensity + 1.0;
     color *= ao;
 #endif
     // Emission

3d-style/source/model_loader.js

@@ -1,10 +1,8 @@
 // @flow
 
 import {type Footprint, type Mesh, type Node, type Material, type ModelTexture, type Sampler, type AreaLight, HEIGHTMAP_DIM} from '../data/model.js';
-import type {TextureImage} from '../../src/render/texture.js';
 import {Aabb} from '../../src/util/primitives.js';
 import Color from '../../src/style-spec/util/color.js';
-import type {Vec2, Vec3} from 'gl-matrix';
 import {mat4, vec3} from 'gl-matrix';
 import {TriangleIndexArray,
     ModelLayoutArray,
@@ -18,14 +16,16 @@ import {GLTF_TO_ARRAY_TYPE, GLTF_COMPONENTS, GLTF_USHORT, GLTF_FLOAT} from '../u
 import Point from '@mapbox/point-geometry';
 import earcut from 'earcut';
 
-import window from '../../src/util/window.js';
 import {warnOnce, base64DecToArr} from '../../src/util/util.js';
 import assert from 'assert';
 import TriangleGridIndex from '../../src/util/triangle_grid_index.js';
 
+import type {Vec2, Vec3} from 'gl-matrix';
+import type {TextureImage} from '../../src/render/texture.js';
+
 function convertTextures(gltf: Object, images: Array<TextureImage>): Array<ModelTexture> {
     const textures: ModelTexture[] = [];
-    const gl = window.WebGL2RenderingContext;
+    const gl = WebGL2RenderingContext;
     if (gltf.json.textures) {
         for (const textureDesc of gltf.json.textures) {
             const sampler: Sampler = {

3d-style/source/model_source.js

@@ -1,17 +1,18 @@
 // @flow
 
 import {Evented, ErrorEvent, Event} from '../../src/util/evented.js';
+import {ResourceType} from '../../src/util/ajax.js';
+
+import Model from '../data/model.js';
+import convertModel from './model_loader.js';
+import {loadGLTF} from '../util/loaders.js';
+
 import type {Source} from '../../src/source/source.js';
 import type Tile from '../../src/source/tile.js';
 import type {Callback} from '../../src/types/callback.js';
 import type Dispatcher from '../../src/util/dispatcher.js';
-import {ResourceType} from '../../src/util/ajax.js';
 import type Map from '../../src/ui/map.js';
-
 import type {ModelSourceSpecification} from '../../src/style-spec/types.js';
-import Model from '../data/model.js';
-import convertModel from './model_loader.js';
-import {loadGLTF} from '../util/loaders.js';
 
 /**
  * A source containing single models.