From 5264982ba7fdd536a3971dc9e8ddd0c684e1d974 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 11:14:20 -0700 Subject: [PATCH 1/5] Eliminate StyleLayerGroup --- include/mbgl/map/map.hpp | 2 - src/mbgl/map/map.cpp | 21 ++------ src/mbgl/map/tile_parser.cpp | 8 +-- src/mbgl/map/tile_parser.hpp | 1 - src/mbgl/renderer/painter.cpp | 31 +++++------- src/mbgl/renderer/painter.hpp | 2 - src/mbgl/renderer/painter_raster.cpp | 1 - src/mbgl/style/style.cpp | 16 +++--- src/mbgl/style/style.hpp | 3 +- src/mbgl/style/style_layer.cpp | 1 - src/mbgl/style/style_layer.hpp | 1 - src/mbgl/style/style_layer_group.cpp | 34 ------------- src/mbgl/style/style_layer_group.hpp | 24 --------- src/mbgl/style/style_parser.cpp | 76 ++++++++++++---------------- src/mbgl/style/style_parser.hpp | 14 ++--- 15 files changed, 64 insertions(+), 171 deletions(-) delete mode 100644 src/mbgl/style/style_layer_group.cpp delete mode 100644 src/mbgl/style/style_layer_group.hpp diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 4ce701430..cd280d024 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -29,7 +29,6 @@ class LayerDescription; class Sprite; class Style; class StyleLayer; -class StyleLayerGroup; class StyleSource; class TexturePool; class FileSource; @@ -188,7 +187,6 @@ private: void updateTiles(); void updateSources(); - void updateSources(const util::ptr &group); // Triggered by triggerUpdate(); void update(); diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 255d7f8a3..e36c13a42 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -723,7 +722,11 @@ void Map::updateSources() { // Then, reenable all of those that we actually use when drawing this layer. if (style) { - updateSources(style->layers); + for (const auto& layer : style->layers) { + if (layer->bucket && layer->bucket->style_source) { + (*activeSources.emplace(layer->bucket->style_source).first)->enabled = true; + } + } } // Then, construct or destroy the actual source object, depending on enabled state. @@ -744,20 +747,6 @@ void Map::updateSources() { }); } -void Map::updateSources(const util::ptr &group) { - assert(Environment::currentlyOn(ThreadType::Map)); - if (!group) { - return; - } - for (const auto& layer : group->layers) { - if (!layer) continue; - if (layer->bucket && layer->bucket->style_source) { - (*activeSources.emplace(layer->bucket->style_source).first)->enabled = true; - } - - } -} - void Map::updateTiles() { assert(Environment::currentlyOn(ThreadType::Map)); for (const auto& source : activeSources) { diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp index 04e09eb0a..81706297e 100644 --- a/src/mbgl/map/tile_parser.cpp +++ b/src/mbgl/map/tile_parser.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -51,12 +50,7 @@ TileParser::TileParser(const GeometryTile& geometryTile_, bool TileParser::obsolete() const { return tile.state == TileData::State::obsolete; } void TileParser::parse() { - util::ptr group = style->layers; - if (!group) { - return; - } - - for (const auto& layer_desc : group->layers) { + for (const auto& layer_desc : style->layers) { // Cancel early when parsing. if (obsolete()) { return; diff --git a/src/mbgl/map/tile_parser.hpp b/src/mbgl/map/tile_parser.hpp index 890486bd1..2c16d2a2f 100644 --- a/src/mbgl/map/tile_parser.hpp +++ b/src/mbgl/map/tile_parser.hpp @@ -28,7 +28,6 @@ class StyleLayoutFill; class StyleLayoutRaster; class StyleLayoutLine; class StyleLayoutSymbol; -class StyleLayerGroup; class VectorTileData; class Collision; diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 439c6680f..0219ccec7 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -237,23 +236,9 @@ void Painter::render(const Style& style, const std::set>& // Actually render the layers if (debug::renderTree) { Log::Info(Event::Render, "{"); indent++; } - if (style.layers) { - renderLayers(*style.layers); - } - if (debug::renderTree) { Log::Info(Event::Render, "}"); indent--; } - // Finalize the rendering, e.g. by calling debug render calls per tile. - // This guarantees that we have at least one function per tile called. - // When only rendering layers via the stylesheet, it's possible that we don't - // ever visit a tile during rendering. - for (const auto& source : sources) { - source->source->finishRender(*this); - } -} - -void Painter::renderLayers(const StyleLayerGroup &group) { // TODO: Correctly compute the number of layers recursively beforehand. - float strata_thickness = 1.0f / (group.layers.size() + 1); + float strata_thickness = 1.0f / (style.layers.size() + 1); // - FIRST PASS ------------------------------------------------------------ // Render everything top-to-bottom by using reverse iterators. Render opaque @@ -263,7 +248,7 @@ void Painter::renderLayers(const StyleLayerGroup &group) { Log::Info(Event::Render, "%*s%s", indent++ * 4, "", "OPAQUE {"); } int i = 0; - for (auto it = group.layers.rbegin(), end = group.layers.rend(); it != end; ++it, ++i) { + for (auto it = style.layers.rbegin(), end = style.layers.rend(); it != end; ++it, ++i) { setOpaque(); setStrata(i * strata_thickness); renderLayer(**it); @@ -279,7 +264,7 @@ void Painter::renderLayers(const StyleLayerGroup &group) { Log::Info(Event::Render, "%*s%s", indent++ * 4, "", "TRANSLUCENT {"); } --i; - for (auto it = group.layers.begin(), end = group.layers.end(); it != end; ++it, --i) { + for (auto it = style.layers.begin(), end = style.layers.end(); it != end; ++it, --i) { setTranslucent(); setStrata(i * strata_thickness); renderLayer(**it); @@ -287,6 +272,16 @@ void Painter::renderLayers(const StyleLayerGroup &group) { if (debug::renderTree) { Log::Info(Event::Render, "%*s%s", --indent * 4, "", "}"); } + + if (debug::renderTree) { Log::Info(Event::Render, "}"); indent--; } + + // Finalize the rendering, e.g. by calling debug render calls per tile. + // This guarantees that we have at least one function per tile called. + // When only rendering layers via the stylesheet, it's possible that we don't + // ever visit a tile during rendering. + for (const auto& source : sources) { + source->source->finishRender(*this); + } } void Painter::renderLayer(const StyleLayer &layer_desc, const Tile::ID* id, const mat4* matrix) { diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 9c9c6a464..485098c11 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -43,7 +43,6 @@ class GlyphAtlas; class LineAtlas; class Source; class StyleSource; -class StyleLayerGroup; class FillBucket; class LineBucket; @@ -81,7 +80,6 @@ public: TransformState state, std::chrono::steady_clock::time_point time); - void renderLayers(const StyleLayerGroup &group); void renderLayer(const StyleLayer &layer_desc, const Tile::ID* id = nullptr, const mat4* matrix = nullptr); // Renders a particular layer from a tile. diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp index 5e72676b9..72d15aabd 100644 --- a/src/mbgl/renderer/painter_raster.cpp +++ b/src/mbgl/renderer/painter_raster.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 45217950f..895e8796b 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -30,8 +30,8 @@ void Style::updateProperties(float z, std::chrono::steady_clock::time_point now) zoomHistory.update(z, now); - if (layers) { - layers->updateProperties(z, now, zoomHistory); + for (const auto& layer : layers) { + layer->updateProperties(z, now, zoomHistory); } // Apply transitions after the first time. @@ -50,21 +50,21 @@ void Style::setDefaultTransitionDuration(std::chrono::steady_clock::duration dur } void Style::cascadeClasses(const std::vector& classes) { - if (layers) { - layers->setClasses(classes, std::chrono::steady_clock::now(), defaultTransition); + std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now(); + for (const auto& layer : layers) { + layer->setClasses(classes, now, defaultTransition); } } bool Style::hasTransitions() const { - if (layers) { - if (layers->hasTransitions()) { + for (const auto& layer : layers) { + if (layer->hasTransitions()) { return true; } } return false; } - void Style::loadJSON(const uint8_t *const data) { uv::writelock lock(mtx); diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 4de827a38..04303b64b 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -20,7 +20,6 @@ namespace mbgl { class Sprite; class StyleLayer; -class StyleLayerGroup; class Style : public util::noncopyable { public: @@ -41,7 +40,7 @@ public: const std::string &getSpriteURL() const; - util::ptr layers; + std::vector> layers; std::vector appliedClasses; std::string glyph_url; std::string base; diff --git a/src/mbgl/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp index 4eaad71cf..705d9800b 100644 --- a/src/mbgl/style/style_layer.cpp +++ b/src/mbgl/style/style_layer.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp index 6e1fc7912..a89206c1c 100644 --- a/src/mbgl/style/style_layer.hpp +++ b/src/mbgl/style/style_layer.hpp @@ -18,7 +18,6 @@ namespace mbgl { class StyleBucket; -class StyleLayerGroup; class StyleLayer { public: diff --git a/src/mbgl/style/style_layer_group.cpp b/src/mbgl/style/style_layer_group.cpp deleted file mode 100644 index e1f561d3b..000000000 --- a/src/mbgl/style/style_layer_group.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include - -namespace mbgl { - -void StyleLayerGroup::setClasses(const std::vector &class_names, std::chrono::steady_clock::time_point now, - const PropertyTransition &defaultTransition) { - for (const auto& layer : layers) { - if (layer) { - layer->setClasses(class_names, now, defaultTransition); - } - } -} - -void StyleLayerGroup::updateProperties(float z, std::chrono::steady_clock::time_point now, ZoomHistory &zoomHistory) { - for (const auto& layer : layers) { - if (layer) { - layer->updateProperties(z, now, zoomHistory); - } - } -} - -bool StyleLayerGroup::hasTransitions() const { - for (const auto& layer : layers) { - if (layer) { - if (layer->hasTransitions()) { - return true; - } - } - } - return false; -} - - -} diff --git a/src/mbgl/style/style_layer_group.hpp b/src/mbgl/style/style_layer_group.hpp deleted file mode 100644 index 79b75a55e..000000000 --- a/src/mbgl/style/style_layer_group.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef MBGL_STYLE_STYLE_LAYER_GROUP -#define MBGL_STYLE_STYLE_LAYER_GROUP - -#include - -#include -#include - -namespace mbgl { - -class StyleLayerGroup { -public: - void setClasses(const std::vector &class_names, std::chrono::steady_clock::time_point now, - const PropertyTransition &defaultTransition); - void updateProperties(float z, std::chrono::steady_clock::time_point now, ZoomHistory &zoomHistory); - - bool hasTransitions() const; -public: - std::vector> layers; -}; - -} - -#endif diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index 5bc9cea22..702485370 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -35,8 +35,7 @@ void StyleParser::parse(JSVal document) { } if (document.HasMember("layers")) { - root = createLayers(document["layers"]); - parseLayers(); + parseLayers(document["layers"]); // create point annotations layer // @@ -45,8 +44,8 @@ void StyleParser::parse(JSVal document) { std::map paints; util::ptr annotations = std::make_shared(id, std::move(paints)); annotations->type = StyleLayerType::Symbol; - layers.emplace(id, std::pair> { JSVal(id), annotations }); - root->layers.emplace_back(annotations); + layersMap.emplace(id, std::pair> { JSVal(id), annotations }); + layers.emplace_back(annotations); util::ptr pointBucket = std::make_shared(annotations->type); pointBucket->name = annotations->id; @@ -682,61 +681,48 @@ template<> std::tuple>> Style #pragma mark - Parse Layers -std::unique_ptr StyleParser::createLayers(JSVal value) { - if (value.IsArray()) { - std::unique_ptr group = util::make_unique(); - for (rapidjson::SizeType i = 0; i < value.Size(); ++i) { - util::ptr layer = createLayer(value[i]); - if (layer) { - group->layers.emplace_back(layer); - } - } - return group; - } else { +void StyleParser::parseLayers(JSVal value) { + if (!value.IsArray()) { Log::Warning(Event::ParseStyle, "layers must be an array"); - return nullptr; + return; } -} -util::ptr StyleParser::createLayer(JSVal value) { - if (value.IsObject()) { - if (!value.HasMember("id")) { - Log::Warning(Event::ParseStyle, "layer must have an id"); - return nullptr; + for (rapidjson::SizeType i = 0; i < value.Size(); ++i) { + JSVal layerValue = value[i]; + + if (!layerValue.IsObject()) { + Log::Warning(Event::ParseStyle, "layer must be an object"); + continue; } - JSVal id = value["id"]; + if (!layerValue.HasMember("id")) { + Log::Warning(Event::ParseStyle, "layer must have an id"); + continue; + } + + JSVal id = layerValue["id"]; if (!id.IsString()) { Log::Warning(Event::ParseStyle, "layer id must be a string"); - return nullptr; + continue; } - const std::string layer_id = { id.GetString(), id.GetStringLength() }; - - if (layers.find(layer_id) != layers.end()) { - Log::Warning(Event::ParseStyle, "duplicate layer id %s", layer_id.c_str()); - return nullptr; + const std::string layerID = { id.GetString(), id.GetStringLength() }; + if (layersMap.find(layerID) != layersMap.end()) { + Log::Warning(Event::ParseStyle, "duplicate layer id %s", layerID.c_str()); + continue; } // Parse paints already, as they can't be inherited anyway. std::map paints; - parsePaints(value, paints); + parsePaints(layerValue, paints); - util::ptr layer = std::make_shared( - layer_id, std::move(paints)); + util::ptr layer = std::make_shared(layerID, std::move(paints)); - // Store the layer ID so we can reference it later. - layers.emplace(layer_id, std::pair> { value, layer }); - - return layer; - } else { - Log::Warning(Event::ParseStyle, "layer must be an object"); - return nullptr; + layers.emplace_back(layer); + layersMap.emplace(layerID, std::pair> { layerValue, layer }); } -} -void StyleParser::parseLayers() { - for (auto &pair : layers) { + for (auto& pair : layersMap) { parseLayer(pair.second); } } @@ -924,8 +910,8 @@ void StyleParser::parseReference(JSVal value, util::ptr &layer) { return; } const std::string ref { value.GetString(), value.GetStringLength() }; - auto it = layers.find(ref); - if (it == layers.end()) { + auto it = layersMap.find(ref); + if (it == layersMap.end()) { Log::Warning(Event::ParseStyle, "layer '%s' references unknown layer %s", layer->id.c_str(), ref.c_str()); // We cannot parse this layer further. return; diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp index 736cb9e9f..9ef74c8dc 100644 --- a/src/mbgl/style/style_parser.hpp +++ b/src/mbgl/style/style_parser.hpp @@ -17,7 +17,6 @@ namespace mbgl { enum class ClassID : uint32_t; class StyleLayer; -class StyleLayerGroup; class StyleParser { public: @@ -27,8 +26,8 @@ public: void parse(JSVal document); - util::ptr getLayers() { - return root; + std::vector> getLayers() { + return layers; } std::string getSprite() const { @@ -44,10 +43,7 @@ private: JSVal replaceConstant(JSVal value); void parseSources(JSVal value); - - std::unique_ptr createLayers(JSVal value); - util::ptr createLayer(JSVal value); - void parseLayers(); + void parseLayers(JSVal value); void parseLayer(std::pair> &pair); void parsePaints(JSVal value, std::map &paints); void parsePaint(JSVal, ClassProperties &properties); @@ -97,10 +93,10 @@ private: std::unordered_map> sources; // This stores the root layer. - util::ptr root; + std::vector> layers; // This maps ids to Layer objects, with all items being at the root level. - std::unordered_map>> layers; + std::unordered_map>> layersMap; // Store a stack of layers we're parsing right now. This is to prevent reference cycles. std::forward_list stack; From 1db044d3c09cb7e628a7320cf6111c1df9ef2f82 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 11:19:25 -0700 Subject: [PATCH 2/5] Remove unused --- src/mbgl/map/tile_parser.cpp | 1 + src/mbgl/style/style.hpp | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp index 81706297e..bc6de4056 100644 --- a/src/mbgl/map/tile_parser.cpp +++ b/src/mbgl/map/tile_parser.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 04303b64b..e36fc4bb8 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -2,38 +2,31 @@ #define MBGL_STYLE_STYLE #include -#include #include #include #include +#include #include -#include #include -#include #include -#include #include namespace mbgl { -class Sprite; class StyleLayer; class Style : public util::noncopyable { public: - struct exception : std::runtime_error { exception(const char *msg) : std::runtime_error(msg) {} }; - Style(); ~Style(); void loadJSON(const uint8_t *const data); - size_t layerCount() const; void updateProperties(float z, std::chrono::steady_clock::time_point now); - void setDefaultTransitionDuration(std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero()); + void setDefaultTransitionDuration(std::chrono::steady_clock::duration); void cascadeClasses(const std::vector&); bool hasTransitions() const; @@ -41,7 +34,6 @@ public: const std::string &getSpriteURL() const; std::vector> layers; - std::vector appliedClasses; std::string glyph_url; std::string base; From db5e9d1302305b5db6483930e674728577e30ac3 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 11:22:32 -0700 Subject: [PATCH 3/5] Remove unused --- src/mbgl/style/style.cpp | 6 ------ src/mbgl/style/style.hpp | 1 - 2 files changed, 7 deletions(-) diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 895e8796b..2992715f4 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -33,12 +33,6 @@ void Style::updateProperties(float z, std::chrono::steady_clock::time_point now) for (const auto& layer : layers) { layer->updateProperties(z, now, zoomHistory); } - - // Apply transitions after the first time. - if (!initial_render_complete) { - initial_render_complete = true; - return; - } } const std::string &Style::getSpriteURL() const { diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index e36fc4bb8..63ad4a66e 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -40,7 +40,6 @@ public: private: std::string sprite_url; PropertyTransition defaultTransition; - bool initial_render_complete = false; std::unique_ptr mtx; ZoomHistory zoomHistory; }; From 71227e4645d10a10b3f71e4c21960e700968b28d Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 11:26:46 -0700 Subject: [PATCH 4/5] StyleLayer is noncopyable --- src/mbgl/style/style_layer.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp index a89206c1c..e33d51097 100644 --- a/src/mbgl/style/style_layer.hpp +++ b/src/mbgl/style/style_layer.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -19,7 +20,7 @@ namespace mbgl { class StyleBucket; -class StyleLayer { +class StyleLayer : public util::noncopyable { public: StyleLayer(const std::string &id, std::map &&styles); From 13991cf78677e6ea4fdd3ee623d46724f494880d Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 12:37:41 -0700 Subject: [PATCH 5/5] Rename methods to match gl-js --- src/mbgl/map/map.cpp | 6 +++--- src/mbgl/style/style.cpp | 17 +++++++++-------- src/mbgl/style/style.hpp | 5 ++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index e36c13a42..c4ad6efc5 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -796,7 +796,7 @@ void Map::loadStyleJSON(const std::string& json, const std::string& base) { style = std::make_shared