summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-08-09 15:40:24 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-09-22 23:33:56 +0300
commite18da38faad9c7b518f6964452923dab34d34a0c (patch)
tree84c0095b4799198abd10d0697b5fdeea141230c4 /src
parentca4f0bbcc58046498966daf4c695bc7977c85e44 (diff)
downloadqtlocation-mapboxgl-e18da38faad9c7b518f6964452923dab34d34a0c.tar.gz
[core] remove throttling from geometry tile
- This doesn't work for asynchronous rendering - see https://github.com/mapbox/mapbox-gl-native/pull/9611
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/tile/geometry_tile.cpp8
-rw-r--r--src/mbgl/tile/geometry_tile.hpp3
2 files changed, 2 insertions, 9 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index c99149893d..8c018ce3aa 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -18,7 +18,6 @@
#include <mbgl/text/collision_tile.hpp>
#include <mbgl/map/transform_state.hpp>
#include <mbgl/style/filter_evaluator.hpp>
-#include <mbgl/util/chrono.hpp>
#include <mbgl/util/logging.hpp>
#include <mbgl/actor/scheduler.hpp>
@@ -58,7 +57,6 @@ GeometryTile::GeometryTile(const OverscaledTileID& id_,
parameters.pixelRatio),
glyphManager(parameters.glyphManager),
imageManager(parameters.imageManager),
- placementThrottler(Milliseconds(300), [this] { invokePlacement(); }),
lastYStretch(1.0f),
mode(parameters.mode) {
}
@@ -102,11 +100,7 @@ void GeometryTile::setPlacementConfig(const PlacementConfig& desiredConfig) {
++correlationID;
requestedConfig = desiredConfig;
- if (mode == MapMode::Continuous) {
- placementThrottler.invoke();
- } else {
- invokePlacement();
- }
+ invokePlacement();
}
void GeometryTile::invokePlacement() {
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 82c39f782e..a478aad504 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -133,8 +133,7 @@ private:
std::unordered_map<std::string, std::shared_ptr<Bucket>> symbolBuckets;
std::unique_ptr<CollisionTile> collisionTile;
-
- util::Throttler placementThrottler;
+
float lastYStretch;
const MapMode mode;