remove old version of zoomHistory

This commit is contained in:
Ansis Brammanis
2015-02-02 18:27:55 -08:00
parent 6f5c6b58b4
commit c9f8de863d
2 changed files with 1 additions and 29 deletions

View File

@@ -232,7 +232,7 @@ void Painter::render(const Style& style, const std::set<util::ptr<StyleSource>>&
drawClippingMasks(sources);
recordZoom(time, state.getNormalizedZoom());
frameHistory.record(time, state.getNormalizedZoom());
// Actually render the layers
if (debug::renderTree) { std::cout << "{" << std::endl; indent++; }
@@ -479,26 +479,3 @@ mat4 Painter::translatedMatrix(const mat4& matrix, const std::array<float, 2> &t
return vtxMatrix;
}
}
void Painter::recordZoom(const timestamp time, const float zoom) {
frameHistory.record(time, zoom);
if (lastZoom < 0) {
// first frame ever
lastIntegerZoom = std::floor(zoom);
lastZoom = zoom;
}
// check whether an integer zoom level was passed since the last frame
// and if yes, record it with the time. Used for transitioning patterns.
if (std::floor(lastZoom) < std::floor(zoom)) {
lastIntegerZoom = std::floor(zoom);
lastIntegerZoomTime = time;
} else if (std::floor(lastZoom) > std::floor(zoom)) {
lastIntegerZoom = std::floor(zoom) + 1;
lastIntegerZoomTime = time;
}
lastZoom = zoom;
}

View File

@@ -139,7 +139,6 @@ private:
mat4 translatedMatrix(const mat4& matrix, const std::array<float, 2> &translation, const Tile::ID &id, TranslateAnchorType anchor);
void prepareTile(const Tile& tile);
void recordZoom(const timestamp time, const float zoom);
template <typename BucketProperties, typename StyleProperties>
void renderSDF(SymbolBucket &bucket,
@@ -192,10 +191,6 @@ private:
RenderPass pass = RenderPass::Opaque;
const float strata_epsilon = 1.0f / (1 << 16);
int lastIntegerZoom;
timestamp lastIntegerZoomTime = 0;
float lastZoom = -1;
public:
FrameHistory frameHistory;