From 5512d87362fa74a07ef1ad020c0c57e19a7c58ab Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 2 Feb 2016 09:13:13 -0800 Subject: [PATCH] [core] Remove TransformState::getNormalizedZoom It calculated the same value as TransformState::getZoom. --- src/mbgl/map/map_context.cpp | 2 +- src/mbgl/map/transform_state.cpp | 4 ---- src/mbgl/map/transform_state.hpp | 3 +-- src/mbgl/renderer/painter.cpp | 2 +- src/mbgl/renderer/painter_symbol.cpp | 22 +++++++++++----------- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index dcb4bd0a9..03da5ee32 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -178,7 +178,7 @@ void MapContext::update() { } if (updateFlags & Update::Classes || updateFlags & Update::Zoom) { - style->recalculate(transformState.getNormalizedZoom()); + style->recalculate(transformState.getZoom()); } style->update(transformState, *texturePool); diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index 79f9a19b0..416a4ad11 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -148,10 +148,6 @@ double TransformState::pixel_y() const { #pragma mark - Zoom -float TransformState::getNormalizedZoom() const { - return std::log(scale * util::tileSize / 512.0f) / M_LN2; -} - double TransformState::getZoom() const { return std::log(scale) / M_LN2; } diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp index f774a71c4..8463aea63 100644 --- a/src/mbgl/map/transform_state.hpp +++ b/src/mbgl/map/transform_state.hpp @@ -44,11 +44,10 @@ public: double pixel_y() const; // Zoom - float getNormalizedZoom() const; + double getScale() const; double getZoom() const; int32_t getIntegerZoom() const; double getZoomFraction() const; - double getScale() const; void setMinZoom(const double minZoom); double getMinZoom() const; void setMaxZoom(const double maxZoom); diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index a4d6aa6c6..19b597a77 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -154,7 +154,7 @@ void Painter::render(const Style& style, const FrameData& frame_, SpriteAtlas& a drawClippingMasks(sources); } - frameHistory.record(data.getAnimationTime(), state.getNormalizedZoom()); + frameHistory.record(data.getAnimationTime(), state.getZoom()); // Actually render the layers if (debug::renderTree) { Log::Info(Event::Render, "{"); indent++; } diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index 1a80d52bb..e45cc822d 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -59,19 +59,19 @@ void Painter::renderSDF(SymbolBucket &bucket, // adjust min/max zooms for variable font sies float zoomAdjust = std::log(fontSize / bucketProperties.size) / std::log(2); - sdfShader.u_zoom = (state.getNormalizedZoom() - zoomAdjust) * 10; // current zoom level + sdfShader.u_zoom = (state.getZoom() - zoomAdjust) * 10; // current zoom level if (data.mode == MapMode::Continuous) { FadeProperties f = frameHistory.getFadeProperties(data.getAnimationTime(), data.getDefaultFadeDuration()); sdfShader.u_fadedist = f.fadedist * 10; sdfShader.u_minfadezoom = std::floor(f.minfadezoom * 10); sdfShader.u_maxfadezoom = std::floor(f.maxfadezoom * 10); - sdfShader.u_fadezoom = (state.getNormalizedZoom() + f.bump) * 10; + sdfShader.u_fadezoom = (state.getZoom() + f.bump) * 10; } else { // MapMode::Still sdfShader.u_fadedist = 0; - sdfShader.u_minfadezoom = state.getNormalizedZoom() * 10; - sdfShader.u_maxfadezoom = state.getNormalizedZoom() * 10; - sdfShader.u_fadezoom = state.getNormalizedZoom() * 10; + sdfShader.u_minfadezoom = state.getZoom() * 10; + sdfShader.u_maxfadezoom = state.getZoom() * 10; + sdfShader.u_fadezoom = state.getZoom() * 10; } // The default gamma value has to be adjust for the current pixelratio so that we're not @@ -143,8 +143,8 @@ void Painter::renderSymbol(SymbolBucket& bucket, const SymbolLayer& layer, const config.program = collisionBoxShader->program; collisionBoxShader->u_matrix = matrix; - collisionBoxShader->u_scale = std::pow(2, state.getNormalizedZoom() - id.z); - collisionBoxShader->u_zoom = state.getNormalizedZoom() * 10; + collisionBoxShader->u_scale = std::pow(2, state.getZoom() - id.z); + collisionBoxShader->u_zoom = state.getZoom() * 10; collisionBoxShader->u_maxzoom = (id.z + 1) * 10; config.lineWidth = 1.0f; @@ -238,11 +238,11 @@ void Painter::renderSymbol(SymbolBucket& bucket, const SymbolLayer& layer, const // adjust min/max zooms for variable font sies float zoomAdjust = std::log(fontSize / layout.icon.size) / std::log(2); - iconShader->u_zoom = (state.getNormalizedZoom() - zoomAdjust) * 10; // current zoom level + iconShader->u_zoom = (state.getZoom() - zoomAdjust) * 10; // current zoom level iconShader->u_fadedist = 0 * 10; - iconShader->u_minfadezoom = state.getNormalizedZoom() * 10; - iconShader->u_maxfadezoom = state.getNormalizedZoom() * 10; - iconShader->u_fadezoom = state.getNormalizedZoom() * 10; + iconShader->u_minfadezoom = state.getZoom() * 10; + iconShader->u_maxfadezoom = state.getZoom() * 10; + iconShader->u_fadezoom = state.getZoom() * 10; iconShader->u_opacity = properties.icon.opacity; setDepthSublayer(0);