Skip to content

Commit

Permalink
skip pattern layer when pattern is missing
Browse files Browse the repository at this point in the history
No error or warning is printed for missing patterns.

fix mapbox#4660
  • Loading branch information
ansis authored and chrisvoll committed May 25, 2017
1 parent 164b0a0 commit 3f2d5c8
Show file tree
Hide file tree
Showing 10 changed files with 160 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/render/draw_background.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function drawBackground(painter, sourceCache, layer) {

let program;
if (image) {
if (pattern.isPatternMissing(image, painter)) return;
program = painter.useProgram('fillPattern', painter.basicFillProgramConfiguration);
pattern.prepare(image, painter, program);
painter.tileExtentPatternVAO.bind(gl, program, painter.tileExtentBuffer);
Expand Down
2 changes: 2 additions & 0 deletions src/render/draw_fill.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ function drawFill(painter, sourceCache, layer, coords) {
}

function drawFillTiles(painter, sourceCache, layer, coords, drawFn) {
if (pattern.isPatternMissing(layer.paint['fill-pattern'], painter)) return;

let firstTile = true;
for (const coord of coords) {
const tile = sourceCache.getTile(coord);
Expand Down
1 change: 1 addition & 0 deletions src/render/draw_fill_extrusion.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ function drawExtrusion(painter, source, layer, coord) {
programConfiguration.setUniforms(gl, program, layer, {zoom: painter.transform.zoom});

if (image) {
if (pattern.isPatternMissing(image, painter)) return;
pattern.prepare(image, painter, program);
pattern.setTile(tile, painter, program);
gl.uniform1f(program.u_height_factor, -Math.pow(2, coord.z) / tile.tileSize / 8);
Expand Down
16 changes: 15 additions & 1 deletion src/render/pattern.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
'use strict';

const assert = require('assert');

const pixelsToTileUnits = require('../source/pixels_to_tile_units');

/**
* Checks whether a pattern image is needed, and if it is, whether it is not loaded.
*
* @returns {boolean} true if a needed image is missing and rendering needs to be skipped.
*/
exports.isPatternMissing = function(image, painter) {
if (!image) return false;
const imagePosA = painter.spriteAtlas.getPosition(image.from, true);
const imagePosB = painter.spriteAtlas.getPosition(image.to, true);
return !imagePosA || !imagePosB;
};

exports.prepare = function (image, painter, program) {
const gl = painter.gl;

const imagePosA = painter.spriteAtlas.getPosition(image.from, true);
const imagePosB = painter.spriteAtlas.getPosition(image.to, true);
if (!imagePosA || !imagePosB) return;
assert(imagePosA && imagePosB);

gl.uniform1i(program.u_image, 0);
gl.uniform2fv(program.u_pattern_tl_a, imagePosA.tl);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 8,
"metadata": {
"test": {
"width": 64,
"height": 64
}
},
"sources": {},
"sprite": "local://sprites/emerald",
"layers": [
{
"id": "background",
"type": "background",
"paint": {
"background-pattern": "missing"
}
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"version": 8,
"metadata": {
"test": {
"height": 256,
"ignored": {
"js": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"native": "https://github.com/mapbox/mapbox-gl-js/issues/3327"
}
}
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "FeatureCollection",
"features": [
{
"type": "Feature",
"properties": {
"property": 20
},
"geometry": {
"type": "Polygon",
"coordinates": [
[ [ -0.0004, 0 ],
[ -0.0002, 0.0002 ],
[ 0.0000, 0 ],
[ -0.0002, -0.0002 ],
[ -0.0004, 0 ] ]
]
}
},
{
"type": "Feature",
"properties": {
"property": 20
},
"geometry": {
"type": "Polygon",
"coordinates": [
[ [ -0.0000, -0.0002 ],
[ -0.0000, 0.0002 ],
[ 0.0003, 0.0002 ],
[ 0.0003, -0.0002 ],
[ -0.0000, -0.0002 ] ]
]
}
}
]
}
}
},
"sprite": "local://sprites/emerald",
"pitch": 60,
"zoom": 18,
"layers": [
{
"id": "extrusion",
"type": "fill-extrusion",
"source": "geojson",
"paint": {
"fill-extrusion-pattern": "missing",
"fill-extrusion-height": 10
}
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions test/integration/render-tests/fill-pattern/missing/style.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"version": 8,
"metadata": {
"test": {
"width": 64,
"height": 64
}
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Polygon",
"coordinates": [
[
[
-10,
-10
],
[
-10,
10
],
[
10,
10
],
[
10,
-10
],
[
-10,
-10
]
]
]
}
}
},
"sprite": "local://sprites/emerald",
"layers": [
{
"id": "fill",
"type": "fill",
"source": "geojson",
"paint": {
"fill-antialias": false,
"fill-pattern": "missing"
}
}
]
}

0 comments on commit 3f2d5c8

Please sign in to comment.