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

Don't pass Worker& around so much

Browse Source
This commit is contained in:
John Firebaugh
2015-06-09 10:08:20 -04:00
parent abdf205510
commit db1202e8e3
8 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mbgl/map/source.cpp
View File

@@ -225,7 +225,7 @@ TileData::State Source::hasTile(const TileID& id) {
return TileData::State::invalid;
}
bool Source::handlePartialTile(const TileID& id, Worker& worker) {
bool Source::handlePartialTile(const TileID& id, Worker&) {
const TileID normalized_id = id.normalized();
auto it = tile_data.find(normalized_id);
@@ -248,7 +248,7 @@ bool Source::handlePartialTile(const TileID& id, Worker& worker) {
}
};
return data->reparse(worker, callback);
return data->reparse(callback);
}
TileData::State Source::addTile(MapData& data,
@@ -293,16 +293,15 @@ TileData::State Source::addTile(MapData& data,
new_tile.data =
std::make_shared<VectorTileData>(normalized_id, style, info,
transformState.getAngle(), data.getCollisionDebug());
new_tile.data->request(style.workers, transformState.getPixelRatio(), callback);
new_tile.data->request(transformState.getPixelRatio(), callback);
} else if (info.type == SourceType::Raster) {
new_tile.data = std::make_shared<RasterTileData>(normalized_id, texturePool, info);
new_tile.data->request(
style.workers, transformState.getPixelRatio(), callback);
new_tile.data = std::make_shared<RasterTileData>(normalized_id, texturePool, info, style.workers);
new_tile.data->request(transformState.getPixelRatio(), callback);
} else if (info.type == SourceType::Annotations) {
new_tile.data = std::make_shared<LiveTileData>(normalized_id, data.annotationManager,
style, info,
transformState.getAngle(), data.getCollisionDebug());
new_tile.data->reparse(style.workers, callback);
new_tile.data->reparse(callback);
} else {
throw std::runtime_error("source type not implemented");
}