diff --git a/include/mbgl/shader/raster_shader.hpp b/include/mbgl/shader/raster_shader.hpp index e27f2b4f2..11765413f 100644 --- a/include/mbgl/shader/raster_shader.hpp +++ b/include/mbgl/shader/raster_shader.hpp @@ -34,7 +34,7 @@ private: float brightness_low = 0; int32_t u_brightness_low = -1; - float brightness_high = 1; + float brightness_high = 0; int32_t u_brightness_high = -1; float saturation_factor = 0; diff --git a/include/mbgl/style/property_key.hpp b/include/mbgl/style/property_key.hpp index 7d2498176..aee5db038 100644 --- a/include/mbgl/style/property_key.hpp +++ b/include/mbgl/style/property_key.hpp @@ -55,6 +55,7 @@ enum class PropertyKey { RasterOpacity, RasterHueRotate, + RasterBrightness, // for transitions only RasterBrightnessLow, RasterBrightnessHigh, RasterSaturation, diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index 67d3f81a0..43790e21b 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -631,15 +631,12 @@ void StyleParser::parseStyle(JSVal value, ClassProperties &klass) { parseOptionalProperty>("composite-opacity", Key::CompositeOpacity, klass, value); parseOptionalProperty("transition-composite-opacity", Key::CompositeOpacity, klass, value); -// TODO edit these?: parseOptionalProperty>("raster-opacity", Key::RasterOpacity, klass, value); parseOptionalProperty("transition-raster-opacity", Key::RasterOpacity, klass, value); parseOptionalProperty>("raster-hue-rotate", Key::RasterHueRotate, klass, value); parseOptionalProperty("transition-raster-hue-rotate", Key::RasterHueRotate, klass, value); - parseOptionalProperty>("raster-brightness-low", Key::RasterBrightnessLow, klass, value); - parseOptionalProperty("transition-raster-brightness-low", Key::RasterBrightnessLow, klass, value); - parseOptionalProperty>("raster-brightness-high", Key::RasterBrightnessHigh, klass, value); - parseOptionalProperty("transition-raster-brightness-high", Key::RasterBrightnessHigh, klass, value); + parseOptionalProperty>("raster-brightness", { Key::RasterBrightnessLow, Key::RasterBrightnessHigh }, klass, value); + parseOptionalProperty("transition-raster-brightness", Key::RasterBrightness, klass, value); parseOptionalProperty>("raster-saturation", Key::RasterSaturation, klass, value); parseOptionalProperty("transition-raster-saturation", Key::RasterSaturation, klass, value); parseOptionalProperty>("raster-contrast", Key::RasterContrast, klass, value);