summaryrefslogtreecommitdiff
path: root/src/mbgl/style/layers/raster_layer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/style/layers/raster_layer.cpp')
-rw-r--r--src/mbgl/style/layers/raster_layer.cpp244
1 files changed, 122 insertions, 122 deletions
diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp
index 784b720c68..b364870cff 100644
--- a/src/mbgl/style/layers/raster_layer.cpp
+++ b/src/mbgl/style/layers/raster_layer.cpp
@@ -63,166 +63,166 @@ void RasterLayer::Impl::stringifyLayout(rapidjson::Writer<rapidjson::StringBuffe
// Paint properties
-PropertyValue<float> RasterLayer::getDefaultRasterOpacity() {
+PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMax() {
return { 1 };
}
-const PropertyValue<float>& RasterLayer::getRasterOpacity() const {
- return impl().paint.template get<RasterOpacity>().value;
+const PropertyValue<float>& RasterLayer::getRasterBrightnessMax() const {
+ return impl().paint.template get<RasterBrightnessMax>().value;
}
-void RasterLayer::setRasterOpacity(const PropertyValue<float>& value) {
- if (value == getRasterOpacity())
+void RasterLayer::setRasterBrightnessMax(const PropertyValue<float>& value) {
+ if (value == getRasterBrightnessMax())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterOpacity>().value = value;
+ impl_->paint.template get<RasterBrightnessMax>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void RasterLayer::setRasterOpacityTransition(const TransitionOptions& options) {
+void RasterLayer::setRasterBrightnessMaxTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterOpacity>().options = options;
+ impl_->paint.template get<RasterBrightnessMax>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions RasterLayer::getRasterOpacityTransition() const {
- return impl().paint.template get<RasterOpacity>().options;
+TransitionOptions RasterLayer::getRasterBrightnessMaxTransition() const {
+ return impl().paint.template get<RasterBrightnessMax>().options;
}
-PropertyValue<float> RasterLayer::getDefaultRasterHueRotate() {
+PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMin() {
return { 0 };
}
-const PropertyValue<float>& RasterLayer::getRasterHueRotate() const {
- return impl().paint.template get<RasterHueRotate>().value;
+const PropertyValue<float>& RasterLayer::getRasterBrightnessMin() const {
+ return impl().paint.template get<RasterBrightnessMin>().value;
}
-void RasterLayer::setRasterHueRotate(const PropertyValue<float>& value) {
- if (value == getRasterHueRotate())
+void RasterLayer::setRasterBrightnessMin(const PropertyValue<float>& value) {
+ if (value == getRasterBrightnessMin())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterHueRotate>().value = value;
+ impl_->paint.template get<RasterBrightnessMin>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void RasterLayer::setRasterHueRotateTransition(const TransitionOptions& options) {
+void RasterLayer::setRasterBrightnessMinTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterHueRotate>().options = options;
+ impl_->paint.template get<RasterBrightnessMin>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions RasterLayer::getRasterHueRotateTransition() const {
- return impl().paint.template get<RasterHueRotate>().options;
+TransitionOptions RasterLayer::getRasterBrightnessMinTransition() const {
+ return impl().paint.template get<RasterBrightnessMin>().options;
}
-PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMin() {
+PropertyValue<float> RasterLayer::getDefaultRasterContrast() {
return { 0 };
}
-const PropertyValue<float>& RasterLayer::getRasterBrightnessMin() const {
- return impl().paint.template get<RasterBrightnessMin>().value;
+const PropertyValue<float>& RasterLayer::getRasterContrast() const {
+ return impl().paint.template get<RasterContrast>().value;
}
-void RasterLayer::setRasterBrightnessMin(const PropertyValue<float>& value) {
- if (value == getRasterBrightnessMin())
+void RasterLayer::setRasterContrast(const PropertyValue<float>& value) {
+ if (value == getRasterContrast())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterBrightnessMin>().value = value;
+ impl_->paint.template get<RasterContrast>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void RasterLayer::setRasterBrightnessMinTransition(const TransitionOptions& options) {
+void RasterLayer::setRasterContrastTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterBrightnessMin>().options = options;
+ impl_->paint.template get<RasterContrast>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions RasterLayer::getRasterBrightnessMinTransition() const {
- return impl().paint.template get<RasterBrightnessMin>().options;
+TransitionOptions RasterLayer::getRasterContrastTransition() const {
+ return impl().paint.template get<RasterContrast>().options;
}
-PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMax() {
- return { 1 };
+PropertyValue<float> RasterLayer::getDefaultRasterFadeDuration() {
+ return { 300 };
}
-const PropertyValue<float>& RasterLayer::getRasterBrightnessMax() const {
- return impl().paint.template get<RasterBrightnessMax>().value;
+const PropertyValue<float>& RasterLayer::getRasterFadeDuration() const {
+ return impl().paint.template get<RasterFadeDuration>().value;
}
-void RasterLayer::setRasterBrightnessMax(const PropertyValue<float>& value) {
- if (value == getRasterBrightnessMax())
+void RasterLayer::setRasterFadeDuration(const PropertyValue<float>& value) {
+ if (value == getRasterFadeDuration())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterBrightnessMax>().value = value;
+ impl_->paint.template get<RasterFadeDuration>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void RasterLayer::setRasterBrightnessMaxTransition(const TransitionOptions& options) {
+void RasterLayer::setRasterFadeDurationTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterBrightnessMax>().options = options;
+ impl_->paint.template get<RasterFadeDuration>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions RasterLayer::getRasterBrightnessMaxTransition() const {
- return impl().paint.template get<RasterBrightnessMax>().options;
+TransitionOptions RasterLayer::getRasterFadeDurationTransition() const {
+ return impl().paint.template get<RasterFadeDuration>().options;
}
-PropertyValue<float> RasterLayer::getDefaultRasterSaturation() {
+PropertyValue<float> RasterLayer::getDefaultRasterHueRotate() {
return { 0 };
}
-const PropertyValue<float>& RasterLayer::getRasterSaturation() const {
- return impl().paint.template get<RasterSaturation>().value;
+const PropertyValue<float>& RasterLayer::getRasterHueRotate() const {
+ return impl().paint.template get<RasterHueRotate>().value;
}
-void RasterLayer::setRasterSaturation(const PropertyValue<float>& value) {
- if (value == getRasterSaturation())
+void RasterLayer::setRasterHueRotate(const PropertyValue<float>& value) {
+ if (value == getRasterHueRotate())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterSaturation>().value = value;
+ impl_->paint.template get<RasterHueRotate>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void RasterLayer::setRasterSaturationTransition(const TransitionOptions& options) {
+void RasterLayer::setRasterHueRotateTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterSaturation>().options = options;
+ impl_->paint.template get<RasterHueRotate>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions RasterLayer::getRasterSaturationTransition() const {
- return impl().paint.template get<RasterSaturation>().options;
+TransitionOptions RasterLayer::getRasterHueRotateTransition() const {
+ return impl().paint.template get<RasterHueRotate>().options;
}
-PropertyValue<float> RasterLayer::getDefaultRasterContrast() {
- return { 0 };
+PropertyValue<float> RasterLayer::getDefaultRasterOpacity() {
+ return { 1 };
}
-const PropertyValue<float>& RasterLayer::getRasterContrast() const {
- return impl().paint.template get<RasterContrast>().value;
+const PropertyValue<float>& RasterLayer::getRasterOpacity() const {
+ return impl().paint.template get<RasterOpacity>().value;
}
-void RasterLayer::setRasterContrast(const PropertyValue<float>& value) {
- if (value == getRasterContrast())
+void RasterLayer::setRasterOpacity(const PropertyValue<float>& value) {
+ if (value == getRasterOpacity())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterContrast>().value = value;
+ impl_->paint.template get<RasterOpacity>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void RasterLayer::setRasterContrastTransition(const TransitionOptions& options) {
+void RasterLayer::setRasterOpacityTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterContrast>().options = options;
+ impl_->paint.template get<RasterOpacity>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions RasterLayer::getRasterContrastTransition() const {
- return impl().paint.template get<RasterContrast>().options;
+TransitionOptions RasterLayer::getRasterOpacityTransition() const {
+ return impl().paint.template get<RasterOpacity>().options;
}
PropertyValue<RasterResamplingType> RasterLayer::getDefaultRasterResampling() {
@@ -252,72 +252,72 @@ TransitionOptions RasterLayer::getRasterResamplingTransition() const {
return impl().paint.template get<RasterResampling>().options;
}
-PropertyValue<float> RasterLayer::getDefaultRasterFadeDuration() {
- return { 300 };
+PropertyValue<float> RasterLayer::getDefaultRasterSaturation() {
+ return { 0 };
}
-const PropertyValue<float>& RasterLayer::getRasterFadeDuration() const {
- return impl().paint.template get<RasterFadeDuration>().value;
+const PropertyValue<float>& RasterLayer::getRasterSaturation() const {
+ return impl().paint.template get<RasterSaturation>().value;
}
-void RasterLayer::setRasterFadeDuration(const PropertyValue<float>& value) {
- if (value == getRasterFadeDuration())
+void RasterLayer::setRasterSaturation(const PropertyValue<float>& value) {
+ if (value == getRasterSaturation())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterFadeDuration>().value = value;
+ impl_->paint.template get<RasterSaturation>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void RasterLayer::setRasterFadeDurationTransition(const TransitionOptions& options) {
+void RasterLayer::setRasterSaturationTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<RasterFadeDuration>().options = options;
+ impl_->paint.template get<RasterSaturation>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions RasterLayer::getRasterFadeDurationTransition() const {
- return impl().paint.template get<RasterFadeDuration>().options;
+TransitionOptions RasterLayer::getRasterSaturationTransition() const {
+ return impl().paint.template get<RasterSaturation>().options;
}
using namespace conversion;
optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Convertible& value) {
enum class Property : uint8_t {
- RasterOpacity,
- RasterHueRotate,
- RasterBrightnessMin,
RasterBrightnessMax,
- RasterSaturation,
+ RasterBrightnessMin,
RasterContrast,
- RasterResampling,
RasterFadeDuration,
- RasterOpacityTransition,
- RasterHueRotateTransition,
- RasterBrightnessMinTransition,
+ RasterHueRotate,
+ RasterOpacity,
+ RasterResampling,
+ RasterSaturation,
RasterBrightnessMaxTransition,
- RasterSaturationTransition,
+ RasterBrightnessMinTransition,
RasterContrastTransition,
- RasterResamplingTransition,
RasterFadeDurationTransition,
+ RasterHueRotateTransition,
+ RasterOpacityTransition,
+ RasterResamplingTransition,
+ RasterSaturationTransition,
};
MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({
- { "raster-opacity", static_cast<uint8_t>(Property::RasterOpacity) },
- { "raster-hue-rotate", static_cast<uint8_t>(Property::RasterHueRotate) },
- { "raster-brightness-min", static_cast<uint8_t>(Property::RasterBrightnessMin) },
{ "raster-brightness-max", static_cast<uint8_t>(Property::RasterBrightnessMax) },
- { "raster-saturation", static_cast<uint8_t>(Property::RasterSaturation) },
+ { "raster-brightness-min", static_cast<uint8_t>(Property::RasterBrightnessMin) },
{ "raster-contrast", static_cast<uint8_t>(Property::RasterContrast) },
- { "raster-resampling", static_cast<uint8_t>(Property::RasterResampling) },
{ "raster-fade-duration", static_cast<uint8_t>(Property::RasterFadeDuration) },
- { "raster-opacity-transition", static_cast<uint8_t>(Property::RasterOpacityTransition) },
- { "raster-hue-rotate-transition", static_cast<uint8_t>(Property::RasterHueRotateTransition) },
- { "raster-brightness-min-transition", static_cast<uint8_t>(Property::RasterBrightnessMinTransition) },
+ { "raster-hue-rotate", static_cast<uint8_t>(Property::RasterHueRotate) },
+ { "raster-opacity", static_cast<uint8_t>(Property::RasterOpacity) },
+ { "raster-resampling", static_cast<uint8_t>(Property::RasterResampling) },
+ { "raster-saturation", static_cast<uint8_t>(Property::RasterSaturation) },
{ "raster-brightness-max-transition", static_cast<uint8_t>(Property::RasterBrightnessMaxTransition) },
- { "raster-saturation-transition", static_cast<uint8_t>(Property::RasterSaturationTransition) },
+ { "raster-brightness-min-transition", static_cast<uint8_t>(Property::RasterBrightnessMinTransition) },
{ "raster-contrast-transition", static_cast<uint8_t>(Property::RasterContrastTransition) },
+ { "raster-fade-duration-transition", static_cast<uint8_t>(Property::RasterFadeDurationTransition) },
+ { "raster-hue-rotate-transition", static_cast<uint8_t>(Property::RasterHueRotateTransition) },
+ { "raster-opacity-transition", static_cast<uint8_t>(Property::RasterOpacityTransition) },
{ "raster-resampling-transition", static_cast<uint8_t>(Property::RasterResamplingTransition) },
- { "raster-fade-duration-transition", static_cast<uint8_t>(Property::RasterFadeDurationTransition) }
+ { "raster-saturation-transition", static_cast<uint8_t>(Property::RasterSaturationTransition) }
});
const auto it = properties.find(name.c_str());
@@ -328,45 +328,45 @@ optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Con
auto property = static_cast<Property>(it->second);
- if (property == Property::RasterOpacity || property == Property::RasterHueRotate || property == Property::RasterBrightnessMin || property == Property::RasterBrightnessMax || property == Property::RasterSaturation || property == Property::RasterContrast || property == Property::RasterFadeDuration) {
+ if (property == Property::RasterBrightnessMax || property == Property::RasterBrightnessMin || property == Property::RasterContrast || property == Property::RasterFadeDuration || property == Property::RasterHueRotate || property == Property::RasterOpacity || property == Property::RasterSaturation) {
Error error;
optional<PropertyValue<float>> typedValue = convert<PropertyValue<float>>(value, error, false, false);
if (!typedValue) {
return error;
}
- if (property == Property::RasterOpacity) {
- setRasterOpacity(*typedValue);
+ if (property == Property::RasterBrightnessMax) {
+ setRasterBrightnessMax(*typedValue);
return nullopt;
}
- if (property == Property::RasterHueRotate) {
- setRasterHueRotate(*typedValue);
+ if (property == Property::RasterBrightnessMin) {
+ setRasterBrightnessMin(*typedValue);
return nullopt;
}
- if (property == Property::RasterBrightnessMin) {
- setRasterBrightnessMin(*typedValue);
+ if (property == Property::RasterContrast) {
+ setRasterContrast(*typedValue);
return nullopt;
}
- if (property == Property::RasterBrightnessMax) {
- setRasterBrightnessMax(*typedValue);
+ if (property == Property::RasterFadeDuration) {
+ setRasterFadeDuration(*typedValue);
return nullopt;
}
- if (property == Property::RasterSaturation) {
- setRasterSaturation(*typedValue);
+ if (property == Property::RasterHueRotate) {
+ setRasterHueRotate(*typedValue);
return nullopt;
}
- if (property == Property::RasterContrast) {
- setRasterContrast(*typedValue);
+ if (property == Property::RasterOpacity) {
+ setRasterOpacity(*typedValue);
return nullopt;
}
- if (property == Property::RasterFadeDuration) {
- setRasterFadeDuration(*typedValue);
+ if (property == Property::RasterSaturation) {
+ setRasterSaturation(*typedValue);
return nullopt;
}
@@ -391,33 +391,33 @@ optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Con
return error;
}
- if (property == Property::RasterOpacityTransition) {
- setRasterOpacityTransition(*transition);
+ if (property == Property::RasterBrightnessMaxTransition) {
+ setRasterBrightnessMaxTransition(*transition);
return nullopt;
}
- if (property == Property::RasterHueRotateTransition) {
- setRasterHueRotateTransition(*transition);
+ if (property == Property::RasterBrightnessMinTransition) {
+ setRasterBrightnessMinTransition(*transition);
return nullopt;
}
- if (property == Property::RasterBrightnessMinTransition) {
- setRasterBrightnessMinTransition(*transition);
+ if (property == Property::RasterContrastTransition) {
+ setRasterContrastTransition(*transition);
return nullopt;
}
- if (property == Property::RasterBrightnessMaxTransition) {
- setRasterBrightnessMaxTransition(*transition);
+ if (property == Property::RasterFadeDurationTransition) {
+ setRasterFadeDurationTransition(*transition);
return nullopt;
}
- if (property == Property::RasterSaturationTransition) {
- setRasterSaturationTransition(*transition);
+ if (property == Property::RasterHueRotateTransition) {
+ setRasterHueRotateTransition(*transition);
return nullopt;
}
- if (property == Property::RasterContrastTransition) {
- setRasterContrastTransition(*transition);
+ if (property == Property::RasterOpacityTransition) {
+ setRasterOpacityTransition(*transition);
return nullopt;
}
@@ -426,8 +426,8 @@ optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Con
return nullopt;
}
- if (property == Property::RasterFadeDurationTransition) {
- setRasterFadeDurationTransition(*transition);
+ if (property == Property::RasterSaturationTransition) {
+ setRasterSaturationTransition(*transition);
return nullopt;
}
View Lorry Controller Status