diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 12:08:29 -0800 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 12:08:29 -0800 |
| commit | 4ec00288562f16f93ea0d46f63291b8bea4d66ac (patch) | |
| tree | 7a735dc926c1ac45b8e6d4c902db3192403ad58f /src/mbgl/renderer/painter.cpp | |
| parent | 93b07c367577b097e3791d38690b8fc37054c5fb (diff) | |
| download | qtlocation-mapboxgl-4ec00288562f16f93ea0d46f63291b8bea4d66ac.tar.gz | |
switch from low/high to from/to
Diffstat (limited to 'src/mbgl/renderer/painter.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 78b6c18e4a..ebb2f77cc5 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -375,12 +375,12 @@ void Painter::renderTileLayer(const Tile& tile, util::ptr<StyleLayer> layer_desc void Painter::renderBackground(util::ptr<StyleLayer> layer_desc) { const BackgroundProperties& properties = layer_desc->getProperties<BackgroundProperties>(); - if (properties.image.low.size()) { + if (properties.image.to.size()) { if ((properties.opacity >= 1.0f) != (pass == RenderPass::Opaque)) return; - SpriteAtlasPosition imagePosA = spriteAtlas.getPosition(properties.image.low, true); - SpriteAtlasPosition imagePosB = spriteAtlas.getPosition(properties.image.high, true); + SpriteAtlasPosition imagePosA = spriteAtlas.getPosition(properties.image.from, true); + SpriteAtlasPosition imagePosB = spriteAtlas.getPosition(properties.image.to, true); float zoomFraction = state.getZoomFraction(); useProgram(patternShader->program); @@ -401,11 +401,11 @@ void Painter::renderBackground(util::ptr<StyleLayer> layer_desc) { mat3 matrixA; matrix::identity(matrixA); matrix::scale(matrixA, matrixA, - 1.0f / (sizeA[0] * properties.image.lowScale), - 1.0f / (sizeA[1] * properties.image.lowScale)); + 1.0f / (sizeA[0] * properties.image.fromScale), + 1.0f / (sizeA[1] * properties.image.fromScale)); matrix::translate(matrixA, matrixA, - std::fmod(center[0] * 512, sizeA[0] * properties.image.lowScale), - std::fmod(center[1] * 512, sizeA[1] * properties.image.lowScale)); + std::fmod(center[0] * 512, sizeA[0] * properties.image.fromScale), + std::fmod(center[1] * 512, sizeA[1] * properties.image.fromScale)); matrix::rotate(matrixA, matrixA, -state.getAngle()); matrix::scale(matrixA, matrixA, scale * state.getWidth() / 2, @@ -415,11 +415,11 @@ void Painter::renderBackground(util::ptr<StyleLayer> layer_desc) { mat3 matrixB; matrix::identity(matrixB); matrix::scale(matrixB, matrixB, - 1.0f / (sizeB[0] * properties.image.highScale), - 1.0f / (sizeB[1] * properties.image.highScale)); + 1.0f / (sizeB[0] * properties.image.toScale), + 1.0f / (sizeB[1] * properties.image.toScale)); matrix::translate(matrixB, matrixB, - std::fmod(center[0] * 512, sizeB[0] * properties.image.highScale), - std::fmod(center[1] * 512, sizeB[1] * properties.image.highScale)); + std::fmod(center[0] * 512, sizeB[0] * properties.image.toScale), + std::fmod(center[1] * 512, sizeB[1] * properties.image.toScale)); matrix::rotate(matrixB, matrixB, -state.getAngle()); matrix::scale(matrixB, matrixB, scale * state.getWidth() / 2, |