tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add forward-declared Source shared_ptr to style_bucket

Browse Source
This commit is contained in:
Mike Morris
2014-07-11 16:49:39 -07:00
parent 86c5367bae
commit 5bc77d4243
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/map.cpp
View File

@@ -183,7 +183,7 @@ std::string Map::getStyleJSON() const {
return styleJSON;
}
void Map::setAccessToken( std::string access_token) {
void Map::setAccessToken(std::string access_token) {
accessToken.swap(access_token);
}
@@ -426,7 +426,8 @@ void Map::updateSources(const std::shared_ptr<StyleLayerGroup> &group) {
if (!layer) continue;
if (layer->bucket) {
if (layer->bucket->style_source) {
activeSources.emplace(std::make_shared<Source>(*layer->bucket->style_source, this->getAccessToken()));
auto ret = activeSources.emplace(std::make_shared<Source>(*layer->bucket->style_source, this->getAccessToken()));
layer->bucket->source = *ret.first;
}
} else if (layer->layers) {
updateSources(layer->layers);
@@ -659,8 +660,6 @@ void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass) {
<< layer_desc->type << ")" << std::endl;
}
// TODO: THIS IS BAD, FIXME
Source source(*layer_desc->bucket->style_source, this->getAccessToken());
source.render(painter, layer_desc);
layer_desc->bucket->source->render(painter, layer_desc);
}
}