diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-15 15:27:09 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-22 14:30:26 +0200 |
commit | 5af128f205a404128e804f5c82ecf748a52dac9c (patch) | |
tree | 1e1c6c0b697ebbffd590f807b3f17b3beef5bdad /src/mbgl/text/placement.hpp | |
parent | 4735845a6ee4baad9306b8d5150b093fccdd11a2 (diff) | |
download | qtlocation-mapboxgl-5af128f205a404128e804f5c82ecf748a52dac9c.tar.gz |
[core] Pass placement commit parameters in constructor
Diffstat (limited to 'src/mbgl/text/placement.hpp')
-rw-r--r-- | src/mbgl/text/placement.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp index 4dd9011da4..dd46970780 100644 --- a/src/mbgl/text/placement.hpp +++ b/src/mbgl/text/placement.hpp @@ -116,9 +116,10 @@ public: MapMode, style::TransitionOptions, const bool crossSourceCollisions, + TimePoint commitTime, optional<Immutable<Placement>> prevPlacement = nullopt); void placeLayer(const RenderLayer&, const mat4&, bool showCollisionBoxes); - void commit(TimePoint, const double zoom); + void commit(); void updateLayerBuckets(const RenderLayer&, const TransformState&, bool updateOpacities) const; float symbolFadeChange(TimePoint now) const; bool hasTransitions(TimePoint now) const; @@ -151,7 +152,7 @@ private: TimePoint fadeStartTime; TimePoint commitTime; - float placementZoom; + const float placementZoom; float prevZoomAdjustment = 0; std::unordered_map<uint32_t, JointPlacement> placements; |