From d79288f134a6df126b44d4bea3c249841e0df850 Mon Sep 17 00:00:00 2001 From: Lauren Budorick Date: Thu, 18 Jan 2018 11:59:25 -0800 Subject: [PATCH] [formatting] --- src/render/draw_background.js | 19 ++++----- src/render/draw_circle.js | 18 ++------ src/render/draw_collision_debug.js | 17 ++------ src/render/draw_debug.js | 4 +- src/render/draw_fill.js | 18 ++------ src/render/draw_fill_extrusion.js | 33 ++++----------- src/render/draw_heatmap.js | 31 ++++---------- src/render/draw_hillshade.js | 42 +++++-------------- src/render/draw_line.js | 18 ++------ src/render/draw_raster.js | 43 ++++---------------- src/render/draw_symbol.js | 21 +++------- src/render/painter.js | 28 ++++--------- src/render/program.js | 1 - src/render/program/background_program.js | 15 ++++--- src/render/program/circle_program.js | 8 ++-- src/render/program/clipping_mask_program.js | 9 ++-- src/render/program/collision_program.js | 4 +- src/render/program/debug_program.js | 4 +- src/render/program/fill_extrusion_program.js | 15 ++++--- src/render/program/fill_program.js | 16 ++++---- src/render/program/heatmap_program.js | 15 ++++--- src/render/program/hillshade_program.js | 15 ++++--- src/render/program/line_program.js | 12 +++--- src/render/program/pattern.js | 9 ++-- src/render/program/raster_program.js | 5 +-- src/render/program/symbol_program.js | 10 +++-- 26 files changed, 152 insertions(+), 278 deletions(-) diff --git a/src/render/draw_background.js b/src/render/draw_background.js index 7d3bc8a7084..743d5e49709 100644 --- 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 index 84735ff17d9..b4538f89fc2 100644 --- 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 index f3a27ddaf9c..bfd70d14aa7 100644 --- 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 index a880d7f5891..25a49b9f7ea 100644 --- 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 index 2038e58ddca..6716debd618 100644 --- 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 index fc4062fa20e..7a786037e6c 100644 --- 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 index b180931c353..29797f3a5b7 100644 --- 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 index e48d5bd8aca..03b4bc0d517 100644 --- 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 index 039720d161b..014ff46ea52 100644 --- 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 index e4483dc65ab..854fb6bc04d 100644 --- 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 index b2061c91cd4..f0a14e61808 100644 --- 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); } diff --git a/src/render/painter.js b/src/render/painter.js index fa5e3e0da6d..c608b828d8f 100644 --- a/src/render/painter.js +++ b/src/render/painter.js @@ -214,17 +214,11 @@ class Painter { mat4.ortho(matrix, 0, this.width, this.height, 0, 0, 1); mat4.scale(matrix, matrix, [gl.drawingBufferWidth, gl.drawingBufferHeight, 0]); - this.useProgram('clippingMask').draw( - context, - gl.TRIANGLES, - DepthMode.disabled, - this.stencilClearMode, - ColorMode.disabled, + this.useProgram('clippingMask').draw(context, gl.TRIANGLES, + DepthMode.disabled, this.stencilClearMode, ColorMode.disabled, clippingMaskUniformValues(matrix), - '$clipping', - this.viewportBuffer, - this.quadTriangleIndexBuffer, - this.viewportSegments); + '$clipping', this.viewportBuffer, + this.quadTriangleIndexBuffer, this.viewportSegments); } _renderTileClippingMasks(tileIDs: Array) { @@ -242,18 +236,12 @@ class Painter { for (const tileID of tileIDs) { const id = this._tileClippingMaskIDs[tileID.key] = idNext++; - program.draw( - context, - gl.TRIANGLES, - DepthMode.disabled, + program.draw(context, gl.TRIANGLES, DepthMode.disabled, // Tests will always pass, and ref value will be written to stencil buffer. new StencilMode({ func: gl.ALWAYS, mask: 0 }, id, 0xFF, gl.KEEP, gl.KEEP, gl.REPLACE), - ColorMode.disabled, - clippingMaskUniformValues(tileID.posMatrix), - '$clipping', - this.tileExtentBuffer, - this.quadTriangleIndexBuffer, - this.tileExtentSegments); + ColorMode.disabled, clippingMaskUniformValues(tileID.posMatrix), + '$clipping', this.tileExtentBuffer, + this.quadTriangleIndexBuffer, this.tileExtentSegments); } } diff --git a/src/render/program.js b/src/render/program.js index 63ddda8f299..a16d7c9b98c 100644 --- a/src/render/program.js +++ b/src/render/program.js @@ -13,7 +13,6 @@ import type IndexBuffer from '../gl/index_buffer'; import type DepthMode from '../gl/depth_mode'; import type StencilMode from '../gl/stencil_mode'; import type ColorMode from '../gl/color_mode'; -// import type {PossiblyEvaluated, PossiblyEvaluatedPropertyValue} from '../style/properties'; import type {Uniforms, UniformValues, UniformLocations} from './uniform_binding'; export type DrawMode = diff --git a/src/render/program/background_program.js b/src/render/program/background_program.js index e48058f1446..70d49277e3a 100644 --- a/src/render/program/background_program.js +++ b/src/render/program/background_program.js @@ -17,21 +17,21 @@ import type Color from '../../style-spec/util/color'; import type {CrossFaded} from '../../style/cross_faded'; import type {OverscaledTileID} from '../../source/tile_id'; -const backgroundUniforms = (context: Context) => { +function backgroundUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_opacity': new Uniform1f(context), 'u_color': new Uniform4fv(context) }); -}; +} -const backgroundPatternUniforms = (context: Context) => { +function backgroundPatternUniforms(context: Context): Uniforms { return patternUniforms(context) .concatenate(new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_opacity': new Uniform1f(context) })); -}; +} function backgroundUniformValues( matrix: Float32Array, @@ -60,4 +60,9 @@ function backgroundPatternUniformValues( }); } -module.exports = { backgroundUniforms, backgroundPatternUniforms, backgroundUniformValues, backgroundPatternUniformValues }; +module.exports = { + backgroundUniforms, + backgroundPatternUniforms, + backgroundUniformValues, + backgroundPatternUniformValues +}; diff --git a/src/render/program/circle_program.js b/src/render/program/circle_program.js index ff2e1ac49d7..602db391ec0 100644 --- a/src/render/program/circle_program.js +++ b/src/render/program/circle_program.js @@ -16,16 +16,18 @@ import type Tile from '../../source/tile'; import type CircleStyleLayer from '../../style/style_layer/circle_style_layer'; import type Painter from '../painter'; -const circleUniforms = (context: Context): Uniforms => - new Uniforms({ +function circleUniforms(context: Context): Uniforms { + return new Uniforms({ 'u_camera_to_center_distance': new Uniform1f(context), 'u_scale_with_map': new Uniform1i(context), 'u_pitch_with_map': new Uniform1i(context), 'u_extrude_scale': new Uniform2fv(context), 'u_matrix': new UniformMatrix4fv(context) }); +} -function circleUniformValues(painter: Painter, +function circleUniformValues( + painter: Painter, coord: OverscaledTileID, tile: Tile, layer: CircleStyleLayer diff --git a/src/render/program/clipping_mask_program.js b/src/render/program/clipping_mask_program.js index 9efc617b0da..ad9a2a0d32d 100644 --- a/src/render/program/clipping_mask_program.js +++ b/src/render/program/clipping_mask_program.js @@ -1,18 +1,15 @@ // @flow -const { - UniformMatrix4fv, - Uniforms -} = require('../uniform_binding'); +const {UniformMatrix4fv, Uniforms} = require('../uniform_binding'); import type Context from '../../gl/context'; import type {UniformValues} from '../uniform_binding'; -const clippingMaskUniforms = (context: Context) => { +function clippingMaskUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context) }); -}; +} function clippingMaskUniformValues(matrix: Float32Array): UniformValues { return { diff --git a/src/render/program/collision_program.js b/src/render/program/collision_program.js index 64100289093..55bf9d0c4fa 100644 --- a/src/render/program/collision_program.js +++ b/src/render/program/collision_program.js @@ -13,14 +13,14 @@ import type {UniformValues} from '../uniform_binding'; import type Transform from '../../geo/transform'; import type Tile from '../../source/tile'; -const collisionUniforms = (context: Context) => { +function collisionUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_camera_to_center_distance': new Uniform1f(context), 'u_pixels_to_tile_units': new Uniform1f(context), 'u_extrude_scale': new Uniform2fv(context), }); -}; +} function collisionUniformValues( matrix: Float32Array, diff --git a/src/render/program/debug_program.js b/src/render/program/debug_program.js index 1137786832b..4ba6457074e 100644 --- a/src/render/program/debug_program.js +++ b/src/render/program/debug_program.js @@ -10,12 +10,12 @@ import type Context from '../../gl/context'; import type {UniformValues} from '../uniform_binding'; import type Color from '../../style-spec/util/color'; -const debugUniforms = (context: Context) => { +function debugUniforms(context: Context): Uniforms { return new Uniforms({ 'u_color': new Uniform4fv(context), 'u_matrix': new UniformMatrix4fv(context) }); -}; +} function debugUniformValues(matrix: Float32Array, color: Color): UniformValues { return { diff --git a/src/render/program/fill_extrusion_program.js b/src/render/program/fill_extrusion_program.js index fc63e6c442c..1ed5d995b1c 100644 --- a/src/render/program/fill_extrusion_program.js +++ b/src/render/program/fill_extrusion_program.js @@ -24,28 +24,31 @@ import type {CrossFaded} from '../../style/cross_faded'; import type {UniformValues} from '../uniform_binding'; import type FillExtrusionStyleLayer from '../../style/style_layer/fill_extrusion_style_layer'; -const fillExtrusionUniforms = (context: Context): Uniforms => - new Uniforms({ +function fillExtrusionUniforms(context: Context): Uniforms { + return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_lightpos': new Uniform3fv(context), 'u_lightintensity': new Uniform1f(context), 'u_lightcolor': new Uniform3fv(context) }); +} -const fillExtrusionPatternUniforms = (context: Context): Uniforms => - fillExtrusionUniforms(context) +function fillExtrusionPatternUniforms(context: Context): Uniforms { + return fillExtrusionUniforms(context) .concatenate(patternUniforms(context)) .concatenate(new Uniforms({ 'u_height_factor': new Uniform1f(context) })); +} -const extrusionTextureUniforms = (context: Context): Uniforms => - new Uniforms({ +function extrusionTextureUniforms(context: Context): Uniforms { + return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_world': new Uniform2fv(context), 'u_image': new Uniform1i(context), 'u_opacity': new Uniform1f(context) }); +} function fillExtrusionUniformValues( matrix: Float32Array, diff --git a/src/render/program/fill_program.js b/src/render/program/fill_program.js index 16028aa8688..14eca1c8214 100644 --- a/src/render/program/fill_program.js +++ b/src/render/program/fill_program.js @@ -15,28 +15,28 @@ import type Context from '../../gl/context'; import type {CrossFaded} from '../../style/cross_faded'; import type {OverscaledTileID} from '../../source/tile_id'; -const fillUniforms = (context: Context) => { +function fillUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), }); -}; +} -const fillPatternUniforms = (context: Context) => { +function fillPatternUniforms(context: Context): Uniforms { return fillUniforms(context) .concatenate(patternUniforms(context)); -}; +} -const fillOutlineUniforms = (context: Context) => { +function fillOutlineUniforms(context: Context): Uniforms { return fillUniforms(context) .concatenate(new Uniforms({ 'u_world': new Uniform2fv(context) })); -}; +} -const fillOutlinePatternUniforms = (context: Context) => { +function fillOutlinePatternUniforms(context: Context): Uniforms { return fillOutlineUniforms(context) .concatenate(patternUniforms(context)); -}; +} function fillUniformValues(matrix: Float32Array): UniformValues { return { diff --git a/src/render/program/heatmap_program.js b/src/render/program/heatmap_program.js index 7fe26245884..1fc12e7906b 100644 --- a/src/render/program/heatmap_program.js +++ b/src/render/program/heatmap_program.js @@ -16,15 +16,15 @@ import type {UniformValues} from '../uniform_binding'; import type Painter from '../painter'; import type HeatmapStyleLayer from '../../style/style_layer/heatmap_style_layer'; -const heatmapUniforms = (context: Context) => { +function heatmapUniforms(context: Context): Uniforms { return new Uniforms({ 'u_extrude_scale': new Uniform1f(context), 'u_intensity': new Uniform1f(context), 'u_matrix': new UniformMatrix4fv(context) }); -}; +} -const heatmapTextureUniforms = (context: Context) => { +function heatmapTextureUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_world': new Uniform2fv(context), @@ -32,7 +32,7 @@ const heatmapTextureUniforms = (context: Context) => { 'u_color_ramp': new Uniform1i(context), 'u_opacity': new Uniform1f(context) }); -}; +} function heatmapUniformValues( matrix: Float32Array, @@ -67,4 +67,9 @@ function heatmapTextureUniformValues( }; } -module.exports = { heatmapUniforms, heatmapTextureUniforms, heatmapUniformValues, heatmapTextureUniformValues }; +module.exports = { + heatmapUniforms, + heatmapTextureUniforms, + heatmapUniformValues, + heatmapTextureUniformValues +}; diff --git a/src/render/program/hillshade_program.js b/src/render/program/hillshade_program.js index fa9737fffa7..178ef7b46d2 100644 --- a/src/render/program/hillshade_program.js +++ b/src/render/program/hillshade_program.js @@ -19,7 +19,7 @@ import type Painter from '../painter'; import type HillshadeStyleLayer from '../../style/style_layer/hillshade_style_layer'; import type {OverscaledTileID} from '../../source/tile_id'; -const hillshadeUniforms = (context: Context) => { +function hillshadeUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_image': new Uniform1i(context), @@ -29,16 +29,16 @@ const hillshadeUniforms = (context: Context) => { 'u_highlight': new Uniform4fv(context), 'u_accent': new Uniform4fv(context) }); -}; +} -const hillshadePrepareUniforms = (context: Context) => { +function hillshadePrepareUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_image': new Uniform1i(context), 'u_dimension': new Uniform2fv(context), 'u_zoom': new Uniform1f(context) }); -}; +} function hillshadeUniformValues( painter: Painter, @@ -94,4 +94,9 @@ function getTileLatRange(painter: Painter, tileID: OverscaledTileID) { ]; } -module.exports = { hillshadeUniforms, hillshadePrepareUniforms, hillshadeUniformValues, hillshadeUniformPrepareValues }; +module.exports = { + hillshadeUniforms, + hillshadePrepareUniforms, + hillshadeUniformValues, + hillshadeUniformPrepareValues +}; diff --git a/src/render/program/line_program.js b/src/render/program/line_program.js index 83e21a8b5c1..a3c6d661f3a 100644 --- a/src/render/program/line_program.js +++ b/src/render/program/line_program.js @@ -19,15 +19,15 @@ import type {CrossFaded} from '../../style/cross_faded'; import type LineStyleLayer from '../../style/style_layer/line_style_layer'; import type Painter from '../painter'; -const lineUniforms = (context: Context) => { +function lineUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_ratio': new Uniform1f(context), 'u_gl_units_to_pixels': new Uniform2fv(context) }); -}; +} -const linePatternUniforms = (context: Context) => { +function linePatternUniforms(context: Context): Uniforms { return lineUniforms(context) .concatenate(new Uniforms({ 'u_pattern_size_a': new Uniform2fv(context), @@ -40,9 +40,9 @@ const linePatternUniforms = (context: Context) => { 'u_pattern_br_b': new Uniform2fv(context), 'u_fade': new Uniform1f(context) })); -}; +} -const lineSDFUniforms = (context: Context) => { +function lineSDFUniforms(context: Context): Uniforms { return lineUniforms(context) .concatenate(new Uniforms({ 'u_patternscale_a': new Uniform2fv(context), @@ -53,7 +53,7 @@ const lineSDFUniforms = (context: Context) => { 'u_tex_y_b': new Uniform1f(context), 'u_mix': new Uniform1f(context) })); -}; +} function lineUniformValues( painter: Painter, diff --git a/src/render/program/pattern.js b/src/render/program/pattern.js index 1dadc031ce7..ed07b41b204 100644 --- a/src/render/program/pattern.js +++ b/src/render/program/pattern.js @@ -15,7 +15,7 @@ import type {CrossFaded} from '../../style/cross_faded'; import type {UniformValues} from '../uniform_binding'; import type Context from '../../gl/context'; -const patternUniforms = (context: Context) => { +function patternUniforms(context: Context): Uniforms { return new Uniforms({ 'u_image': new Uniform1i(context), 'u_pattern_tl_a': new Uniform2fv(context), @@ -32,7 +32,7 @@ const patternUniforms = (context: Context) => { 'u_pixel_coord_lower': new Uniform2fv(context), 'u_tile_units_to_pixels': new Uniform1f(context) }); -}; +} function prepare(image: CrossFaded, painter: Painter): UniformValues { const context = painter.context; @@ -61,7 +61,10 @@ function prepare(image: CrossFaded, painter: Painter): UniformValues { }; } -function setTile(tile: {tileID: OverscaledTileID, tileSize: number}, painter: Painter): UniformValues { +function setTile( + tile: {tileID: OverscaledTileID, tileSize: number}, + painter: Painter +): UniformValues { const numTiles = Math.pow(2, tile.tileID.overscaledZ); const tileSizeAtNearestZoom = tile.tileSize * Math.pow(2, painter.transform.tileZoom) / numTiles; diff --git a/src/render/program/raster_program.js b/src/render/program/raster_program.js index cebe162fad0..b860963ef4b 100644 --- a/src/render/program/raster_program.js +++ b/src/render/program/raster_program.js @@ -13,7 +13,7 @@ import type Context from '../../gl/context'; import type {UniformValues} from '../uniform_binding'; import type RasterStyleLayer from '../../style/style_layer/raster_style_layer'; -const rasterUniforms = (context: Context): Uniforms => { +function rasterUniforms(context: Context): Uniforms { return new Uniforms({ 'u_matrix': new UniformMatrix4fv(context), 'u_tl_parent': new Uniform2fv(context), @@ -29,8 +29,7 @@ const rasterUniforms = (context: Context): Uniforms => { 'u_contrast_factor': new Uniform1f(context), 'u_spin_weights': new Uniform3fv(context) }); -}; - +} function rasterUniformValues( matrix: Float32Array, diff --git a/src/render/program/symbol_program.js b/src/render/program/symbol_program.js index 23424acb953..3be7cd75c83 100644 --- a/src/render/program/symbol_program.js +++ b/src/render/program/symbol_program.js @@ -13,8 +13,8 @@ import type Context from '../../gl/context'; import type Painter from '../painter'; import type {UniformValues} from '../uniform_binding'; -const symbolIconUniforms = (context: Context) => - new Uniforms({ +function symbolIconUniforms(context: Context): Uniforms { + return new Uniforms({ 'u_is_size_zoom_constant': new Uniform1i(context), 'u_is_size_feature_constant': new Uniform1i(context), 'u_size_t': new Uniform1f(context), @@ -32,13 +32,15 @@ const symbolIconUniforms = (context: Context) => 'u_texsize': new Uniform2fv(context), 'u_texture': new Uniform1i(context) }); +} -const symbolSDFUniforms = (context: Context) => - symbolIconUniforms(context) +function symbolSDFUniforms(context: Context): Uniforms { + return symbolIconUniforms(context) .concatenate(new Uniforms({ 'u_gamma_scale': new Uniform1f(context), 'u_is_halo': new Uniform1f(context) })); +} function symbolIconUniformValues( functionType: string,