diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-02 14:20:02 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-03 17:02:15 +0200 |
commit | 8944e2c588b5199f090829009ea6ac9a4822cdc5 (patch) | |
tree | 838eed9a63eddabea5cdbecc503eebde5e714f90 /src | |
parent | 877adedb0f6dc79aa9d18706d4c8d94d0edb872d (diff) | |
download | qtlocation-mapboxgl-8944e2c588b5199f090829009ea6ac9a4822cdc5.tar.gz |
[core] Replaced raw values with util::tileSize
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/renderer/line_bucket.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_fill.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_line.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/symbol_bucket.cpp | 7 | ||||
-rw-r--r-- | src/mbgl/util/mapbox.cpp | 3 |
5 files changed, 14 insertions, 12 deletions
diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp index 316085c0bb..e05f00c288 100644 --- a/src/mbgl/renderer/line_bucket.cpp +++ b/src/mbgl/renderer/line_bucket.cpp @@ -58,7 +58,7 @@ void LineBucket::addGeometry(const GeometryCoordinates& vertices) { const float miterLimit = layout.join == JoinType::Bevel ? 1.05f : float(layout.miterLimit); - const double sharpCornerOffset = SHARP_CORNER_OFFSET * (util::EXTENT / (512.0 * overscaling)); + const double sharpCornerOffset = SHARP_CORNER_OFFSET * (util::EXTENT / (util::tileSize * overscaling)); const GeometryCoordinate firstVertex = vertices.front(); const GeometryCoordinate lastVertex = vertices[len - 1]; diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index 7f632f1961..6e7700702a 100644 --- a/src/mbgl/renderer/painter_fill.cpp +++ b/src/mbgl/renderer/painter_fill.cpp @@ -99,13 +99,11 @@ void Painter::renderFill(FillBucket& bucket, const FillLayer& layer, const TileI (int)((*posB).size[1] * properties.pattern.value.toScale) }}; - int tileSize = 512; + float offsetAx = (std::fmod(util::tileSize, imageSizeScaledA[0]) * id.x) / (float)imageSizeScaledA[0]; + float offsetAy = (std::fmod(util::tileSize, imageSizeScaledA[1]) * id.y) / (float)imageSizeScaledA[1]; - float offsetAx = ((tileSize % imageSizeScaledA[0]) * id.x) / (float)imageSizeScaledA[0]; - float offsetAy = ((tileSize % imageSizeScaledA[1]) * id.y) / (float)imageSizeScaledA[1]; - - float offsetBx = ((tileSize % imageSizeScaledB[0]) * id.x) / (float)imageSizeScaledB[0]; - float offsetBy = ((tileSize % imageSizeScaledB[1]) * id.y) / (float)imageSizeScaledB[1]; + float offsetBx = (std::fmod(util::tileSize, imageSizeScaledB[0]) * id.x) / (float)imageSizeScaledB[0]; + float offsetBy = (std::fmod(util::tileSize, imageSizeScaledB[1]) * id.y) / (float)imageSizeScaledB[1]; patternShader->u_offset_a = std::array<float, 2>{{offsetAx, offsetAy}}; patternShader->u_offset_b = std::array<float, 2>{{offsetBx, offsetBy}}; diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp index e18206b1f7..dfa19c43b0 100644 --- a/src/mbgl/renderer/painter_line.cpp +++ b/src/mbgl/renderer/painter_line.cpp @@ -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) / (util::EXTENT / (512.0 * id.overscaling())); + float ratio = state.getScale() / std::pow(2, id.z) / (util::EXTENT / (util::tileSize * id.overscaling())); mat2 antialiasingMatrix; matrix::identity(antialiasingMatrix); @@ -111,7 +111,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI if (!imagePosA || !imagePosB) return; - float factor = util::EXTENT / (512 * id.overscaling()) / std::pow(2, state.getIntegerZoom() - id.z); + float factor = util::EXTENT / (util::tileSize * id.overscaling()) / std::pow(2, state.getIntegerZoom() - id.z); config.program = linepatternShader->getID(); diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 252ebe4fd1..ca6f455de6 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -57,8 +57,11 @@ SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, SymbolBucket::SymbolBucket(float overscaling_, float zoom_, const MapMode mode_) - : overscaling(overscaling_), zoom(zoom_), tileSize(512 * overscaling_), tilePixelRatio(util::EXTENT / tileSize), mode(mode_) { -} + : overscaling(overscaling_), + zoom(zoom_), + tileSize(util::tileSize * overscaling_), + tilePixelRatio(util::EXTENT / tileSize), + mode(mode_) {} SymbolBucket::~SymbolBucket() { // Do not remove. header file only contains forward definitions to unique pointers. diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp index a3d886f673..170b05ee68 100644 --- a/src/mbgl/util/mapbox.cpp +++ b/src/mbgl/util/mapbox.cpp @@ -1,4 +1,5 @@ #include <mbgl/util/mapbox.hpp> +#include <mbgl/util/constants.hpp> #include <mbgl/platform/log.hpp> #include <stdexcept> @@ -162,7 +163,7 @@ std::string canonicalizeTileURL(const std::string& url, SourceType type, uint16_ std::string result = "mapbox://tiles/" + tileset + "/{z}/{x}/{y}"; if (type == SourceType::Raster) { - result += tileSize == 512 ? "@2x" : "{ratio}"; + result += tileSize == util::tileSize ? "@2x" : "{ratio}"; } result += "." + extension; |