[core] support tiles with non-4096 extents
Convert all geometries to the maximum extent supported by our buffers and then use that constant extent everywhere else.
This commit is contained in:
@@ -10,6 +10,7 @@ namespace mbgl {
|
||||
namespace util {
|
||||
|
||||
extern const float tileSize;
|
||||
extern const int32_t EXTENT;
|
||||
|
||||
extern const double DEG2RAD;
|
||||
extern const double RAD2DEG;
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
],
|
||||
"devDependencies": {
|
||||
"aws-sdk": "^2.2.21",
|
||||
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#7a17d43bd8482a01dc165de6fff6ae4c33c4fc5d",
|
||||
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#67fe48d058c23dbb4a8ac36ce0270185da3045a8",
|
||||
"node-gyp": "^3.2.1",
|
||||
"request": "^2.67.0",
|
||||
"tape": "^4.2.2"
|
||||
|
||||
@@ -17,6 +17,7 @@ public:
|
||||
FeatureType getType() const override { return type; }
|
||||
optional<Value> getValue(const std::string&) const override;
|
||||
GeometryCollection getGeometries() const override { return geometries; }
|
||||
uint32_t getExtent() const override { return 4096; }
|
||||
|
||||
const FeatureType type;
|
||||
const std::unordered_map<std::string, std::string> properties;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include <mbgl/layer/circle_layer.hpp>
|
||||
#include <mbgl/style/style_bucket_parameters.hpp>
|
||||
#include <mbgl/renderer/circle_bucket.hpp>
|
||||
#include <mbgl/util/get_geometries.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
@@ -45,7 +46,7 @@ std::unique_ptr<Bucket> CircleLayer::createBucket(StyleBucketParameters& paramet
|
||||
auto bucket = std::make_unique<CircleBucket>();
|
||||
|
||||
parameters.eachFilteredFeature(filter, [&] (const auto& feature) {
|
||||
bucket->addGeometry(feature.getGeometries());
|
||||
bucket->addGeometry(getGeometries(feature));
|
||||
});
|
||||
|
||||
return std::move(bucket);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include <mbgl/layer/fill_layer.hpp>
|
||||
#include <mbgl/style/style_bucket_parameters.hpp>
|
||||
#include <mbgl/renderer/fill_bucket.hpp>
|
||||
#include <mbgl/util/get_geometries.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
@@ -58,7 +59,7 @@ std::unique_ptr<Bucket> FillLayer::createBucket(StyleBucketParameters& parameter
|
||||
auto bucket = std::make_unique<FillBucket>();
|
||||
|
||||
parameters.eachFilteredFeature(filter, [&] (const auto& feature) {
|
||||
bucket->addGeometry(feature.getGeometries());
|
||||
bucket->addGeometry(getGeometries(feature));
|
||||
});
|
||||
|
||||
return std::move(bucket);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <mbgl/style/style_bucket_parameters.hpp>
|
||||
#include <mbgl/renderer/line_bucket.hpp>
|
||||
#include <mbgl/map/tile_id.hpp>
|
||||
#include <mbgl/util/get_geometries.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
@@ -79,7 +80,7 @@ std::unique_ptr<Bucket> LineLayer::createBucket(StyleBucketParameters& parameter
|
||||
bucket->layout.roundLimit.calculate(p);
|
||||
|
||||
parameters.eachFilteredFeature(filter, [&] (const auto& feature) {
|
||||
bucket->addGeometry(feature.getGeometries());
|
||||
bucket->addGeometry(getGeometries(feature));
|
||||
});
|
||||
|
||||
return std::move(bucket);
|
||||
|
||||
@@ -32,6 +32,7 @@ public:
|
||||
virtual FeatureType getType() const = 0;
|
||||
virtual optional<Value> getValue(const std::string& key) const = 0;
|
||||
virtual GeometryCollection getGeometries() const = 0;
|
||||
virtual uint32_t getExtent() const = 0;
|
||||
};
|
||||
|
||||
class GeometryTileLayer : private util::noncopyable {
|
||||
|
||||
@@ -21,7 +21,7 @@ void TransformState::matrixFor(mat4& matrix, const TileID& id, const int8_t z) c
|
||||
|
||||
matrix::identity(matrix);
|
||||
matrix::translate(matrix, matrix, id.x * s, id.y * s, 0);
|
||||
matrix::scale(matrix, matrix, s / 4096.0f, s / 4096.0f, 1);
|
||||
matrix::scale(matrix, matrix, s / util::EXTENT, s / util::EXTENT, 1);
|
||||
}
|
||||
|
||||
void TransformState::getProjMatrix(mat4& projMatrix) const {
|
||||
|
||||
@@ -130,6 +130,10 @@ GeometryCollection VectorTileFeature::getGeometries() const {
|
||||
return lines;
|
||||
}
|
||||
|
||||
uint32_t VectorTileFeature::getExtent() const {
|
||||
return layer.extent;
|
||||
}
|
||||
|
||||
VectorTile::VectorTile(std::shared_ptr<const std::string> data_)
|
||||
: data(std::move(data_)) {
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ public:
|
||||
FeatureType getType() const override { return type; }
|
||||
optional<Value> getValue(const std::string&) const override;
|
||||
GeometryCollection getGeometries() const override;
|
||||
uint32_t getExtent() const override;
|
||||
|
||||
private:
|
||||
const VectorTileLayer& layer;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <mbgl/shader/circle_shader.hpp>
|
||||
#include <mbgl/layer/circle_layer.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
@@ -31,14 +32,13 @@ bool CircleBucket::hasData() const {
|
||||
}
|
||||
|
||||
void CircleBucket::addGeometry(const GeometryCollection& geometryCollection) {
|
||||
const int extent = 4096;
|
||||
for (auto& circle : geometryCollection) {
|
||||
for(auto & geometry : circle) {
|
||||
auto x = geometry.x;
|
||||
auto y = geometry.y;
|
||||
|
||||
// Do not include points that are outside the tile boundaries.
|
||||
if (x < 0 || x >= extent || y < 0 || y >= extent) continue;
|
||||
if (x < 0 || x >= util::EXTENT || y < 0 || y >= util::EXTENT) continue;
|
||||
|
||||
// this geometry will be of the Point type, and we'll derive
|
||||
// two triangles from it.
|
||||
|
||||
@@ -344,8 +344,7 @@ mat4 Painter::translatedMatrix(const mat4& matrix, const std::array<float, 2> &t
|
||||
if (translation[0] == 0 && translation[1] == 0) {
|
||||
return matrix;
|
||||
} else {
|
||||
// TODO: Get rid of the 8 (scaling from 4096 to tile size)
|
||||
const double factor = ((double)(1 << id.z)) / state.getScale() * (4096.0 / util::tileSize / id.overscaling);
|
||||
const double factor = ((double)(1 << id.z)) / state.getScale() * (util::EXTENT / util::tileSize / id.overscaling);
|
||||
|
||||
mat4 vtxMatrix;
|
||||
if (anchor == TranslateAnchorType::Viewport) {
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
|
||||
#include <array>
|
||||
#include <vector>
|
||||
@@ -129,8 +130,8 @@ private:
|
||||
// used to composite images and flips the geometry upside down
|
||||
const mat4 flipMatrix = []{
|
||||
mat4 flip;
|
||||
matrix::ortho(flip, 0, 4096, -4096, 0, 0, 1);
|
||||
matrix::translate(flip, flip, 0, -4096, 0);
|
||||
matrix::ortho(flip, 0, util::EXTENT, -util::EXTENT, 0, 0, 1);
|
||||
matrix::translate(flip, flip, 0, -util::EXTENT, 0);
|
||||
return flip;
|
||||
}();
|
||||
|
||||
@@ -186,13 +187,13 @@ private:
|
||||
StaticVertexBuffer tileStencilBuffer = {
|
||||
// top left triangle
|
||||
{ 0, 0 },
|
||||
{ 4096, 0 },
|
||||
{ 0, 4096 },
|
||||
{ util::EXTENT, 0 },
|
||||
{ 0, util::EXTENT },
|
||||
|
||||
// bottom right triangle
|
||||
{ 4096, 0 },
|
||||
{ 0, 4096 },
|
||||
{ 4096, 4096 },
|
||||
{ util::EXTENT, 0 },
|
||||
{ 0, util::EXTENT },
|
||||
{ util::EXTENT, util::EXTENT },
|
||||
};
|
||||
|
||||
VertexArrayObject coveringPlainArray;
|
||||
@@ -201,9 +202,9 @@ private:
|
||||
// Set up the tile boundary lines we're using to draw the tile outlines.
|
||||
StaticVertexBuffer tileBorderBuffer = {
|
||||
{ 0, 0 },
|
||||
{ 4096, 0 },
|
||||
{ 4096, 4096 },
|
||||
{ 0, 4096 },
|
||||
{ util::EXTENT, 0 },
|
||||
{ util::EXTENT, util::EXTENT },
|
||||
{ 0, util::EXTENT },
|
||||
{ 0, 0 },
|
||||
};
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ void Painter::renderFill(FillBucket& bucket, const FillLayer& layer, const TileI
|
||||
|
||||
// Image fill.
|
||||
if (pass == RenderPass::Translucent && posA && posB) {
|
||||
float factor = (8.0 / std::pow(2, state.getIntegerZoom() - id.z)) / id.overscaling;
|
||||
float factor = (util::EXTENT / util::tileSize / std::pow(2, state.getIntegerZoom() - id.z)) / id.overscaling;
|
||||
|
||||
mat3 patternMatrixA;
|
||||
matrix::identity(patternMatrixA);
|
||||
|
||||
@@ -51,7 +51,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI
|
||||
color[2] *= properties.opacity;
|
||||
color[3] *= properties.opacity;
|
||||
|
||||
float ratio = state.getScale() / std::pow(2, id.z) / (4096.0 / (512.0 * id.overscaling));
|
||||
float ratio = state.getScale() / std::pow(2, id.z) / (util::EXTENT / (512.0 * id.overscaling));
|
||||
|
||||
mat2 antialiasingMatrix;
|
||||
matrix::identity(antialiasingMatrix);
|
||||
@@ -83,7 +83,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI
|
||||
LinePatternPos posB = lineAtlas->getDashPosition(properties.dasharray.value.to, layout.cap == CapType::Round);
|
||||
lineAtlas->bind();
|
||||
|
||||
float patternratio = std::pow(2.0, std::floor(::log2(state.getScale())) - id.z) / 8.0 * id.overscaling;
|
||||
float patternratio = std::pow(2.0, std::floor(::log2(state.getScale())) - id.z) / (util::EXTENT / util::tileSize) * id.overscaling;
|
||||
float scaleXA = patternratio / posA.width / properties.dashLineWidth / properties.dasharray.value.fromScale;
|
||||
float scaleYA = -posA.height / 2.0;
|
||||
float scaleXB = patternratio / posB.width / properties.dashLineWidth / properties.dasharray.value.toScale;
|
||||
@@ -109,7 +109,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI
|
||||
if (!imagePosA || !imagePosB)
|
||||
return;
|
||||
|
||||
float factor = 4096.0 / (512 * id.overscaling) / std::pow(2, state.getIntegerZoom() - id.z);
|
||||
float factor = util::EXTENT / (512 * id.overscaling) / std::pow(2, state.getIntegerZoom() - id.z);
|
||||
|
||||
config.program = linepatternShader->program;
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ void Painter::renderSDF(SymbolBucket &bucket,
|
||||
|
||||
if (skewed) {
|
||||
matrix::identity(exMatrix);
|
||||
s = 4096.0f / util::tileSize / id.overscaling / std::pow(2, state.getZoom() - id.z);
|
||||
s = util::EXTENT / util::tileSize / id.overscaling / std::pow(2, state.getZoom() - id.z);
|
||||
gammaScale = 1.0f / std::cos(state.getPitch());
|
||||
} else {
|
||||
exMatrix = extrudeMatrix;
|
||||
@@ -211,7 +211,7 @@ void Painter::renderSymbol(SymbolBucket& bucket, const SymbolLayer& layer, const
|
||||
|
||||
if (skewed) {
|
||||
matrix::identity(exMatrix);
|
||||
s = 4096.0f / util::tileSize / id.overscaling / std::pow(2, state.getZoom() - id.z);
|
||||
s = util::EXTENT / util::tileSize / id.overscaling / std::pow(2, state.getZoom() - id.z);
|
||||
} else {
|
||||
exMatrix = extrudeMatrix;
|
||||
matrix::rotate_z(exMatrix, exMatrix, state.getNorthOrientationAngle());
|
||||
|
||||
@@ -24,6 +24,8 @@
|
||||
#include <mbgl/util/merge_lines.hpp>
|
||||
#include <mbgl/util/clip_lines.hpp>
|
||||
#include <mbgl/util/std.hpp>
|
||||
#include <mbgl/util/get_geometries.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
@@ -54,7 +56,7 @@ SymbolInstance::SymbolInstance(Anchor& anchor, const std::vector<Coordinate>& li
|
||||
|
||||
|
||||
SymbolBucket::SymbolBucket(float overscaling_, float zoom_, const MapMode mode_)
|
||||
: overscaling(overscaling_), zoom(zoom_), tileSize(512 * overscaling_), tilePixelRatio(tileExtent / tileSize), mode(mode_) {
|
||||
: overscaling(overscaling_), zoom(zoom_), tileSize(512 * overscaling_), tilePixelRatio(util::EXTENT / tileSize), mode(mode_) {
|
||||
}
|
||||
|
||||
SymbolBucket::~SymbolBucket() {
|
||||
@@ -141,7 +143,7 @@ void SymbolBucket::parseFeatures(const GeometryTileLayer& layer,
|
||||
|
||||
auto &multiline = ft.geometry;
|
||||
|
||||
GeometryCollection geometryCollection = feature->getGeometries();
|
||||
GeometryCollection geometryCollection = getGeometries(*feature);
|
||||
for (auto& line : geometryCollection) {
|
||||
multiline.emplace_back();
|
||||
for (auto& point : line) {
|
||||
@@ -295,7 +297,7 @@ void SymbolBucket::addFeature(const std::vector<std::vector<Coordinate>> &lines,
|
||||
const float textRepeatDistance = symbolSpacing / 2;
|
||||
|
||||
auto& clippedLines = isLine ?
|
||||
util::clipLines(lines, 0, 0, 4096, 4096) :
|
||||
util::clipLines(lines, 0, 0, util::EXTENT, util::EXTENT) :
|
||||
lines;
|
||||
|
||||
for (const auto& line : clippedLines) {
|
||||
@@ -314,7 +316,7 @@ void SymbolBucket::addFeature(const std::vector<std::vector<Coordinate>> &lines,
|
||||
}
|
||||
}
|
||||
|
||||
const bool inside = !(anchor.x < 0 || anchor.x > 4096 || anchor.y < 0 || anchor.y > 4096);
|
||||
const bool inside = !(anchor.x < 0 || anchor.x > util::EXTENT || anchor.y < 0 || anchor.y > util::EXTENT);
|
||||
|
||||
if (avoidEdges && !inside) continue;
|
||||
|
||||
|
||||
@@ -117,7 +117,6 @@ private:
|
||||
const float overscaling;
|
||||
const float zoom;
|
||||
const float tileSize;
|
||||
const float tileExtent = 4096.0f;
|
||||
const float tilePixelRatio;
|
||||
const MapMode mode;
|
||||
|
||||
|
||||
@@ -8,6 +8,6 @@ varying vec2 v_pos;
|
||||
|
||||
void main() {
|
||||
gl_Position = u_matrix * vec4(a_pos, 0, 1);
|
||||
float dimension = (4096.0 + 2.0 * u_buffer);
|
||||
float dimension = (8192.0 + 2.0 * u_buffer);
|
||||
v_pos = (a_pos / dimension) + (u_buffer / dimension);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <mbgl/text/collision_tile.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#include <cmath>
|
||||
|
||||
namespace mbgl {
|
||||
@@ -10,11 +11,11 @@ CollisionTile::CollisionTile(PlacementConfig config_) : config(config_),
|
||||
// left
|
||||
CollisionBox(vec2<float>(0, 0), 0, -infinity, 0, infinity, infinity),
|
||||
// right
|
||||
CollisionBox(vec2<float>(extent, 0), 0, -infinity, 0, infinity, infinity),
|
||||
CollisionBox(vec2<float>(util::EXTENT, 0), 0, -infinity, 0, infinity, infinity),
|
||||
// top
|
||||
CollisionBox(vec2<float>(0, 0), -infinity, 0, infinity, 0, infinity),
|
||||
// bottom
|
||||
CollisionBox(vec2<float>(0, extent), -infinity, 0, infinity, 0, infinity),
|
||||
CollisionBox(vec2<float>(0, util::EXTENT), -infinity, 0, infinity, 0, infinity),
|
||||
}}) {
|
||||
tree.clear();
|
||||
|
||||
|
||||
@@ -55,7 +55,6 @@ private:
|
||||
Tree tree;
|
||||
std::array<float, 4> rotationMatrix;
|
||||
std::array<float, 4> reverseRotationMatrix;
|
||||
const float extent = 4096;
|
||||
std::array<CollisionBox, 4> edges;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <mbgl/text/get_anchors.hpp>
|
||||
#include <mbgl/text/check_max_angle.hpp>
|
||||
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#include <mbgl/util/interpolate.hpp>
|
||||
|
||||
#include <cmath>
|
||||
@@ -31,7 +31,7 @@ Anchors resample(const std::vector<Coordinate> &line, const float offset, const
|
||||
x = util::interpolate(float(a.x), float(b.x), t),
|
||||
y = util::interpolate(float(a.y), float(b.y), t);
|
||||
|
||||
if (x >= 0 && x < 4096 && y >= 0 && y < 4096) {
|
||||
if (x >= 0 && x < util::EXTENT && y >= 0 && y < util::EXTENT) {
|
||||
Anchor anchor(::round(x), ::round(y), angle, 0.5f, i);
|
||||
|
||||
if (!angleWindowSize || checkMaxAngle(line, anchor, labelLength, angleWindowSize, maxAngle)) {
|
||||
@@ -71,7 +71,7 @@ Anchors getAnchors(const std::vector<Coordinate> &line, float spacing,
|
||||
const float labelLength = fmax(textRight - textLeft, iconRight - iconLeft);
|
||||
|
||||
// Is the line continued from outside the tile boundary?
|
||||
const bool continuedLine = (line[0].x == 0 || line[0].x == 4096 || line[0].y == 0 || line[0].y == 4096);
|
||||
const bool continuedLine = (line[0].x == 0 || line[0].x == util::EXTENT || line[0].y == 0 || line[0].y == util::EXTENT);
|
||||
|
||||
// Is the label long, relative to the spacing?
|
||||
// If so, adjust the spacing so there is always a minimum space of `spacing / 4` between label edges.
|
||||
|
||||
@@ -25,6 +25,7 @@ public:
|
||||
FeatureType getType() const override;
|
||||
optional<Value> getValue(const std::string&) const override;
|
||||
GeometryCollection getGeometries() const override;
|
||||
uint32_t getExtent() const override { return 4096; }
|
||||
|
||||
private:
|
||||
const FeatureType type;
|
||||
|
||||
@@ -2,6 +2,18 @@
|
||||
|
||||
const float mbgl::util::tileSize = 512.0f;
|
||||
|
||||
/*
|
||||
* The maximum extent of a feature that can be safely stored in the buffer.
|
||||
* In practice, all features are converted to this extent before being added.
|
||||
*
|
||||
* Positions are stored as signed 16bit integers.
|
||||
* One bit is lost for signedness to support featuers extending past the left edge of the tile.
|
||||
* One bit is lost because the line vertex buffer packs 1 bit of other data into the int.
|
||||
* One bit is lost to support features extending past the extent on the right edge of the tile.
|
||||
* This leaves us with 2^13 = 8192
|
||||
*/
|
||||
const int32_t mbgl::util::EXTENT = 8192;
|
||||
|
||||
const double mbgl::util::DEG2RAD = M_PI / 180.0;
|
||||
const double mbgl::util::RAD2DEG = 180.0 / M_PI;
|
||||
const double mbgl::util::M2PI = 2 * M_PI;
|
||||
|
||||
19
src/mbgl/util/get_geometries.cpp
Normal file
19
src/mbgl/util/get_geometries.cpp
Normal file
@@ -0,0 +1,19 @@
|
||||
#include <mbgl/util/get_geometries.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
GeometryCollection getGeometries(const GeometryTileFeature& feature) {
|
||||
const float scale = float(util::EXTENT) / feature.getExtent();
|
||||
GeometryCollection geometryCollection = feature.getGeometries();
|
||||
for (auto& line : geometryCollection) {
|
||||
for (auto& point : line) {
|
||||
point.x = std::round(point.x * scale);
|
||||
point.y = std::round(point.y * scale);
|
||||
}
|
||||
}
|
||||
return geometryCollection;
|
||||
}
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
12
src/mbgl/util/get_geometries.hpp
Normal file
12
src/mbgl/util/get_geometries.hpp
Normal file
@@ -0,0 +1,12 @@
|
||||
#ifndef MBGL_UTIL_GET_GEOMETRIES
|
||||
#define MBGL_UTIL_GET_GEOMETRIES
|
||||
|
||||
#include <mbgl/map/geometry_tile.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
GeometryCollection getGeometries(const GeometryTileFeature& feature);
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user