[formatting]

mapbox · Jan 19, 2018 · d79288f · d79288f
1 parent 6fbed2f
commit d79288f
Show file tree

Hide file tree

Showing 26 changed files with 152 additions and 278 deletions.
diff --git a/src/render/draw_background.js b/src/render/draw_background.js
@@ -2,7 +2,10 @@
 
 const StencilMode = require('../gl/stencil_mode');
 const DepthMode = require('../gl/depth_mode');
-const {backgroundUniformValues, backgroundPatternUniformValues} = require('./program/background_program');
+const {
+    backgroundUniformValues,
+    backgroundPatternUniformValues
+} = require('./program/background_program');
 
 import type Painter from './painter';
 import type SourceCache from '../source/source_cache';
@@ -41,16 +44,8 @@ function drawBackground(painter: Painter, sourceCache: SourceCache, layer: Backg
             backgroundPatternUniformValues(matrix, opacity, painter, image, {tileID, tileSize}) :
             backgroundUniformValues(matrix, opacity, color);
 
-        program.draw(
-            context,
-            gl.TRIANGLES,
-            depthMode,
-            stencilMode,
-            colorMode,
-            uniformValues,
-            layer.id,
-            painter.tileExtentBuffer,
-            painter.quadTriangleIndexBuffer,
-            painter.tileExtentSegments);
+        program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+            uniformValues, layer.id, painter.tileExtentBuffer,
+            painter.quadTriangleIndexBuffer, painter.tileExtentSegments);
     }
 }
diff --git a/src/render/draw_circle.js b/src/render/draw_circle.js
@@ -42,19 +42,9 @@ function drawCircles(painter: Painter, sourceCache: SourceCache, layer: CircleSt
         const programConfiguration = bucket.programConfigurations.get(layer.id);
         const program = painter.useProgram('circle', programConfiguration);
 
-        program.draw(
-            context,
-            gl.TRIANGLES,
-            depthMode,
-            stencilMode,
-            colorMode,
-            circleUniformValues(painter, coord, tile, layer),
-            layer.id,
-            bucket.layoutVertexBuffer,
-            bucket.indexBuffer,
-            bucket.segments,
-            layer.paint,
-            painter.transform.zoom,
-            programConfiguration);
+        program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+            circleUniformValues(painter, coord, tile, layer), layer.id,
+            bucket.layoutVertexBuffer, bucket.indexBuffer, bucket.segments,
+            layer.paint, painter.transform.zoom, programConfiguration);
     }
 }
diff --git a/src/render/draw_collision_debug.js b/src/render/draw_collision_debug.js
@@ -28,24 +28,15 @@ function drawCollisionDebugGeometry(painter: Painter, sourceCache: SourceCache,
             context.lineWidth.set(1);
         }
 
-        program.draw(
-            context,
-            drawCircles ? gl.TRIANGLES : gl.LINES,
-            DepthMode.disabled,
-            StencilMode.disabled,
+        program.draw(context, drawCircles ? gl.TRIANGLES : gl.LINES,
+            DepthMode.disabled, StencilMode.disabled,
             painter.colorModeForRenderPass(),
             collisionUniformValues(
                 coord.posMatrix,
                 painter.transform,
                 tile),
-            layer.id,
-            buffers.layoutVertexBuffer,
-            buffers.indexBuffer,
-            buffers.segments,
-            null,
-            painter.transform.zoom,
-            null,
-            null,
+            layer.id, buffers.layoutVertexBuffer, buffers.indexBuffer,
+            buffers.segments, null, painter.transform.zoom, null, null,
             buffers.collisionVertexBuffer);
     }
 }

diff --git a/src/render/draw_debug.js b/src/render/draw_debug.js
@@ -63,7 +63,9 @@ function drawDebugTile(painter, sourceCache, coord) {
 
         program.draw(context, gl.LINES, depthMode, stencilMode, colorMode,
             debugUniformValues(
-                mat4.translate([], posMatrix, [onePixel * translation[0], onePixel * translation[1], 0]),
+                mat4.translate([], posMatrix, [
+                    onePixel * translation[0],
+                    onePixel * translation[1], 0]),
                 Color.white),
             id, debugTextBuffer, debugTextIndexBuffer, debugTextSegment);
     }

diff --git a/src/render/draw_fill.js b/src/render/draw_fill.js
@@ -99,19 +99,9 @@ function drawFillTiles(painter, sourceCache, layer, coords, depthMode, colorMode
                 fillOutlineUniformValues(tileMatrix, drawingBufferSize);
         }
 
-        program.draw(
-            painter.context,
-            drawMode,
-            depthMode,
-            painter.stencilModeForClipping(coord),
-            colorMode,
-            uniformValues,
-            layer.id,
-            bucket.layoutVertexBuffer,
-            indexBuffer,
-            segments,
-            layer.paint,
-            painter.transform.zoom,
-            programConfiguration);
+        program.draw(painter.context, drawMode, depthMode,
+            painter.stencilModeForClipping(coord), colorMode, uniformValues,
+            layer.id, bucket.layoutVertexBuffer, indexBuffer, segments,
+            layer.paint, painter.transform.zoom, programConfiguration);
     }
 }
diff --git a/src/render/draw_fill_extrusion.js b/src/render/draw_fill_extrusion.js
@@ -81,19 +81,12 @@ function drawExtrusionTexture(painter, layer) {
     context.activeTexture.set(gl.TEXTURE0);
     gl.bindTexture(gl.TEXTURE_2D, renderedTexture.colorAttachment.get());
 
-    painter.useProgram('extrusionTexture').draw(
-        context,
-        gl.TRIANGLES,
-        DepthMode.disabled,
-        StencilMode.disabled,
+    painter.useProgram('extrusionTexture').draw(context, gl.TRIANGLES,
+        DepthMode.disabled, StencilMode.disabled,
         painter.colorModeForRenderPass(),
         extrusionTextureUniformValues(painter, layer, 0),
-        layer.id,
-        painter.viewportBuffer,
-        painter.quadTriangleIndexBuffer,
-        painter.viewportSegments,
-        layer.paint,
-        painter.transform.zoom);
+        layer.id, painter.viewportBuffer, painter.quadTriangleIndexBuffer,
+        painter.viewportSegments, layer.paint, painter.transform.zoom);
 }
 
 function drawExtrusion(painter, source, layer, tile, coord, bucket, depthMode, stencilMode, colorMode) {
@@ -117,18 +110,8 @@ function drawExtrusion(painter, source, layer, tile, coord, bucket, depthMode, s
         fillExtrusionPatternUniformValues(matrix, painter, coord, image, tile) :
         fillExtrusionUniformValues(matrix, painter);
 
-    program.draw(
-            context,
-            gl.TRIANGLES,
-            depthMode,
-            stencilMode,
-            colorMode,
-            uniformValues,
-            layer.id,
-            bucket.layoutVertexBuffer,
-            bucket.indexBuffer,
-            bucket.segments,
-            layer.paint,
-            painter.transform.zoom,
-            programConfiguration);
+    program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+        uniformValues, layer.id, bucket.layoutVertexBuffer, bucket.indexBuffer,
+        bucket.segments, layer.paint, painter.transform.zoom,
+        programConfiguration);
 }
diff --git a/src/render/draw_heatmap.js b/src/render/draw_heatmap.js
@@ -51,20 +51,11 @@ function drawHeatmap(painter: Painter, sourceCache: SourceCache, layer: HeatmapS
             const program = painter.useProgram('heatmap', programConfiguration);
             const {zoom} = painter.transform;
 
-            program.draw(
-                context,
-                gl.TRIANGLES,
-                depthMode,
-                stencilMode,
-                colorMode,
+            program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
                 heatmapUniformValues(coord.posMatrix,
                     tile, zoom, layer.paint.get('heatmap-intensity')),
-                layer.id,
-                bucket.layoutVertexBuffer,
-                bucket.indexBuffer,
-                bucket.segments,
-                layer.paint,
-                painter.transform.zoom,
+                layer.id, bucket.layoutVertexBuffer, bucket.indexBuffer,
+                bucket.segments, layer.paint, painter.transform.zoom,
                 programConfiguration);
         }
 
@@ -138,17 +129,9 @@ function renderTextureToMap(painter, layer) {
     }
     colorRampTexture.bind(gl.LINEAR, gl.CLAMP_TO_EDGE);
 
-    painter.useProgram('heatmapTexture').draw(
-        context,
-        gl.TRIANGLES,
-        DepthMode.disabled,
-        StencilMode.disabled,
-        painter.colorModeForRenderPass(),
+    painter.useProgram('heatmapTexture').draw(context, gl.TRIANGLES,
+        DepthMode.disabled, StencilMode.disabled, painter.colorModeForRenderPass(),
         heatmapTextureUniformValues(painter, layer, 0, 1),
-        layer.id,
-        painter.viewportBuffer,
-        painter.quadTriangleIndexBuffer,
-        painter.viewportSegments,
-        layer.paint,
-        painter.transform.zoom);
+        layer.id, painter.viewportBuffer, painter.quadTriangleIndexBuffer,
+        painter.viewportSegments, layer.paint, painter.transform.zoom);
 }
diff --git a/src/render/draw_hillshade.js b/src/render/draw_hillshade.js
@@ -47,29 +47,13 @@ function renderHillshade(painter, tile, layer, depthMode, stencilMode, colorMode
     const uniformValues = hillshadeUniformValues(painter, tile, layer);
 
     if (tile.maskedBoundsBuffer && tile.maskedIndexBuffer && tile.segments) {
-        program.draw(
-            context,
-            gl.TRIANGLES,
-            depthMode,
-            stencilMode,
-            colorMode,
-            uniformValues,
-            layer.id,
-            tile.maskedBoundsBuffer,
-            tile.maskedIndexBuffer,
-            tile.segments);
+        program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+            uniformValues, layer.id, tile.maskedBoundsBuffer,
+            tile.maskedIndexBuffer, tile.segments);
     } else {
-        program.draw(
-            context,
-            gl.TRIANGLES,
-            depthMode,
-            stencilMode,
-            colorMode,
-            uniformValues,
-            layer.id,
-            painter.rasterBoundsBuffer,
-            painter.quadTriangleIndexBuffer,
-            painter.rasterBoundsSegments);
+        program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+            uniformValues, layer.id, painter.rasterBoundsBuffer,
+            painter.quadTriangleIndexBuffer, painter.rasterBoundsSegments);
     }
 }
 
@@ -123,17 +107,11 @@ function prepareHillshade(painter, tile, layer, depthMode, stencilMode, colorMod
         context.bindFramebuffer.set(fbo.framebuffer);
         context.viewport.set([0, 0, tileSize, tileSize]);
 
-        painter.useProgram('hillshadePrepare').draw(
-            context,
-            gl.TRIANGLES,
-            depthMode,
-            stencilMode,
-            colorMode,
+        painter.useProgram('hillshadePrepare').draw(context, gl.TRIANGLES,
+            depthMode, stencilMode, colorMode,
             hillshadeUniformPrepareValues(tile),
-            layer.id,
-            painter.rasterBoundsBuffer,
-            painter.quadTriangleIndexBuffer,
-            painter.rasterBoundsSegments);
+            layer.id, painter.rasterBoundsBuffer,
+            painter.quadTriangleIndexBuffer, painter.rasterBoundsSegments);
 
         tile.needsHillshadePrepare = false;
     }

diff --git a/src/render/draw_line.js b/src/render/draw_line.js
@@ -62,18 +62,8 @@ function drawLineTile(program, painter, tile, bucket, layer, coord, depthMode, c
         }
     }
 
-    program.draw(
-            context,
-            gl.TRIANGLES,
-            depthMode,
-            painter.stencilModeForClipping(coord),
-            colorMode,
-            uniformValues,
-            layer.id,
-            bucket.layoutVertexBuffer,
-            bucket.indexBuffer,
-            bucket.segments,
-            layer.paint,
-            painter.transform.zoom,
-            programConfiguration);
+    program.draw(context, gl.TRIANGLES, depthMode,
+        painter.stencilModeForClipping(coord), colorMode, uniformValues,
+        layer.id, bucket.layoutVertexBuffer, bucket.indexBuffer, bucket.segments,
+        layer.paint, painter.transform.zoom, programConfiguration);
 }
diff --git a/src/render/draw_raster.js b/src/render/draw_raster.js
@@ -60,43 +60,18 @@ function drawRaster(painter: Painter, sourceCache: SourceCache, layer: RasterSty
         const uniformValues = rasterUniformValues(posMatrix, parentTL || [0, 0], parentScaleBy || 1, fade, layer);
 
         if (source instanceof ImageSource) {
-            program.draw(
-                context,
-                gl.TRIANGLES,
-                depthMode,
-                stencilMode,
-                colorMode,
-                uniformValues,
-                layer.id,
-                source.boundsBuffer,
-                painter.quadTriangleIndexBuffer,
-                source.boundsSegments);
+            program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+                uniformValues, layer.id, source.boundsBuffer,
+                painter.quadTriangleIndexBuffer, source.boundsSegments);
         } else if (tile.maskedBoundsBuffer && tile.maskedIndexBuffer && tile.segments) {
-            program.draw(
-                context,
-                gl.TRIANGLES,
-                depthMode,
-                stencilMode,
-                colorMode,
-                uniformValues,
-                layer.id,
-                tile.maskedBoundsBuffer,
-                tile.maskedIndexBuffer,
-                tile.segments,
-                layer.paint,
+            program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+                uniformValues, layer.id, tile.maskedBoundsBuffer,
+                tile.maskedIndexBuffer, tile.segments, layer.paint,
                 painter.transform.zoom);
         } else {
-            program.draw(
-                context,
-                gl.TRIANGLES,
-                depthMode,
-                stencilMode,
-                colorMode,
-                uniformValues,
-                layer.id,
-                painter.rasterBoundsBuffer,
-                painter.quadTriangleIndexBuffer,
-                painter.rasterBoundsSegments);
+            program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+                uniformValues, layer.id, painter.rasterBoundsBuffer,
+                painter.quadTriangleIndexBuffer, painter.rasterBoundsSegments);
         }
     }
 }

diff --git a/src/render/draw_symbol.js b/src/render/draw_symbol.js
@@ -147,20 +147,9 @@ function drawLayerSymbols(painter, sourceCache, layer, coords, isText, translate
 function drawSymbolElements(buffers, layer, painter, program, depthMode, stencilMode, colorMode, uniformValues) {
     const context = painter.context;
     const gl = context.gl;
-    program.draw(
-        context,
-        gl.TRIANGLES,
-        depthMode,
-        stencilMode,
-        colorMode,
-        uniformValues,
-        layer.id,
-        buffers.layoutVertexBuffer,
-        buffers.indexBuffer,
-        buffers.segments,
-        layer.paint,
-        painter.transform.zoom,
-        buffers.programConfigurations.get(layer.id),
-        buffers.dynamicLayoutVertexBuffer,
-        buffers.opacityVertexBuffer);
+    program.draw(context, gl.TRIANGLES, depthMode, stencilMode, colorMode,
+        uniformValues, layer.id, buffers.layoutVertexBuffer,
+        buffers.indexBuffer, buffers.segments, layer.paint,
+        painter.transform.zoom, buffers.programConfigurations.get(layer.id),
+        buffers.dynamicLayoutVertexBuffer, buffers.opacityVertexBuffer);
 }