diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-31 14:21:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-31 14:21:47 -0700 |
commit | 9bdd765a02de75851a00ab85223d5d582a104757 (patch) | |
tree | bcb417a47808a4a94c171b083c7f2e2cce457107 /src/mbgl/style/layers/fill_extrusion_layer.cpp | |
parent | 885f6e3c02138398d094e49243817a83349b4d50 (diff) | |
download | qtlocation-mapboxgl-9bdd765a02de75851a00ab85223d5d582a104757.tar.gz |
[core] Merge DataDrivenPropertyValue into PropertyValue (#12513)
Diffstat (limited to 'src/mbgl/style/layers/fill_extrusion_layer.cpp')
-rw-r--r-- | src/mbgl/style/layers/fill_extrusion_layer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp index c5b4ef0ef3..829a24f354 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp @@ -123,15 +123,15 @@ TransitionOptions FillExtrusionLayer::getFillExtrusionOpacityTransition() const return impl().paint.template get<FillExtrusionOpacity>().options; } -DataDrivenPropertyValue<Color> FillExtrusionLayer::getDefaultFillExtrusionColor() { +PropertyValue<Color> FillExtrusionLayer::getDefaultFillExtrusionColor() { return { Color::black() }; } -DataDrivenPropertyValue<Color> FillExtrusionLayer::getFillExtrusionColor() const { +PropertyValue<Color> FillExtrusionLayer::getFillExtrusionColor() const { return impl().paint.template get<FillExtrusionColor>().value; } -void FillExtrusionLayer::setFillExtrusionColor(DataDrivenPropertyValue<Color> value) { +void FillExtrusionLayer::setFillExtrusionColor(PropertyValue<Color> value) { if (value == getFillExtrusionColor()) return; auto impl_ = mutableImpl(); @@ -231,15 +231,15 @@ TransitionOptions FillExtrusionLayer::getFillExtrusionPatternTransition() const return impl().paint.template get<FillExtrusionPattern>().options; } -DataDrivenPropertyValue<float> FillExtrusionLayer::getDefaultFillExtrusionHeight() { +PropertyValue<float> FillExtrusionLayer::getDefaultFillExtrusionHeight() { return { 0 }; } -DataDrivenPropertyValue<float> FillExtrusionLayer::getFillExtrusionHeight() const { +PropertyValue<float> FillExtrusionLayer::getFillExtrusionHeight() const { return impl().paint.template get<FillExtrusionHeight>().value; } -void FillExtrusionLayer::setFillExtrusionHeight(DataDrivenPropertyValue<float> value) { +void FillExtrusionLayer::setFillExtrusionHeight(PropertyValue<float> value) { if (value == getFillExtrusionHeight()) return; auto impl_ = mutableImpl(); @@ -258,15 +258,15 @@ TransitionOptions FillExtrusionLayer::getFillExtrusionHeightTransition() const { return impl().paint.template get<FillExtrusionHeight>().options; } -DataDrivenPropertyValue<float> FillExtrusionLayer::getDefaultFillExtrusionBase() { +PropertyValue<float> FillExtrusionLayer::getDefaultFillExtrusionBase() { return { 0 }; } -DataDrivenPropertyValue<float> FillExtrusionLayer::getFillExtrusionBase() const { +PropertyValue<float> FillExtrusionLayer::getFillExtrusionBase() const { return impl().paint.template get<FillExtrusionBase>().value; } -void FillExtrusionLayer::setFillExtrusionBase(DataDrivenPropertyValue<float> value) { +void FillExtrusionLayer::setFillExtrusionBase(PropertyValue<float> value) { if (value == getFillExtrusionBase()) return; auto impl_ = mutableImpl(); |