Fix errors

mapbox · Sep 24, 2018 · 1cb0392 · 1cb0392
1 parent 096d885
commit 1cb0392
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/render/draw_fill_extrusion.js b/src/render/draw_fill_extrusion.js
@@ -70,9 +70,10 @@ function drawExtrusionTiles(painter, source, layer, coords, depthMode, stencilMo
             layer.paint.get('fill-extrusion-translate'),
             layer.paint.get('fill-extrusion-translate-anchor'));
 
+        const verticalGradientBoolean = +layer.paint.get('fill-extrusion-vertical-gradient');
         const uniformValues = image ?
-            fillExtrusionPatternUniformValues(matrix, painter, coord, crossfade, tile) :
-            fillExtrusionUniformValues(matrix, painter, +layer.paint.get('fill-extrusion-vertical-gradient'));
+            fillExtrusionPatternUniformValues(matrix, painter, verticalGradientBoolean, coord, crossfade, tile) :
+            fillExtrusionUniformValues(matrix, painter, verticalGradientBoolean);
 
 
         program.draw(context, context.gl.TRIANGLES, depthMode, stencilMode, colorMode, CullFaceMode.backCCW,

diff --git a/src/render/program/fill_extrusion_program.js b/src/render/program/fill_extrusion_program.js
@@ -85,7 +85,7 @@ const extrusionTextureUniforms = (context: Context, locations: UniformLocations)
 const fillExtrusionUniformValues = (
     matrix: Float32Array,
     painter: Painter,
-    verticalGradient: boolean,
+    verticalGradient: number,
 ): UniformValues<FillExtrusionUniformsType> => {
     const light = painter.style.light;
     const _lp = light.properties.get('position');
@@ -110,11 +110,12 @@ const fillExtrusionUniformValues = (
 const fillExtrusionPatternUniformValues = (
     matrix: Float32Array,
     painter: Painter,
+    verticalGradient: number,
     coord: OverscaledTileID,
     crossfade: CrossfadeParameters,
     tile: Tile
 ): UniformValues<FillExtrusionPatternUniformsType> => {
-    return extend(fillExtrusionUniformValues(matrix, painter),
+    return extend(fillExtrusionUniformValues(matrix, painter, verticalGradient),
         patternUniformValues(crossfade, painter, tile),
         {
             'u_height_factor': -Math.pow(2, coord.overscaledZ) / tile.tileSize / 8