diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-10-20 12:16:15 -0700 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-10-21 11:20:45 -0700 |
commit | 6824a24acd2f3450a402f1b765d01f841bcd5d6c (patch) | |
tree | f2470f6be332134beb9c9935aef7d0b784ccd2e3 /src | |
parent | 0045eef00a17b680ba8d92eda5a8baf31cdde7cc (diff) | |
download | qtlocation-mapboxgl-6824a24acd2f3450a402f1b765d01f841bcd5d6c.tar.gz |
[core] Removed time param from Painter::render
Animation time can be obtained directly from MapData.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/map_context.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/painter.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index 3359cff2d3..d3324cb277 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -244,7 +244,7 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame) glObjectStore.performCleanup(); if (!painter) painter = std::make_unique<Painter>(data); - painter->render(*style, transformState, frame, data.getAnimationTime()); + painter->render(*style, transformState, frame); if (data.mode == MapMode::Still) { callback(nullptr, view.readStillImage()); diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index ad01644cfa..5670c4098e 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -157,7 +157,7 @@ void Painter::prepareTile(const Tile& tile) { config.stencilFunc = { GL_EQUAL, ref, mask }; } -void Painter::render(const Style& style, TransformState state_, const FrameData& frame_, const TimePoint& time) { +void Painter::render(const Style& style, TransformState state_, const FrameData& frame_) { state = state_; frame = frame_; @@ -214,7 +214,7 @@ void Painter::render(const Style& style, TransformState state_, const FrameData& drawClippingMasks(sources); } - frameHistory.record(time, state.getNormalizedZoom()); + frameHistory.record(data.getAnimationTime(), state.getNormalizedZoom()); // Actually render the layers if (debug::renderTree) { Log::Info(Event::Render, "{"); indent++; } diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 8d828602ec..dbe575985f 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -88,8 +88,7 @@ public: void render(const Style& style, TransformState state, - const FrameData& frame, - const TimePoint& time); + const FrameData& frame); // Renders debug information for a tile. void renderTileDebug(const Tile& tile); |