[DRIVE3D-3311] Lift route cutout 0.5 m on ground and elevated

GitOrigin-RevId: 17b5aa892e71889c5503d65bb6f41be488d1e158

Author: astojilj

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

@@ -263,7 +263,7 @@ void main() {
 #endif
 
 #ifdef FEATURE_CUTOUT
-    color = apply_feature_cutout(color, gl_FragCoord, get_cutout_factors(gl_FragCoord).x);
+    color = apply_feature_cutout(color, gl_FragCoord, get_cutout_factors(gl_FragCoord).x, 0.0);
 #endif
 
     glFragColor = color;

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

@@ -10,7 +10,7 @@ void main() {
         discard;
 #else
 #ifdef FEATURE_CUTOUT
-    apply_feature_cutout(vec4(0.0, 0.0, 0.0, 1.0), gl_FragCoord, get_cutout_factors(gl_FragCoord).x);
+    apply_feature_cutout(vec4(0.0, 0.0, 0.0, 1.0), gl_FragCoord, get_cutout_factors(gl_FragCoord).x, 0.0);
 #endif
 #endif
     glFragColor = vec4(1.0, 0.0, 0.0, 1.0);

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

@@ -78,7 +78,7 @@ void main() {
 #endif
 
 #ifdef FEATURE_CUTOUT
-    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x);
+    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x, v_height);
 #endif
 
     // Premultiplied alpha output for (One, OneMinusSrcAlpha) translucent blend.

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

@@ -596,7 +596,7 @@ vec4 finalColor;
     apply_feature_cutout_dither(gl_FragCoord, v_cutout_factor);
 #else
 #ifdef FEATURE_CUTOUT
-    finalColor = apply_feature_cutout(finalColor, gl_FragCoord, get_cutout_factors(gl_FragCoord).x);
+    finalColor = apply_feature_cutout(finalColor, gl_FragCoord, get_cutout_factors(gl_FragCoord).x, 0.0);
 #endif
 #endif
 

src/shaders/fill.fragment.glsl

@@ -60,7 +60,11 @@ void main() {
 #endif
 
 #ifdef FEATURE_CUTOUT
-    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x);
+    float z = 0.0;
+#ifdef ELEVATED_ROADS
+    z = v_road_z_offset;
+#endif
+    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x, z);
 #endif
 
     glFragColor = out_color;

src/shaders/fill_extrusion.fragment.glsl

@@ -168,7 +168,7 @@ float flood_radiance = 0.0;
 #endif
 
 #ifdef FEATURE_CUTOUT
-    color = apply_feature_cutout(color, gl_FragCoord, get_cutout_factors(gl_FragCoord).x);
+    color = apply_feature_cutout(color, gl_FragCoord, get_cutout_factors(gl_FragCoord).x, 0.0);
 #endif
 
     glFragColor = color;

src/shaders/fill_outline.fragment.glsl

@@ -8,6 +8,10 @@ in highp vec2 v_pos;
 uniform float u_emissive_strength;
 uniform lowp float u_opacity_multiplier;
 
+#ifdef ELEVATED_ROADS
+in highp float v_road_z_offset;
+#endif
+
 #ifdef RENDER_SHADOWS
 uniform vec3 u_ground_shadow_factor;
 
@@ -46,7 +50,11 @@ void main() {
 #endif
 
 #ifdef FEATURE_CUTOUT
-    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x);
+    float z = 0.0;
+#ifdef ELEVATED_ROADS
+    z = v_road_z_offset;
+#endif
+    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x, z);
 #endif
 
     glFragColor = out_color * (alpha * opacity * u_opacity_multiplier);

src/shaders/fill_outline.vertex.glsl

@@ -4,6 +4,7 @@
 in ivec2 a_pos;
 #ifdef ELEVATED_ROADS
 in float a_road_z_offset;
+out highp float v_road_z_offset;
 #endif
 
 #ifdef RENDER_SHADOWS
@@ -32,6 +33,7 @@ void main() {
 
 #ifdef ELEVATED_ROADS
     z_offset += a_road_z_offset;
+    v_road_z_offset = z_offset;
 #endif
     float hidden = float(opacity == 0.0);
     gl_Position = mix(u_matrix * vec4(a_pos, z_offset, 1), AWAY, hidden);

src/shaders/fill_outline_pattern.fragment.glsl

@@ -25,6 +25,10 @@ in highp vec4 v_pos_light_view_1;
 in highp float v_depth;
 #endif
 
+#ifdef ELEVATED_ROADS
+in highp float v_road_z_offset;
+#endif
+
 in highp vec2 v_pos;
 in highp vec2 v_pos_world;
 
@@ -82,7 +86,11 @@ void main() {
 #endif // LIGHTING_3D_MODE
 
 #ifdef FEATURE_CUTOUT
-    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x);
+    float z = 0.0;
+#ifdef ELEVATED_ROADS
+    z = v_road_z_offset;
+#endif
+    out_color = apply_feature_cutout(out_color, gl_FragCoord, cutout_factors.x, z);
 #endif
 
 #ifdef FOG

src/shaders/fill_outline_pattern.vertex.glsl

@@ -11,6 +11,7 @@ uniform float u_tile_units_to_pixels;
 in ivec2 a_pos;
 #ifdef ELEVATED_ROADS
 in float a_road_z_offset;
+out highp float v_road_z_offset;
 #endif
 
 #ifdef RENDER_SHADOWS
@@ -47,6 +48,7 @@ void main() {
 
 #ifdef ELEVATED_ROADS
     z_offset += a_road_z_offset;
+    v_road_z_offset = z_offset;
 #endif
     float hidden = float(opacity == 0.0);
     vec2 pos = vec2(a_pos);