[core] Polymorphic bucket creation

This commit is contained in:
John Firebaugh
2015-10-20 15:05:06 -07:00
parent 540c6eca15
commit ddc4251074
19 changed files with 247 additions and 162 deletions

View File

@@ -1,13 +1,11 @@
#include <mbgl/text/collision_tile.hpp>
#include <mbgl/map/tile_worker.hpp>
#include <mbgl/map/geometry_tile.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/style_layer.hpp>
#include <mbgl/style/property_evaluator.hpp>
#include <mbgl/style/style_bucket_parameters.hpp>
#include <mbgl/geometry/sprite_atlas.hpp>
#include <mbgl/geometry/glyph_atlas.hpp>
#include <mbgl/renderer/fill_bucket.hpp>
#include <mbgl/renderer/line_bucket.hpp>
#include <mbgl/renderer/circle_bucket.hpp>
#include <mbgl/renderer/symbol_bucket.hpp>
#include <mbgl/platform/log.hpp>
#include <mbgl/util/constants.hpp>
@@ -21,7 +19,6 @@ TileWorker::TileWorker(TileID id_,
const std::atomic<TileData::State>& state_)
: id(id_),
sourceID(sourceID_),
parameters(id.z),
style(style_),
state(state_) {
assert(style.sprite);
@@ -36,6 +33,7 @@ TileParseResult TileWorker::parseAllLayers(std::vector<util::ptr<StyleLayer>> la
PlacementConfig config) {
// We're doing a fresh parse of the tile, because the underlying data has changed.
pending.clear();
partialParse = false;
// Reset the collision tile so we have a clean slate; we're placing all features anyway.
collisionTile = std::make_unique<CollisionTile>(config);
@@ -99,15 +97,6 @@ void TileWorker::redoPlacement(
}
}
template <typename T>
void applyLayoutProperty(PropertyKey key, const ClassProperties &classProperties, T &target, const StyleCalculationParameters& parameters) {
auto it = classProperties.properties.find(key);
if (it != classProperties.properties.end()) {
const PropertyEvaluator<T> evaluator(parameters);
target = mapbox::util::apply_visitor(evaluator, it->second);
}
}
void TileWorker::parseLayer(const StyleLayer& layer, const GeometryTile& geometryTile) {
// Cancel early when parsing.
if (state == TileData::State::obsolete)
@@ -135,145 +124,23 @@ void TileWorker::parseLayer(const StyleLayer& layer, const GeometryTile& geometr
return;
}
switch (layer.type) {
case StyleLayerType::Fill:
createFillBucket(*geometryLayer, layer);
break;
case StyleLayerType::Line:
createLineBucket(*geometryLayer, layer);
break;
case StyleLayerType::Circle:
createCircleBucket(*geometryLayer, layer);
break;
case StyleLayerType::Symbol:
createSymbolBucket(*geometryLayer, layer);
break;
case StyleLayerType::Raster:
break;
default:
Log::Warning(Event::ParseTile, "unknown bucket render type for layer '%s' (source layer '%s')",
layer.id.c_str(), layer.sourceLayer.c_str());
}
}
StyleBucketParameters parameters(id,
*geometryLayer,
state,
reinterpret_cast<uintptr_t>(this),
partialParse,
*style.spriteAtlas,
*style.sprite,
*style.glyphAtlas,
*style.glyphStore,
*collisionTile);
template <class Bucket>
void TileWorker::addBucketGeometries(Bucket& bucket, const GeometryTileLayer& layer, const FilterExpression &filter) {
for (std::size_t i = 0; i < layer.featureCount(); i++) {
auto feature = layer.getFeature(i);
std::unique_ptr<Bucket> bucket = layer.createBucket(parameters);
if (state == TileData::State::obsolete)
return;
GeometryTileFeatureExtractor extractor(*feature);
if (!evaluate(filter, extractor))
continue;
bucket->addGeometry(feature->getGeometries());
}
}
void TileWorker::createFillBucket(const GeometryTileLayer& tileLayer,
const StyleLayer& layer) {
auto bucket = std::make_unique<FillBucket>();
// Fill does not have layout properties to apply.
addBucketGeometries(bucket, tileLayer, layer.filter);
insertBucket(layer.bucketName(), std::move(bucket));
}
void TileWorker::createLineBucket(const GeometryTileLayer& tileLayer,
const StyleLayer& layer) {
auto bucket = std::make_unique<LineBucket>();
const float z = id.z;
auto& layout = bucket->layout;
applyLayoutProperty(PropertyKey::LineCap, layer.layout, layout.cap, z);
applyLayoutProperty(PropertyKey::LineJoin, layer.layout, layout.join, z);
applyLayoutProperty(PropertyKey::LineMiterLimit, layer.layout, layout.miter_limit, z);
applyLayoutProperty(PropertyKey::LineRoundLimit, layer.layout, layout.round_limit, z);
addBucketGeometries(bucket, tileLayer, layer.filter);
insertBucket(layer.bucketName(), std::move(bucket));
}
void TileWorker::createCircleBucket(const GeometryTileLayer& tileLayer,
const StyleLayer& layer) {
auto bucket = std::make_unique<CircleBucket>();
// Circle does not have layout properties to apply.
addBucketGeometries(bucket, tileLayer, layer.filter);
insertBucket(layer.bucketName(), std::move(bucket));
}
void TileWorker::createSymbolBucket(const GeometryTileLayer& tileLayer,
const StyleLayer& layer) {
auto bucket = std::make_unique<SymbolBucket>(id.overscaling, id.z);
const float z = id.z;
auto& layout = bucket->layout;
applyLayoutProperty(PropertyKey::SymbolPlacement, layer.layout, layout.placement, z);
if (layout.placement == PlacementType::Line) {
layout.icon.rotation_alignment = RotationAlignmentType::Map;
layout.text.rotation_alignment = RotationAlignmentType::Map;
};
applyLayoutProperty(PropertyKey::SymbolSpacing, layer.layout, layout.spacing, z);
applyLayoutProperty(PropertyKey::SymbolAvoidEdges, layer.layout, layout.avoid_edges, z);
applyLayoutProperty(PropertyKey::IconAllowOverlap, layer.layout, layout.icon.allow_overlap, z);
applyLayoutProperty(PropertyKey::IconIgnorePlacement, layer.layout, layout.icon.ignore_placement, z);
applyLayoutProperty(PropertyKey::IconOptional, layer.layout, layout.icon.optional, z);
applyLayoutProperty(PropertyKey::IconRotationAlignment, layer.layout, layout.icon.rotation_alignment, z);
applyLayoutProperty(PropertyKey::IconImage, layer.layout, layout.icon.image, z);
applyLayoutProperty(PropertyKey::IconPadding, layer.layout, layout.icon.padding, z);
applyLayoutProperty(PropertyKey::IconRotate, layer.layout, layout.icon.rotate, z);
applyLayoutProperty(PropertyKey::IconKeepUpright, layer.layout, layout.icon.keep_upright, z);
applyLayoutProperty(PropertyKey::IconOffset, layer.layout, layout.icon.offset, z);
applyLayoutProperty(PropertyKey::TextRotationAlignment, layer.layout, layout.text.rotation_alignment, z);
applyLayoutProperty(PropertyKey::TextField, layer.layout, layout.text.field, z);
applyLayoutProperty(PropertyKey::TextFont, layer.layout, layout.text.font, z);
applyLayoutProperty(PropertyKey::TextMaxWidth, layer.layout, layout.text.max_width, z);
applyLayoutProperty(PropertyKey::TextLineHeight, layer.layout, layout.text.line_height, z);
applyLayoutProperty(PropertyKey::TextLetterSpacing, layer.layout, layout.text.letter_spacing, z);
applyLayoutProperty(PropertyKey::TextMaxAngle, layer.layout, layout.text.max_angle, z);
applyLayoutProperty(PropertyKey::TextRotate, layer.layout, layout.text.rotate, z);
applyLayoutProperty(PropertyKey::TextPadding, layer.layout, layout.text.padding, z);
applyLayoutProperty(PropertyKey::TextIgnorePlacement, layer.layout, layout.text.ignore_placement, z);
applyLayoutProperty(PropertyKey::TextOptional, layer.layout, layout.text.optional, z);
applyLayoutProperty(PropertyKey::TextJustify, layer.layout, layout.text.justify, z);
applyLayoutProperty(PropertyKey::TextAnchor, layer.layout, layout.text.anchor, z);
applyLayoutProperty(PropertyKey::TextKeepUpright, layer.layout, layout.text.keep_upright, z);
applyLayoutProperty(PropertyKey::TextTransform, layer.layout, layout.text.transform, z);
applyLayoutProperty(PropertyKey::TextOffset, layer.layout, layout.text.offset, z);
applyLayoutProperty(PropertyKey::TextAllowOverlap, layer.layout, layout.text.allow_overlap, z);
applyLayoutProperty(PropertyKey::IconSize, layer.layout, layout.icon.size, z + 1);
applyLayoutProperty(PropertyKey::IconSize, layer.layout, layout.icon.max_size, 18);
applyLayoutProperty(PropertyKey::TextSize, layer.layout, layout.text.size, z + 1);
applyLayoutProperty(PropertyKey::TextSize, layer.layout, layout.text.max_size, 18);
bucket->parseFeatures(tileLayer, layer.filter);
assert(style.glyphStore);
assert(style.sprite);
const bool needsDependencies = bucket->needsDependencies(*style.glyphStore, *style.sprite);
if (needsDependencies) {
if (layer.type == StyleLayerType::Symbol && partialParse) {
// We cannot parse this bucket yet. Instead, we're saving it for later.
pending.emplace_back(layer, std::move(bucket));
} else {
assert(style.spriteAtlas);
assert(style.glyphAtlas);
assert(style.glyphStore);
assert(collisionTile);
bucket->addFeatures(reinterpret_cast<uintptr_t>(this), *style.spriteAtlas,
*style.glyphAtlas, *style.glyphStore, *collisionTile);
insertBucket(layer.bucketName(), std::move(bucket));
}
}