Remove unused

This commit is contained in:
John Firebaugh
2015-04-03 11:18:57 -07:00
parent cca7f6978a
commit 41c4d50f8a
4 changed files with 4 additions and 15 deletions

View File

@@ -107,13 +107,6 @@ void Source::render(Painter &painter, const StyleLayer &layer_desc) {
}
}
void Source::render(Painter &painter, const StyleLayer &layer_desc, const Tile::ID &id, const mat4 &matrix) {
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, matrix);
}
}
void Source::finishRender(Painter &painter) {
for (const auto& pair : tiles) {
Tile &tile = *pair.second;

View File

@@ -43,7 +43,6 @@ public:
void drawClippingMasks(Painter &painter);
size_t getTileCount() const;
void render(Painter &painter, const StyleLayer &layer_desc);
void render(Painter &painter, const StyleLayer &layer_desc, const Tile::ID &id, const mat4 &matrix);
void finishRender(Painter &painter);
std::forward_list<Tile::ID> getIDs() const;

View File

@@ -284,7 +284,7 @@ void Painter::render(const Style& style, const std::set<util::ptr<StyleSource>>&
}
}
void Painter::renderLayer(const StyleLayer &layer_desc, const Tile::ID* id, const mat4* matrix) {
void Painter::renderLayer(const StyleLayer &layer_desc) {
if (layer_desc.bucket->visibility == VisibilityType::None) return;
if (layer_desc.type == StyleLayerType::Background) {
// This layer defines a background color/image.
@@ -349,11 +349,8 @@ void Painter::renderLayer(const StyleLayer &layer_desc, const Tile::ID* id, cons
Log::Info(Event::Render, "%*s- %s (%s)", indent * 4, "", layer_desc.id.c_str(),
StyleLayerTypeClass(layer_desc.type).c_str());
}
if (!id) {
style_source.source->render(*this, layer_desc);
} else {
style_source.source->render(*this, layer_desc, *id, *matrix);
}
style_source.source->render(*this, layer_desc);
}
}

View File

@@ -80,7 +80,7 @@ public:
TransformState state,
TimePoint time);
void renderLayer(const StyleLayer &layer_desc, const Tile::ID* id = nullptr, const mat4* matrix = nullptr);
void renderLayer(const StyleLayer&);
// Renders a particular layer from a tile.
void renderTileLayer(const Tile& tile, const StyleLayer &layer_desc, const mat4 &matrix);