diff options
| author | Gali Nelle <galinelle.mapbox@gmail.com> | 2020-04-08 16:28:35 +0300 |
|---|---|---|
| committer | galinelle <paolo.angelelli@mapbox.com> | 2020-04-10 00:15:43 +0300 |
| commit | 209857f8acc73d7950a1c8ec58f4ec7622287e55 (patch) | |
| tree | a6cb095fffae224aae84e7d93dc38fbc7037d361 /include | |
| parent | e6c156420d2d287bd6d3449af3338f550dbf84f4 (diff) | |
| download | qtlocation-mapboxgl-209857f8acc73d7950a1c8ec58f4ec7622287e55.tar.gz | |
Fix LocationIndicator Layer
This changes image size properties to be scales instead of pixel sizes.
The commit also adds fixes for handling image updates with the same ID,
adds tests for expressions in paint properties, as well as tests for using images
with pixel ratio greater than 1.
Finally it moves image-tilt-displacement and perspective-compensation properties
from layout to paint properties, and includes other minor cleanups.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/layers/location_indicator_layer.hpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/include/mbgl/style/layers/location_indicator_layer.hpp b/include/mbgl/style/layers/location_indicator_layer.hpp index f112664dab..49720a2403 100644 --- a/include/mbgl/style/layers/location_indicator_layer.hpp +++ b/include/mbgl/style/layers/location_indicator_layer.hpp @@ -26,14 +26,6 @@ public: const PropertyValue<expression::Image>& getBearingImage() const; void setBearingImage(const PropertyValue<expression::Image>&); - static PropertyValue<float> getDefaultImageTiltDisplacement(); - const PropertyValue<float>& getImageTiltDisplacement() const; - void setImageTiltDisplacement(const PropertyValue<float>&); - - static PropertyValue<float> getDefaultPerspectiveCompensation(); - const PropertyValue<float>& getPerspectiveCompensation() const; - void setPerspectiveCompensation(const PropertyValue<float>&); - static PropertyValue<expression::Image> getDefaultShadowImage(); const PropertyValue<expression::Image>& getShadowImage() const; void setShadowImage(const PropertyValue<expression::Image>&); @@ -74,12 +66,24 @@ public: void setBearingImageSizeTransition(const TransitionOptions&); TransitionOptions getBearingImageSizeTransition() const; + static PropertyValue<float> getDefaultImageTiltDisplacement(); + const PropertyValue<float>& getImageTiltDisplacement() const; + void setImageTiltDisplacement(const PropertyValue<float>&); + void setImageTiltDisplacementTransition(const TransitionOptions&); + TransitionOptions getImageTiltDisplacementTransition() const; + static PropertyValue<std::array<double, 3>> getDefaultLocation(); const PropertyValue<std::array<double, 3>>& getLocation() const; void setLocation(const PropertyValue<std::array<double, 3>>&); void setLocationTransition(const TransitionOptions&); TransitionOptions getLocationTransition() const; + static PropertyValue<float> getDefaultPerspectiveCompensation(); + const PropertyValue<float>& getPerspectiveCompensation() const; + void setPerspectiveCompensation(const PropertyValue<float>&); + void setPerspectiveCompensationTransition(const TransitionOptions&); + TransitionOptions getPerspectiveCompensationTransition() const; + static PropertyValue<float> getDefaultShadowImageSize(); const PropertyValue<float>& getShadowImageSize() const; void setShadowImageSize(const PropertyValue<float>&); |