render single tile in source.cpp
This commit is contained in:
@@ -48,8 +48,7 @@ public:
|
||||
void renderLayers(std::shared_ptr<StyleLayerGroup> group);
|
||||
enum RenderPass { Opaque, Translucent };
|
||||
|
||||
void renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass);
|
||||
void renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, Tile::ID id);
|
||||
void renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id = nullptr);
|
||||
|
||||
// Forces a map update: always triggers a rerender.
|
||||
void update();
|
||||
|
||||
@@ -32,6 +32,7 @@ public:
|
||||
void drawClippingMasks(Painter &painter);
|
||||
size_t getTileCount() const;
|
||||
void render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc);
|
||||
void render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID &id);
|
||||
void finishRender(Painter &painter);
|
||||
|
||||
std::forward_list<Tile::ID> getIDs() const;
|
||||
|
||||
@@ -633,7 +633,7 @@ void Map::renderLayers(std::shared_ptr<StyleLayerGroup> group) {
|
||||
}
|
||||
}
|
||||
|
||||
void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass) {
|
||||
void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id) {
|
||||
if (layer_desc->layers && layer_desc->type != StyleLayerType::Raster) {
|
||||
// This is a layer group. We render them during our translucent render pass.
|
||||
if (pass == Translucent) {
|
||||
@@ -716,68 +716,10 @@ void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass) {
|
||||
std::cout << std::string(indent * 4, ' ') << "- " << layer_desc->id << " ("
|
||||
<< layer_desc->type << ")" << std::endl;
|
||||
}
|
||||
style_source.source->render(painter, layer_desc);
|
||||
if (!id) {
|
||||
style_source.source->render(painter, layer_desc);
|
||||
} else {
|
||||
style_source.source->render(painter, layer_desc, *id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, Tile::ID &id) {
|
||||
// if (!layer_desc->bucket) {
|
||||
// fprintf(stderr, "[WARNING] layer '%s' is missing bucket\n", layer_desc->id.c_str());
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// if (!layer_desc->bucket->style_source) {
|
||||
// fprintf(stderr, "[WARNING] can't find source for layer '%s'\n", layer_desc->id.c_str());
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// StyleSource &style_source = *layer_desc->bucket->style_source;
|
||||
//
|
||||
// // Skip this layer if there is no data.
|
||||
// if (!style_source.source) {
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// // Skip this layer if it's outside the range of min/maxzoom.
|
||||
// // This may occur when there /is/ a bucket created for this layer, but the min/max-zoom
|
||||
// // is set to a fractional value, or value that is larger than the source maxzoom.
|
||||
// const double zoom = state.getZoom();
|
||||
// if (layer_desc->bucket->min_zoom > zoom ||
|
||||
// layer_desc->bucket->max_zoom <= zoom) {
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// // Abort early if we can already deduce from the bucket type that
|
||||
// // we're not going to render anything anyway during this pass.
|
||||
// switch (layer_desc->type) {
|
||||
// case StyleLayerType::Fill:
|
||||
// if (!layer_desc->getProperties<FillProperties>().isVisible()) return;
|
||||
// break;
|
||||
// case StyleLayerType::Line:
|
||||
// if (pass == Opaque) return;
|
||||
// if (!layer_desc->getProperties<LineProperties>().isVisible()) return;
|
||||
// break;
|
||||
// case StyleLayerType::Icon:
|
||||
// if (pass == Opaque) return;
|
||||
// if (!layer_desc->getProperties<IconProperties>().isVisible()) return;
|
||||
// break;
|
||||
// case StyleLayerType::Text:
|
||||
// if (pass == Opaque) return;
|
||||
// if (!layer_desc->getProperties<TextProperties>().isVisible()) return;
|
||||
// break;
|
||||
// case StyleLayerType::Raster:
|
||||
// if (pass == Opaque) return;
|
||||
// if (!layer_desc->getProperties<RasterProperties>().isVisible()) return;
|
||||
// break;
|
||||
// default:
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// if (debug::renderTree) {
|
||||
// std::cout << std::string(indent * 4, ' ') << "- " << layer_desc->id << " ("
|
||||
// << layer_desc->type << ")" << std::endl;
|
||||
// }
|
||||
//// style_source.source->render(painter, layer_desc);
|
||||
// painter.renderTileLayer(id, layer_desc);
|
||||
//}
|
||||
|
||||
|
||||
@@ -87,6 +87,13 @@ void Source::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Source::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID &id) {
|
||||
auto it = tiles.find(id);
|
||||
if (it != tiles.end() && it->second->data && it->second->data->state == TileData::State::parsed) {
|
||||
painter.renderTileLayer(*it->second, layer_desc);
|
||||
}
|
||||
}
|
||||
|
||||
void Source::finishRender(Painter &painter) {
|
||||
for (std::pair<const Tile::ID, std::unique_ptr<Tile>> &pair : tiles) {
|
||||
|
||||
@@ -32,7 +32,7 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> lay
|
||||
|
||||
const mat4 oldMatrix = vtxMatrix;
|
||||
|
||||
const mat4 preMatrix = [&]{
|
||||
const mat4 vtxMatrix = [&]{
|
||||
mat4 vtxMatrix;
|
||||
matrix::ortho(vtxMatrix, -buffer, 4096 + buffer, -4096 - buffer, buffer, 0, 1);
|
||||
matrix::translate(vtxMatrix, vtxMatrix, 0, -4096, 0);
|
||||
@@ -42,22 +42,24 @@ void Painter::renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> lay
|
||||
// *id.matrix = vtxMatrix;
|
||||
|
||||
|
||||
map.state.matrixFor(matrix, id);
|
||||
matrix::ortho(vtxMatrix, -buffer, 4096 + buffer, -4096 - buffer, buffer, 0, 1);
|
||||
matrix::translate(vtxMatrix, vtxMatrix, 0, -4096, 0);
|
||||
|
||||
|
||||
// glUniformMatrix4fv(matrix, 1, GL_FALSE, preMatrix.data());
|
||||
|
||||
// call updateTiles to get parsed data for sublayers
|
||||
map.updateTiles();
|
||||
|
||||
// map.state.matrixFor(matrix, id);
|
||||
// matrix::ortho(matrix, -buffer, 4096 + buffer, -4096 - buffer, buffer, 0, 1);
|
||||
// matrix::translate(matrix, matrix, 0, -4096, 0);
|
||||
|
||||
|
||||
int i = 0;
|
||||
for (auto it = layer_desc->layers->layers.begin(), end = layer_desc->layers->layers.end(); it != end; ++it, --i) {
|
||||
setOpaque();
|
||||
map.renderLayer(*it, Map::RenderPass::Opaque);
|
||||
map.renderLayer(*it, Map::RenderPass::Opaque, &id);
|
||||
setTranslucent();
|
||||
map.renderLayer(*it, Map::RenderPass::Translucent);
|
||||
map.renderLayer(*it, Map::RenderPass::Translucent, &id);
|
||||
}
|
||||
|
||||
// TODO make a separate renderLayer overload that takes a prerendered + tileID
|
||||
|
||||
Reference in New Issue
Block a user