summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mbgl/renderer/painter.cpp6
-rw-r--r--src/mbgl/renderer/painter_debug.cpp2
-rw-r--r--src/mbgl/renderer/painter_fill.cpp8
-rw-r--r--src/mbgl/source/source.cpp27
-rw-r--r--src/mbgl/style/style.cpp2
-rw-r--r--src/mbgl/tile/tile.hpp8
6 files changed, 27 insertions, 26 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 92ea94ba4b..42b17b5b65 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -251,12 +251,12 @@ void Painter::renderPass(RenderPass pass_,
layer.as<CustomLayer>()->render(state);
config.setDirty();
} else {
- MBGL_DEBUG_GROUP(layer.id + " - " + std::string(item.tile->id));
+ assert(item.tile->data);
+ MBGL_DEBUG_GROUP(layer.id + " - " + std::string(item.tile->data->id));
if (item.bucket->needsClipping()) {
setClipping(item.tile->clip);
}
- const UnwrappedTileID tileID{ item.tile->id.sourceZ, item.tile->id.x, item.tile->id.y };
- item.bucket->render(*this, layer, tileID, item.tile->matrix);
+ item.bucket->render(*this, layer, item.tile->id, item.tile->matrix);
}
}
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index d46e0dda5c..6139eff9d4 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -9,7 +9,7 @@
using namespace mbgl;
void Painter::renderTileDebug(const Tile& tile) {
- MBGL_DEBUG_GROUP(std::string { "debug " } + std::string(tile.id));
+ MBGL_DEBUG_GROUP(std::string { "debug " } + util::toString(tile.id));
assert(tile.data);
if (frame.debugOptions != MapDebugOptions::NoDebug) {
setClipping(tile.clip);
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
index 6c23608c18..83a15d111c 100644
--- a/src/mbgl/renderer/painter_fill.cpp
+++ b/src/mbgl/renderer/painter_fill.cpp
@@ -137,12 +137,12 @@ void Painter::renderFill(FillBucket& bucket,
outlinePatternShader->u_mix = properties.fillPattern.value.t;
outlinePatternShader->u_patternscale_a = {{
- 1.0f / id.pixelsToTileUnits(imageSizeScaledA[0], state.getIntegerZoom()),
- 1.0f / id.pixelsToTileUnits(imageSizeScaledB[1], state.getIntegerZoom())
+ 1.0f / tileID.pixelsToTileUnits(imageSizeScaledA[0], state.getIntegerZoom()),
+ 1.0f / tileID.pixelsToTileUnits(imageSizeScaledB[1], state.getIntegerZoom())
}};
outlinePatternShader->u_patternscale_b = {{
- 1.0f / id.pixelsToTileUnits(imageSizeScaledB[0], state.getIntegerZoom()),
- 1.0f / id.pixelsToTileUnits(imageSizeScaledB[1], state.getIntegerZoom())
+ 1.0f / tileID.pixelsToTileUnits(imageSizeScaledB[0], state.getIntegerZoom()),
+ 1.0f / tileID.pixelsToTileUnits(imageSizeScaledB[1], state.getIntegerZoom())
}};
outlinePatternShader->u_offset_a = std::array<float, 2>{{offsetAx, offsetAy}};
diff --git a/src/mbgl/source/source.cpp b/src/mbgl/source/source.cpp
index 1a961ac0c4..ae7999f3a7 100644
--- a/src/mbgl/source/source.cpp
+++ b/src/mbgl/source/source.cpp
@@ -163,7 +163,7 @@ void Source::load(FileSource& fileSource) {
void Source::updateMatrices(const mat4 &projMatrix, const TransformState &transform) {
for (const auto& pair : tiles) {
auto& tile = *pair.second;
- transform.matrixFor(tile.matrix, UnwrappedTileID{ tile.id.sourceZ, tile.id.x, tile.id.y });
+ transform.matrixFor(tile.matrix, tile.id);
matrix::multiply(tile.matrix, projMatrix, tile.matrix);
}
}
@@ -180,8 +180,7 @@ std::map<UnwrappedTileID, Renderable> Source::getRenderables() const {
for (const auto& pair : tiles) {
auto& tile = *pair.second;
if (tile.data->isReady() && tile.data->hasData()) {
- renderables.emplace(UnwrappedTileID{ tile.id.sourceZ, tile.id.x, tile.id.y },
- Renderable{ tile.clip });
+ renderables.emplace(tile.id, Renderable{ tile.clip });
}
}
return renderables;
@@ -195,7 +194,7 @@ TileData::State Source::hasTile(const TileID& tileID) {
auto it = tiles.find(tileID);
if (it != tiles.end()) {
Tile& tile = *it->second;
- if (tile.id == tileID && tile.data) {
+ if (it->first == tileID && tile.data) {
return tile.data->getState();
}
}
@@ -227,7 +226,7 @@ TileData::State Source::addTile(const TileID& tileID, const StyleUpdateParameter
return state;
}
- auto newTile = std::make_unique<Tile>(tileID);
+ auto newTile = std::make_unique<Tile>(UnwrappedTileID{ tileID.sourceZ, tileID.x, tileID.y });
// We couldn't find the tile in the list. Create a new one.
// Try to find the associated TileData object.
@@ -426,15 +425,16 @@ bool Source::update(const StyleUpdateParameters& parameters) {
// the required list.
std::set<TileID> retain_data;
util::erase_if(tiles, [this, &retain, &retain_data, &tileCache](std::pair<const TileID, std::unique_ptr<Tile>> &pair) {
+ const auto& tileID = pair.first;
Tile &tile = *pair.second;
- bool obsolete = std::find(retain.begin(), retain.end(), tile.id) == retain.end();
+ bool obsolete = std::find(retain.begin(), retain.end(), tileID) == retain.end();
if (!obsolete) {
retain_data.insert(tile.data->id);
} else if (type != SourceType::Raster && tile.data->getState() == TileData::State::parsed) {
// Partially parsed tiles are never added to the cache because otherwise
// they never get updated if the go out from the viewport and the pending
// resources arrive.
- tileCache.add(tile.id.normalized().to_uint64(), tile.data);
+ tileCache.add(tileID.normalized().to_uint64(), tile.data);
}
return obsolete;
});
@@ -523,10 +523,11 @@ std::unordered_map<std::string, std::vector<Feature>> Source::queryRenderedFeatu
for (auto& tilePtr : tilePtrs) {
auto& tile = *tilePtr;
- uint64_t integerID = tile.id.to_uint64();
+ const TileID& tileID = tile.data->id;
+ const auto integerID = tileID.to_uint64();
- auto tileSpaceBoundsMin = coordinateToTilePoint(tile.id, { minX, minY, z });
- auto tileSpaceBoundsMax = coordinateToTilePoint(tile.id, { maxX, maxY, z });
+ auto tileSpaceBoundsMin = coordinateToTilePoint(tileID, { minX, minY, z });
+ auto tileSpaceBoundsMax = coordinateToTilePoint(tileID, { maxX, maxY, z });
if (tileSpaceBoundsMin.x >= util::EXTENT || tileSpaceBoundsMin.y >= util::EXTENT ||
tileSpaceBoundsMax.x < 0 || tileSpaceBoundsMax.y < 0) continue;
@@ -534,7 +535,7 @@ std::unordered_map<std::string, std::vector<Feature>> Source::queryRenderedFeatu
GeometryCoordinates tileSpaceQueryGeometry;
for (auto& c : queryGeometry) {
- tileSpaceQueryGeometry.push_back(coordinateToTilePoint(tile.id, c));
+ tileSpaceQueryGeometry.push_back(coordinateToTilePoint(tileID, c));
}
auto it = tileQueries.find(integerID);
@@ -544,8 +545,8 @@ std::unordered_map<std::string, std::vector<Feature>> Source::queryRenderedFeatu
tileQueries.emplace(integerID, TileQuery{
tilePtr,
{ tileSpaceQueryGeometry },
- util::tileSize * std::pow(2, tile.id.z - tile.id.sourceZ),
- std::pow(2, zoom - tile.id.z)
+ util::tileSize * std::pow(2, tileID.z - tileID.sourceZ),
+ std::pow(2, zoom - tileID.z)
});
}
}
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 5e0a087fdb..01c566308e 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -295,7 +295,7 @@ RenderData Style::getRenderData() const {
// already a bucket from this layer that is a parent of this tile. Tiles are ordered
// by zoom level when we obtain them from getTiles().
for (auto it = result.order.rbegin(); it != result.order.rend() && (&it->layer == layer.get()); ++it) {
- if (tile->id.isChildOf(it->tile->id)) {
+ if (tile->data->id.isChildOf(it->tile->data->id)) {
skip = true;
break;
}
diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 8b9030f1bd..5cb23f58f3 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -1,11 +1,11 @@
#ifndef MBGL_MAP_TILE
#define MBGL_MAP_TILE
+#include <mbgl/tile/tile_id.hpp>
#include <mbgl/util/mat4.hpp>
#include <mbgl/util/noncopyable.hpp>
#include <mbgl/util/ptr.hpp>
#include <mbgl/util/clip_id.hpp>
-#include <mbgl/map/tile_id.hpp>
namespace mbgl {
@@ -14,10 +14,10 @@ struct box;
class Tile : private util::noncopyable {
public:
- explicit Tile(const TileID& id_)
- : id(id_) {}
+ Tile(const UnwrappedTileID& id_) : id(id_) {
+ }
- const TileID id;
+ const UnwrappedTileID id;
ClipID clip;
mat4 matrix;
util::ptr<TileData> data;
View Lorry Controller Status