Removed lightmap rendering from BaseColor texture

GitOrigin-RevId: 10b6f646384cc554d639b661375f94b0d044173b

Author: woodroof

3d-style/render/draw_model.ts

@@ -81,10 +81,6 @@ const zeroCameraPos: [number, number, number] = [0, 0, 0];
 // on top of the per-tile cascade*tile cache. Lazily grown to the active cascade count.
 const shadowLightMatrices: Float64Array[] = [];
 
-// Below this lightmap intensity the contribution is negligible, so we skip the
-// USE_LIGHTMAP shader path entirely instead of branching on the uniform at runtime.
-const LIGHTMAP_INTENSITY_THRESHOLD = 0.001;
-
 type ModelParameters = {
     zScaleMatrix: mat4;
     negCameraPosMatrix: mat4;
@@ -1461,10 +1457,6 @@ function drawBatchedModels(painter: Painter, source: SourceCache, layer: ModelSt
                             programOptions.defines.push('DIFFUSE_SHADED');
                         }
 
-                        if (layer.paint.get('model-lightmap-intensity') > LIGHTMAP_INTENSITY_THRESHOLD) {
-                            programOptions.defines.push('USE_LIGHTMAP');
-                        }
-
                         if (singleCascade) {
                             programOptions.defines.push('SHADOWS_SINGLE_CASCADE');
                         }
@@ -1548,10 +1540,8 @@ function drawBatchedModels(painter: Painter, source: SourceCache, layer: ModelSt
                                 program.fixedDefines.includes('LIGHTING_3D_MODE')
                         );
 
-                        // z-prepass is needed for landmark cutoff. Skipped for translucent parts —
-                        // otherwise depth-write here breaks USE_LIGHTMAP in the color pass.
-                        // Should check per-mesh, not per-node, to keep the prepass for opaque meshes of mixed nodes.
-                        if (!isLight && sortedNode.opacity < 1.0 && !nodeInfo.hasTranslucentParts) {
+                        if (!isLight && (nodeInfo.hasTranslucentParts || sortedNode.opacity < 1.0)) {
+
                             program.draw(painter, context.gl.TRIANGLES, depthModeRW, StencilMode.disabled, ColorMode.disabled, CullFaceMode.backCCW,
                                 uniformValues, layer.id, mesh.vertexBuffer, mesh.indexBuffer, mesh.segments, layer.paint, painter.transform.zoom,
                                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument

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

@@ -39,14 +39,13 @@ export type ModelUniformsType = {
     ['u_emissionTexture']: Uniform1i;
     ['u_lutTexture']: Uniform1i;
     ['u_color_mix']: Uniform4f;
-    ['u_lightmapIntensity']: Uniform1f;
     ['u_aoIntensity']: Uniform1f;
     ['u_emissive_strength']: Uniform1f;
     ['u_occlusionTextureTransform']: Uniform4f;
     ['u_dithered_discard_threshold']: Uniform1f;
 };
 
-export type ModelDefinesType = 'DIFFUSE_SHADED' | 'SHADOWS_SINGLE_CASCADE' | 'OCCLUSION_TEXTURE_TRANSFORM' | 'DITHERED_DISCARD' | 'USE_LIGHTMAP';
+export type ModelDefinesType = 'DIFFUSE_SHADED' | 'SHADOWS_SINGLE_CASCADE' | 'OCCLUSION_TEXTURE_TRANSFORM' | 'DITHERED_DISCARD';
 
 const modelUniforms = (context: Context): ModelUniformsType => ({
     'u_matrix': new UniformMatrix4f(context),
@@ -72,7 +71,6 @@ const modelUniforms = (context: Context): ModelUniformsType => ({
     'u_emissionTexture': new Uniform1i(context),
     'u_lutTexture': new Uniform1i(context),
     'u_color_mix': new Uniform4f(context),
-    'u_lightmapIntensity': new Uniform1f(context),
     'u_aoIntensity': new Uniform1f(context),
     'u_emissive_strength': new Uniform1f(context),
     'u_occlusionTextureTransform': new Uniform4f(context),
@@ -127,7 +125,6 @@ const modelUniformValues = (
     const alphaMask = material.alphaMode === 'MASK';
 
     const aoIntensity = layer.paint.get('model-ambient-occlusion-intensity');
-    const lightmapIntensity = layer.paint.get('model-lightmap-intensity');
 
     const colorMix = layer.paint.get('model-color').constantOr(Color.white).toNonPremultipliedRenderColor(null);
     colorMix.a = layer.paint.get('model-color-mix-intensity').constantOr(0.0);
@@ -172,7 +169,6 @@ const modelUniformValues = (
         'u_emissionTexture': TextureSlots.Emission,
         'u_lutTexture': TextureSlots.LUT,
         'u_color_mix': colorMix.toArray01(),
-        'u_lightmapIntensity': lightmapIntensity,
         'u_aoIntensity': aoIntensity,
         'u_emissive_strength': emissiveStrength,
         'u_occlusionTextureTransform': occlusionTextureTransform ? occlusionTextureTransform : [0, 0, 0, 0] as [number, number, number, number],

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

@@ -19,7 +19,6 @@ uniform vec4 u_emissiveFactor;
 uniform float u_metallicFactor;
 uniform float u_roughnessFactor;
 uniform float u_emissive_strength;
-uniform float u_lightmapIntensity;
 
 
 in highp vec4 v_position_height;
@@ -36,10 +35,6 @@ in float v_depth_shadows;
 uniform vec4 u_occlusionTextureTransform;
 #endif
 
-#ifdef USE_LIGHTMAP
-vec3 lightmapSample;
-#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
@@ -133,20 +128,6 @@ vec3 sRGBToLinear(vec3 srgbIn) {
     return pow(srgbIn, vec3(2.2));
 }
 
-// Luminance-preserving color blend
-vec3 mixColorFast(vec3 base, vec3 target, float factor) {
-    float baseL = dot(base, vec3(0.2126, 0.7152, 0.0722));
-    float targetL = dot(target, vec3(0.2126, 0.7152, 0.0722));
-
-    if (targetL < 1e-4) {
-        return base;
-    }
-
-    vec3 result = target * (baseL / targetL);
-
-    return mix(base, result, clamp(factor, 0.0, 1.0));
-}
-
 float calculate_NdotL(vec3 normal, vec3 lightDir) {
     // Use slightly modified dot product for lambertian diffuse shading. This increase the range of NdotL to cover surfaces facing up to 45 degrees away from the light source.
     // This allows us to trade some realism for performance/usability as a single light source is enough to shade the scene.
@@ -195,9 +176,6 @@ vec4 getBaseColor() {
     // texture Color
 #if defined (HAS_TEXTURE_u_baseColorTexture) && defined (HAS_ATTRIBUTE_a_uv_2f)
     vec4 texColor = texture(u_baseColorTexture, uv_2f);
-    #if defined(USE_LIGHTMAP) && !defined(OCCLUSION_TEXTURE_TRANSFORM)
-        lightmapSample = texColor.rgb;
-    #endif
     if(u_alphaMask) {
         if (texColor.w < u_alphaCutoff) {
             discard;
@@ -535,26 +513,6 @@ vec4 finalColor;
     ao = (texture(u_occlusionTexture, uv).x - 1.0) * u_aoIntensity + 1.0;
     color *= ao;
 #endif
-
-#if defined(USE_LIGHTMAP) && defined(HAS_TEXTURE_u_baseColorTexture) && defined(HAS_ATTRIBUTE_a_uv_2f)
-    #ifdef OCCLUSION_TEXTURE_TRANSFORM
-        vec2 lightmapUv = uv_2f.xy * u_occlusionTextureTransform.zw + u_occlusionTextureTransform.xy;
-        lightmapSample = texture(u_baseColorTexture, lightmapUv).rgb;
-    #endif
-
-    float lightmapBrightness = max(lightmapSample.r, max(lightmapSample.g, lightmapSample.b));
-    float lightmapEnergy = lightmapBrightness * u_lightmapIntensity;
-    float lightmapMixFactor = 0.6 * min(1.0, lightmapBrightness);
-
-    color *= max(1.0, lightmapEnergy);
-    color = mixColorFast(color, lightmapSample, lightmapMixFactor);
-
-    if (mat.baseColor.a < 0.99) {
-        float maxFactor = max(1.0, u_lightmapIntensity);
-        mat.baseColor.a = clamp(lightmapEnergy / maxFactor, 0.0, 1.0);
-    }
-#endif
-
     // Emission
     vec4 emissive = u_emissiveFactor;
 

3d-style/style/style_layer/model_style_layer_properties.ts

@@ -35,7 +35,6 @@ export type PaintProps = {
     "model-translation": DataDrivenProperty<[number, number, number]>;
     "model-color": DataDrivenProperty<Color>;
     "model-color-mix-intensity": DataDrivenProperty<number>;
-    "model-lightmap-intensity": DataConstantProperty<number>;
     "model-type": DataConstantProperty<"common-3d" | "location-indicator">;
     "model-cast-shadows": DataConstantProperty<boolean>;
     "model-receive-shadows": DataConstantProperty<boolean>;
@@ -58,7 +57,6 @@ export const getPaintProperties = (): Properties<PaintProps> => paint || (paint
     "model-translation": new DataDrivenProperty(styleSpec["paint_model"]["model-translation"]),
     "model-color": new DataDrivenProperty(styleSpec["paint_model"]["model-color"]),
     "model-color-mix-intensity": new DataDrivenProperty(styleSpec["paint_model"]["model-color-mix-intensity"]),
-    "model-lightmap-intensity": new DataConstantProperty(styleSpec["paint_model"]["model-lightmap-intensity"]),
     "model-type": new DataConstantProperty(styleSpec["paint_model"]["model-type"]),
     "model-cast-shadows": new DataConstantProperty(styleSpec["paint_model"]["model-cast-shadows"]),
     "model-receive-shadows": new DataConstantProperty(styleSpec["paint_model"]["model-receive-shadows"]),

src/style-spec/reference/v8.json

@@ -11416,27 +11416,6 @@
       },
       "transition": true
     },
-    "model-lightmap-intensity": {
-      "type": "number",
-      "default": 0.0,
-      "minimum": 0,
-      "doc": "Controls the intensity of the model lightmap contribution. Values less than or equal to 0.001 are treated as off.",
-      "private": true,
-      "experimental": true,
-      "expression": {
-        "interpolated": true,
-        "parameters": ["zoom"]
-      },
-      "sdk-support": {
-          "basic functionality": {
-          "js": "3.25.0",
-          "android": "11.25.0",
-          "ios": "11.25.0"
-        }
-      },
-      "property-type": "data-constant",
-      "transition": true
-    },
     "model-type": {
       "type": "enum",
       "values": {

src/style-spec/types.ts

@@ -1405,11 +1405,6 @@ export type ModelLayerSpecification = {
         "model-color-use-theme"?: PropertyValueSpecification<string>,
         "model-color-mix-intensity"?: DataDrivenPropertyValueSpecification<number>,
         "model-color-mix-intensity-transition"?: TransitionSpecification,
-        /**
-         * @experimental This property is experimental and subject to change in future versions.
-         */
-        "model-lightmap-intensity"?: PropertyValueSpecification<number>,
-        "model-lightmap-intensity-transition"?: TransitionSpecification,
         "model-type"?: "common-3d" | "location-indicator",
         "model-cast-shadows"?: boolean,
         "model-receive-shadows"?: boolean,