summaryrefslogtreecommitdiff
path: root/include/mbgl/style
diff options
context:
space:
mode:
authorMolly Lloyd <mollymerp@users.noreply.github.com>2018-06-21 14:37:17 -0700
committerGitHub <noreply@github.com>2018-06-21 14:37:17 -0700
commite1af62e87dfd77d1c38802f082c4981dab1beeab (patch)
tree8371dccdcf8545fd50b2edddbdd3a622bb00b27a /include/mbgl/style
parenteb70b8984901d8113f3a29d26cc355d5b3ed46fd (diff)
downloadqtlocation-mapboxgl-e1af62e87dfd77d1c38802f082c4981dab1beeab.tar.gz
[core] add raster-resampling property (#12176)upstream/rclee
* update style-code for raster-resampling * implement user-defined raster-resampling * invert filter condition * raster-resampling -> raster-resampling-mode for darwin language conventions
Diffstat (limited to 'include/mbgl/style')
-rw-r--r--include/mbgl/style/layers/raster_layer.hpp6
-rw-r--r--include/mbgl/style/types.hpp5
2 files changed, 11 insertions, 0 deletions
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index 8111364709..8e7849c27d 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -67,6 +67,12 @@ public:
void setRasterContrastTransition(const TransitionOptions&);
TransitionOptions getRasterContrastTransition() const;
+ static PropertyValue<RasterResamplingType> getDefaultRasterResampling();
+ PropertyValue<RasterResamplingType> getRasterResampling() const;
+ void setRasterResampling(PropertyValue<RasterResamplingType>);
+ void setRasterResamplingTransition(const TransitionOptions&);
+ TransitionOptions getRasterResamplingTransition() const;
+
static PropertyValue<float> getDefaultRasterFadeDuration();
PropertyValue<float> getRasterFadeDuration() const;
void setRasterFadeDuration(PropertyValue<float>);
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp
index 693972a72f..44c11186b8 100644
--- a/include/mbgl/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -38,6 +38,11 @@ enum class LineJoinType : uint8_t {
FlipBevel
};
+enum class RasterResamplingType : bool {
+ Linear,
+ Nearest
+};
+
enum class HillshadeIlluminationAnchorType : bool {
Map,
Viewport