diff options
author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2017-03-10 11:33:31 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-10 11:33:31 -0800 |
commit | 20712b7c84bd91bcf658d74bf25f3460354b5fd6 (patch) | |
tree | c12fd8cf71d293ddfc123f9e1d0af1dafa887750 /src/mbgl/style/layers/raster_layer.cpp | |
parent | 4a0ce1365f469c5da30aa7136ec5d31dfd621ff1 (diff) | |
download | qtlocation-mapboxgl-20712b7c84bd91bcf658d74bf25f3460354b5fd6.tar.gz |
Per-attribute transition properties on MGLStyleLayer (#8225)
* [ios, macos] new struct MGLTransition
* [ios] MGLTransition struct moved to MGLTypes.h
* [ios] MGLTransition implemented for style layer properties
* [ios, macos] added support for getting property transitions
* [ios, macos] updated to MGLDurationFromTimeInterval and MGLTimeIntervalFromDuration
* [ios, macos] added transition properties test
* [ios, macos] modified key strings imp
* [ios, macos] The impl for transition properties were changed to public methods
* [ios, macos] Changelog update
* [ios] Fixed layer space formatting
* [core] The name space was fixed for getters that returned TransitionOptions
* [ios, macos] Added rawLayer transition property tests
* [ios] Added a factory method for MGLTransition and transition-related methods to NSValue(MGLAdditions)
* [ios, macos] Copyedited changelog blurbs about transition properties
Diffstat (limited to 'src/mbgl/style/layers/raster_layer.cpp')
-rw-r--r-- | src/mbgl/style/layers/raster_layer.cpp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index 2108a5c49f..dfdd13e63c 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -66,6 +66,10 @@ void RasterLayer::setRasterOpacityTransition(const TransitionOptions& value, con impl->paint.setTransition<RasterOpacity>(value, klass); } +TransitionOptions RasterLayer::getRasterOpacityTransition(const optional<std::string>& klass) const { + return impl->paint.getTransition<RasterOpacity>(klass); +} + PropertyValue<float> RasterLayer::getDefaultRasterHueRotate() { return { 0 }; } @@ -85,6 +89,10 @@ void RasterLayer::setRasterHueRotateTransition(const TransitionOptions& value, c impl->paint.setTransition<RasterHueRotate>(value, klass); } +TransitionOptions RasterLayer::getRasterHueRotateTransition(const optional<std::string>& klass) const { + return impl->paint.getTransition<RasterHueRotate>(klass); +} + PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMin() { return { 0 }; } @@ -104,6 +112,10 @@ void RasterLayer::setRasterBrightnessMinTransition(const TransitionOptions& valu impl->paint.setTransition<RasterBrightnessMin>(value, klass); } +TransitionOptions RasterLayer::getRasterBrightnessMinTransition(const optional<std::string>& klass) const { + return impl->paint.getTransition<RasterBrightnessMin>(klass); +} + PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMax() { return { 1 }; } @@ -123,6 +135,10 @@ void RasterLayer::setRasterBrightnessMaxTransition(const TransitionOptions& valu impl->paint.setTransition<RasterBrightnessMax>(value, klass); } +TransitionOptions RasterLayer::getRasterBrightnessMaxTransition(const optional<std::string>& klass) const { + return impl->paint.getTransition<RasterBrightnessMax>(klass); +} + PropertyValue<float> RasterLayer::getDefaultRasterSaturation() { return { 0 }; } @@ -142,6 +158,10 @@ void RasterLayer::setRasterSaturationTransition(const TransitionOptions& value, impl->paint.setTransition<RasterSaturation>(value, klass); } +TransitionOptions RasterLayer::getRasterSaturationTransition(const optional<std::string>& klass) const { + return impl->paint.getTransition<RasterSaturation>(klass); +} + PropertyValue<float> RasterLayer::getDefaultRasterContrast() { return { 0 }; } @@ -161,6 +181,10 @@ void RasterLayer::setRasterContrastTransition(const TransitionOptions& value, co impl->paint.setTransition<RasterContrast>(value, klass); } +TransitionOptions RasterLayer::getRasterContrastTransition(const optional<std::string>& klass) const { + return impl->paint.getTransition<RasterContrast>(klass); +} + PropertyValue<float> RasterLayer::getDefaultRasterFadeDuration() { return { 300 }; } @@ -180,5 +204,9 @@ void RasterLayer::setRasterFadeDurationTransition(const TransitionOptions& value impl->paint.setTransition<RasterFadeDuration>(value, klass); } +TransitionOptions RasterLayer::getRasterFadeDurationTransition(const optional<std::string>& klass) const { + return impl->paint.getTransition<RasterFadeDuration>(klass); +} + } // namespace style } // namespace mbgl |