diff --git a/include/llmr/style/properties.hpp b/include/llmr/style/properties.hpp index 37c26b470..ba0979cb9 100644 --- a/include/llmr/style/properties.hpp +++ b/include/llmr/style/properties.hpp @@ -7,6 +7,8 @@ #include #include +#include + namespace llmr { // Stores a premultiplied color, with all four channels ranging from 0..1 @@ -83,21 +85,20 @@ struct FunctionProperty { }; struct IconClass { - FunctionProperty enabled = true; - std::array translate = {{ 0, 0 }}; - PropertyTransition translate_transition; - TranslateAnchor translateAnchor = TranslateAnchor::Map; - FunctionProperty size; - Color color = {{ 1, 1, 1, 1 }}; - PropertyTransition color_transition; - FunctionProperty opacity = 1; - PropertyTransition opacity_transition; - std::string image; - FunctionProperty radius = 0; - PropertyTransition radius_transition; - FunctionProperty blur = 0; - PropertyTransition blur_transition; - std::set specifiers; + boost::optional enabled; + boost::optional> translate; + boost::optional translate_transition; + boost::optional translateAnchor; + boost::optional size; + boost::optional color; + boost::optional color_transition; + boost::optional opacity; + boost::optional opacity_transition; + boost::optional image; + boost::optional radius; + boost::optional radius_transition; + boost::optional blur; + boost::optional blur_transition; }; struct IconProperties { @@ -113,21 +114,20 @@ struct IconProperties { }; struct LineClass { - FunctionProperty enabled = true; - std::array translate = {{ 0, 0 }}; - PropertyTransition translate_transition; - TranslateAnchor translateAnchor = TranslateAnchor::Map; - FunctionProperty width; - PropertyTransition width_transition; - FunctionProperty offset; - PropertyTransition offset_transition; - Color color = {{ 0, 0, 0, 1 }}; - PropertyTransition color_transition; - std::array dash_array = {{ 1, -1 }}; - PropertyTransition dash_array_transition; - FunctionProperty opacity = 1; - PropertyTransition opacity_transition; - std::set specifiers; + boost::optional enabled; + boost::optional> translate; + boost::optional translate_transition; + boost::optional translateAnchor; + boost::optional width; + boost::optional width_transition; + boost::optional offset; + boost::optional offset_transition; + boost::optional color; + boost::optional color_transition; + boost::optional> dash_array; + boost::optional dash_array_transition; + boost::optional opacity; + boost::optional opacity_transition; }; struct LineProperties { @@ -142,20 +142,19 @@ struct LineProperties { }; struct FillClass { - FunctionProperty enabled = true; - std::array translate = {{ 0, 0 }}; - PropertyTransition translate_transition; - TranslateAnchor translateAnchor = TranslateAnchor::Map; - Winding winding = Winding::NonZero; - FunctionProperty antialias = true; - Color fill_color = {{ 0, 0, 0, 1 }}; - PropertyTransition fill_color_transition; - Color stroke_color = {{ 0, 0, 0, std::numeric_limits::infinity() }}; - PropertyTransition stroke_color_transition; - FunctionProperty opacity = 1; - PropertyTransition opacity_transition; - std::string image; - std::set specifiers; + boost::optional enabled; + boost::optional> translate; + boost::optional translate_transition; + boost::optional translateAnchor; + boost::optional winding; + boost::optional antialias; + boost::optional fill_color; + boost::optional fill_color_transition; + boost::optional stroke_color; + boost::optional stroke_color_transition; + boost::optional opacity; + boost::optional opacity_transition; + boost::optional image; }; struct FillProperties { @@ -171,24 +170,23 @@ struct FillProperties { }; struct TextClass { - FunctionProperty enabled = true; - std::array translate = {{ 0, 0 }}; - PropertyTransition translate_transition; - TranslateAnchor translateAnchor = TranslateAnchor::Map; - Color color = {{ 0, 0, 0, 1 }}; - PropertyTransition color_transition; - Color halo = {{ 1, 1, 1, 0.75 }}; - PropertyTransition halo_transition; - FunctionProperty halo_radius = 0.25f; - PropertyTransition halo_radius_transition; - FunctionProperty halo_blur = 1.0f; - PropertyTransition halo_blur_transition; - FunctionProperty size = 12.0f; - FunctionProperty rotate = 0.0f; - FunctionProperty always_visible = false; - FunctionProperty opacity = 1; - PropertyTransition opacity_transition; - std::set specifiers; + boost::optional enabled; + boost::optional> translate; + boost::optional translate_transition; + boost::optional translateAnchor; + boost::optional color; + boost::optional color_transition; + boost::optional halo; + boost::optional halo_transition; + boost::optional halo_radius; + boost::optional halo_radius_transition; + boost::optional halo_blur; + boost::optional halo_blur_transition; + boost::optional size; + boost::optional rotate; + boost::optional always_visible; + boost::optional opacity; + boost::optional opacity_transition; }; struct TextProperties { @@ -206,11 +204,10 @@ struct TextProperties { }; struct BackgroundClass { - Color color = {{ 1, 1, 1, 1 }}; - PropertyTransition color_transition; - FunctionProperty opacity = 1; - PropertyTransition opacity_transition; - std::set specifiers; + boost::optional color; + boost::optional color_transition; + boost::optional opacity; + boost::optional opacity_transition; }; struct BackgroundProperties { @@ -219,12 +216,11 @@ struct BackgroundProperties { }; struct RasterClass { - FunctionProperty enabled = true; - std::array translate = {{ 0, 0 }}; - PropertyTransition translate_transition; - FunctionProperty opacity = 1; - PropertyTransition opacity_transition; - std::set specifiers; + boost::optional enabled; + boost::optional> translate; + boost::optional translate_transition; + boost::optional opacity; + boost::optional opacity_transition; }; struct RasterProperties { @@ -234,10 +230,9 @@ struct RasterProperties { }; struct CompositeClass { - FunctionProperty enabled = true; - FunctionProperty opacity = 1; - PropertyTransition opacity_transition; - std::set specifiers; + boost::optional enabled; + boost::optional opacity; + boost::optional opacity_transition; }; struct CompositeProperties { diff --git a/src/style/style.cpp b/src/style/style.cpp index 2d13ceef9..918709924 100644 --- a/src/style/style.cpp +++ b/src/style/style.cpp @@ -62,57 +62,57 @@ void Style::cascade(float z) { llmr::FillProperties& fill = computed.fills[layer_name]; - if (layer.specifiers.count("enabled")) { - fill.enabled = layer.enabled.evaluate(z); + if (layer.enabled) { + fill.enabled = layer.enabled.get().evaluate(z); } - if (layer.specifiers.count("translate")) { - fill.translate = {{ layer.translate[0].evaluate(z), - layer.translate[1].evaluate(z) }}; + if (layer.translate) { + fill.translate = {{ layer.translate.get()[0].evaluate(z), + layer.translate.get()[1].evaluate(z) }}; computed.effective_classes[layer_name][TransitionablePropertyKey::Translate] = class_name; - if (layer.translate_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition; + if (layer.translate_transition && layer.translate_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition.get(); } } - if (layer.specifiers.count("translate-anchor")) { - fill.translateAnchor = layer.translateAnchor; + if (layer.translateAnchor) { + fill.translateAnchor = layer.translateAnchor.get(); } - if (layer.specifiers.count("winding")) { - fill.winding = layer.winding; + if (layer.winding) { + fill.winding = layer.winding.get(); } - if (layer.specifiers.count("antialias")) { - fill.antialias = layer.antialias.evaluate(z); + if (layer.antialias) { + fill.antialias = layer.antialias.get().evaluate(z); } - if (layer.specifiers.count("color")) { - fill.fill_color = layer.fill_color; + if (layer.fill_color) { + fill.fill_color = layer.fill_color.get(); computed.effective_classes[layer_name][TransitionablePropertyKey::FillColor] = class_name; - if (layer.fill_color_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::FillColor] = layer.fill_color_transition; + if (layer.fill_color_transition && layer.fill_color_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::FillColor] = layer.fill_color_transition.get(); } } - if (layer.specifiers.count("stroke")) { - fill.stroke_color = layer.stroke_color; + if (layer.stroke_color) { + fill.stroke_color = layer.stroke_color.get(); computed.effective_classes[layer_name][TransitionablePropertyKey::StrokeColor] = class_name; - if (layer.stroke_color_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::StrokeColor] = layer.stroke_color_transition; + if (layer.stroke_color_transition && layer.stroke_color_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::StrokeColor] = layer.stroke_color_transition.get(); } } - if (layer.specifiers.count("opacity")) { - fill.opacity = layer.opacity.evaluate(z); + if (layer.opacity) { + fill.opacity = layer.opacity.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Opacity] = class_name; - if (layer.opacity_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition; + if (layer.opacity_transition && layer.opacity_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition.get(); } } - if (layer.specifiers.count("image")) { - fill.image = layer.image; + if (layer.image) { + fill.image = layer.image.get(); } } @@ -123,62 +123,62 @@ void Style::cascade(float z) { llmr::LineProperties& stroke = computed.lines[layer_name]; - if (layer.specifiers.count("enabled")) { - stroke.enabled = layer.enabled.evaluate(z); + if (layer.enabled) { + stroke.enabled = layer.enabled.get().evaluate(z); } - if (layer.specifiers.count("translate")) { - stroke.translate = {{ layer.translate[0].evaluate(z), - layer.translate[1].evaluate(z) }}; + if (layer.translate) { + stroke.translate = {{ layer.translate.get()[0].evaluate(z), + layer.translate.get()[1].evaluate(z) }}; computed.effective_classes[layer_name][TransitionablePropertyKey::Translate] = class_name; - if (layer.translate_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition; + if (layer.translate_transition && layer.translate_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition.get(); } } - if (layer.specifiers.count("translate-anchor")) { - stroke.translateAnchor = layer.translateAnchor; + if (layer.translateAnchor) { + stroke.translateAnchor = layer.translateAnchor.get(); } - if (layer.specifiers.count("width")) { - stroke.width = layer.width.evaluate(z); + if (layer.width) { + stroke.width = layer.width.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Width] = class_name; - if (layer.width_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Width] = layer.width_transition; + if (layer.width_transition && layer.width_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Width] = layer.width_transition.get(); } } - if (layer.specifiers.count("offset")) { - stroke.offset = layer.offset.evaluate(z); + if (layer.offset) { + stroke.offset = layer.offset.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Offset] = class_name; - if (layer.offset_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Offset] = layer.offset_transition; + if (layer.offset_transition && layer.offset_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Offset] = layer.offset_transition.get(); } } - if (layer.specifiers.count("color")) { - stroke.color = layer.color; + if (layer.color) { + stroke.color = layer.color.get(); computed.effective_classes[layer_name][TransitionablePropertyKey::Color] = class_name; - if (layer.color_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Color] = layer.color_transition; + if (layer.color_transition && layer.color_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Color] = layer.color_transition.get(); } } - if (layer.specifiers.count("dasharray")) { - stroke.dash_array = {{ layer.dash_array[0].evaluate(z), - layer.dash_array[1].evaluate(z) }}; + if (layer.dash_array) { + stroke.dash_array = {{ layer.dash_array.get()[0].evaluate(z), + layer.dash_array.get()[1].evaluate(z) }}; computed.effective_classes[layer_name][TransitionablePropertyKey::DashArray] = class_name; - if (layer.dash_array_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::DashArray] = layer.dash_array_transition; + if (layer.dash_array_transition && layer.dash_array_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::DashArray] = layer.dash_array_transition.get(); } } - if (layer.specifiers.count("opacity")) { - stroke.opacity = layer.opacity.evaluate(z); + if (layer.opacity) { + stroke.opacity = layer.opacity.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Opacity] = class_name; - if (layer.opacity_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition; + if (layer.opacity_transition && layer.opacity_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition.get(); } } } @@ -190,60 +190,60 @@ void Style::cascade(float z) { llmr::IconProperties& icon = computed.icons[layer_name]; - if (layer.specifiers.count("enabled")) { - icon.enabled = layer.enabled.evaluate(z); + if (layer.enabled) { + icon.enabled = layer.enabled.get().evaluate(z); } - if (layer.specifiers.count("translate")) { - icon.translate = {{ layer.translate[0].evaluate(z), - layer.translate[1].evaluate(z) }}; + if (layer.translate) { + icon.translate = {{ layer.translate.get()[0].evaluate(z), + layer.translate.get()[1].evaluate(z) }}; computed.effective_classes[layer_name][TransitionablePropertyKey::Translate] = class_name; - if (layer.translate_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition; + if (layer.translate_transition && layer.translate_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition.get(); } } - if (layer.specifiers.count("translate-anchor")) { - icon.translateAnchor = layer.translateAnchor; + if (layer.translateAnchor) { + icon.translateAnchor = layer.translateAnchor.get(); } - if (layer.specifiers.count("color")) { - icon.color = layer.color; + if (layer.color) { + icon.color = layer.color.get(); computed.effective_classes[layer_name][TransitionablePropertyKey::Color] = class_name; - if (layer.color_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Color] = layer.color_transition; + if (layer.color_transition && layer.color_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Color] = layer.color_transition.get(); } } - if (layer.specifiers.count("size")) { - icon.size = layer.size.evaluate(z); + if (layer.size) { + icon.size = layer.size.get().evaluate(z); } - if (layer.specifiers.count("opacity")) { - icon.opacity = layer.opacity.evaluate(z); + if (layer.opacity) { + icon.opacity = layer.opacity.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Opacity] = class_name; - if (layer.opacity_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition; + if (layer.opacity_transition && layer.opacity_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition.get(); } } - if (layer.specifiers.count("image")) { - icon.image = layer.image; + if (layer.image) { + icon.image = layer.image.get(); } - if (layer.specifiers.count("radius")) { - icon.radius = layer.radius.evaluate(z); + if (layer.radius) { + icon.radius = layer.radius.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Radius] = class_name; - if (layer.radius_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Radius] = layer.radius_transition; + if (layer.radius_transition && layer.radius_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Radius] = layer.radius_transition.get(); } } - if (layer.specifiers.count("blur")) { - icon.blur = layer.blur.evaluate(z); + if (layer.blur) { + icon.blur = layer.blur.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Blur] = class_name; - if (layer.blur_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Blur] = layer.blur_transition; + if (layer.blur_transition && layer.blur_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Blur] = layer.blur_transition.get(); } } } @@ -255,72 +255,72 @@ void Style::cascade(float z) { llmr::TextProperties& text = computed.texts[layer_name]; - if (layer.specifiers.count("enabled")) { - text.enabled = layer.enabled.evaluate(z); + if (layer.enabled) { + text.enabled = layer.enabled.get().evaluate(z); } - if (layer.specifiers.count("translate")) { - text.translate = {{ layer.translate[0].evaluate(z), - layer.translate[1].evaluate(z) }}; + if (layer.translate) { + text.translate = {{ layer.translate.get()[0].evaluate(z), + layer.translate.get()[1].evaluate(z) }}; computed.effective_classes[layer_name][TransitionablePropertyKey::Translate] = class_name; - if (layer.translate_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition; + if (layer.translate_transition && layer.translate_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Translate] = layer.translate_transition.get(); } } - if (layer.specifiers.count("translate-anchor")) { - text.translateAnchor = layer.translateAnchor; + if (layer.translateAnchor) { + text.translateAnchor = layer.translateAnchor.get(); } - if (layer.specifiers.count("color")) { - text.color = layer.color; + if (layer.color) { + text.color = layer.color.get(); computed.effective_classes[layer_name][TransitionablePropertyKey::Color] = class_name; - if (layer.color_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Color] = layer.color_transition; + if (layer.color_transition && layer.color_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Color] = layer.color_transition.get(); } } - if (layer.specifiers.count("size")) { - text.size = layer.size.evaluate(z); + if (layer.size) { + text.size = layer.size.get().evaluate(z); } - if (layer.specifiers.count("stroke")) { - text.halo = layer.halo; + if (layer.halo) { + text.halo = layer.halo.get(); computed.effective_classes[layer_name][TransitionablePropertyKey::Halo] = class_name; - if (layer.halo_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Halo] = layer.halo_transition; + if (layer.halo_transition && layer.halo_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Halo] = layer.halo_transition.get(); } } - if (layer.specifiers.count("strokeWidth")) { - text.halo_radius = layer.halo_radius.evaluate(z); + if (layer.halo_radius) { + text.halo_radius = layer.halo_radius.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::HaloRadius] = class_name; - if (layer.halo_radius_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::HaloRadius] = layer.halo_radius_transition; + if (layer.halo_radius_transition && layer.halo_radius_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::HaloRadius] = layer.halo_radius_transition.get(); } } - if (layer.specifiers.count("strokeBlur")) { - text.halo_blur = layer.halo_blur.evaluate(z); + if (layer.halo_blur) { + text.halo_blur = layer.halo_blur.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::HaloBlur] = class_name; - if (layer.halo_blur_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::HaloBlur] = layer.halo_blur_transition; + if (layer.halo_blur_transition && layer.halo_blur_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::HaloBlur] = layer.halo_blur_transition.get(); } } - if (layer.specifiers.count("rotate")) { - text.rotate = layer.rotate.evaluate(z); + if (layer.rotate) { + text.rotate = layer.rotate.get().evaluate(z); } - if (layer.specifiers.count("alwaysVisible")) { - text.always_visible = layer.always_visible.evaluate(z); + if (layer.always_visible) { + text.always_visible = layer.always_visible.get().evaluate(z); } - if (layer.specifiers.count("opacity")) { - text.opacity = layer.opacity.evaluate(z); + if (layer.opacity) { + text.opacity = layer.opacity.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Opacity] = class_name; - if (layer.opacity_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition; + if (layer.opacity_transition && layer.opacity_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition.get(); } } } @@ -332,15 +332,15 @@ void Style::cascade(float z) { llmr::RasterProperties& raster = computed.rasters[layer_name]; - if (layer.specifiers.count("enabled")) { - raster.enabled = layer.enabled.evaluate(z); + if (layer.enabled) { + raster.enabled = layer.enabled.get().evaluate(z); } - if (layer.specifiers.count("opacity")) { - raster.opacity = layer.opacity.evaluate(z); + if (layer.opacity) { + raster.opacity = layer.opacity.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Opacity] = class_name; - if (layer.opacity_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition; + if (layer.opacity_transition && layer.opacity_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition.get(); } } } @@ -352,33 +352,33 @@ void Style::cascade(float z) { llmr::CompositeProperties& composite = computed.composites[layer_name]; - if (layer.specifiers.count("enabled")) { - composite.enabled = layer.enabled.evaluate(z); + if (layer.enabled) { + composite.enabled = layer.enabled.get().evaluate(z); } - if (layer.specifiers.count("opacity")) { - composite.opacity = layer.opacity.evaluate(z); + if (layer.opacity) { + composite.opacity = layer.opacity.get().evaluate(z); computed.effective_classes[layer_name][TransitionablePropertyKey::Opacity] = class_name; - if (layer.opacity_transition.duration) { - properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition; + if (layer.opacity_transition && layer.opacity_transition.get().duration) { + properties_to_transition[layer_name][TransitionablePropertyKey::Opacity] = layer.opacity_transition.get(); } } } // Cascade background. { - if (sheetClass.background.specifiers.count("color")) { - computed.background.color = sheetClass.background.color; + if (sheetClass.background.color) { + computed.background.color = sheetClass.background.color.get(); computed.effective_classes["background"][TransitionablePropertyKey::Color] = class_name; - if (sheetClass.background.color_transition.duration) { - properties_to_transition["background"][TransitionablePropertyKey::Color] = sheetClass.background.color_transition; + if (sheetClass.background.color_transition && sheetClass.background.color_transition.get().duration) { + properties_to_transition["background"][TransitionablePropertyKey::Color] = sheetClass.background.color_transition.get(); } } - if (sheetClass.background.specifiers.count("opacity")) { - computed.background.opacity = sheetClass.background.opacity.evaluate(z); + if (sheetClass.background.opacity) { + computed.background.opacity = sheetClass.background.opacity.get().evaluate(z); computed.effective_classes["background"][TransitionablePropertyKey::Opacity] = class_name; - if (sheetClass.background.opacity_transition.duration) { - properties_to_transition["background"][TransitionablePropertyKey::Opacity] = sheetClass.background.opacity_transition; + if (sheetClass.background.opacity_transition && sheetClass.background.opacity_transition.get().duration) { + properties_to_transition["background"][TransitionablePropertyKey::Opacity] = sheetClass.background.opacity_transition.get(); } } } diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index feef6e3e1..c299f1fd9 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -505,19 +505,16 @@ FillClass StyleParser::parseFillClass(JSVal value) { if (value.HasMember("enabled")) { klass.enabled = parseFunction(value["enabled"]); - klass.specifiers.insert("enabled"); } if (value.HasMember("translate")) { std::vector values = parseArray(value["translate"], 2); klass.translate = std::array {{ values[0], values[1] }}; klass.translate_transition = parseTransition(value, "translate"); - klass.specifiers.insert("translate"); } if (value.HasMember("translate-anchor")) { klass.translateAnchor = parseTranslateAnchor(value["translate-anchor"]); - klass.specifiers.insert("translate-anchor"); } if (value.HasMember("winding")) { @@ -527,32 +524,26 @@ FillClass StyleParser::parseFillClass(JSVal value) { if (value.HasMember("color")) { klass.fill_color = parseColor(value["color"]); klass.fill_color_transition = parseTransition(value, "color"); - klass.specifiers.insert("color"); } if (value.HasMember("stroke")) { klass.stroke_color = parseColor(value["stroke"]); klass.stroke_color_transition = parseTransition(value, "stroke"); - klass.specifiers.insert("stroke"); } else { klass.stroke_color = klass.fill_color; - klass.specifiers.insert("stroke"); } if (value.HasMember("antialias")) { klass.antialias = parseBoolean(value["antialias"]); - klass.specifiers.insert("antialias"); } if (value.HasMember("image")) { klass.image = parseString(value["image"]); - klass.specifiers.insert("image"); } if (value.HasMember("opacity")) { klass.opacity = parseFunction(value["opacity"]); klass.opacity_transition = parseTransition(value, "opacity"); - klass.specifiers.insert("opacity"); } return klass; @@ -563,44 +554,37 @@ LineClass StyleParser::parseLineClass(JSVal value) { if (value.HasMember("enabled")) { klass.enabled = parseFunction(value["enabled"]); - klass.specifiers.insert("enabled"); } if (value.HasMember("translate")) { std::vector values = parseArray(value["translate"], 2); klass.translate = std::array {{ values[0], values[1] }}; klass.translate_transition = parseTransition(value, "translate"); - klass.specifiers.insert("translate"); } if (value.HasMember("translate-anchor")) { klass.translateAnchor = parseTranslateAnchor(value["translate-anchor"]); - klass.specifiers.insert("translate-anchor"); } if (value.HasMember("color")) { klass.color = parseColor(value["color"]); klass.color_transition = parseTransition(value, "color"); - klass.specifiers.insert("color"); } if (value.HasMember("width")) { klass.width = parseFunction(value["width"]); klass.width_transition = parseTransition(value, "width"); - klass.specifiers.insert("width"); } if (value.HasMember("opacity")) { klass.opacity = parseFunction(value["opacity"]); klass.opacity_transition = parseTransition(value, "opacity"); - klass.specifiers.insert("opacity"); } if (value.HasMember("dasharray")) { std::vector values = parseArray(value["dasharray"], 2); klass.dash_array = std::array {{ values[0], values[1] }}; klass.dash_array_transition = parseTransition(value, "dasharray"); - klass.specifiers.insert("dasharray"); } return klass; @@ -611,53 +595,44 @@ IconClass StyleParser::parseIconClass(JSVal value) { if (value.HasMember("enabled")) { klass.enabled = parseFunction(value["enabled"]); - klass.specifiers.insert("enabled"); } if (value.HasMember("translate")) { std::vector values = parseArray(value["translate"], 2); klass.translate = std::array {{ values[0], values[1] }}; klass.translate_transition = parseTransition(value, "translate"); - klass.specifiers.insert("translate"); } if (value.HasMember("translate-anchor")) { klass.translateAnchor = parseTranslateAnchor(value["translate-anchor"]); - klass.specifiers.insert("translate-anchor"); } if (value.HasMember("color")) { klass.color = parseColor(value["color"]); klass.color_transition = parseTransition(value, "color"); - klass.specifiers.insert("color"); } if (value.HasMember("opacity")) { klass.opacity = parseFunction(value["opacity"]); klass.opacity_transition = parseTransition(value, "opacity"); - klass.specifiers.insert("opacity"); } if (value.HasMember("image")) { klass.image = parseString(value["image"]); - klass.specifiers.insert("image"); } if (value.HasMember("size")) { klass.size = parseFunction(value["size"]); - klass.specifiers.insert("size"); } if (value.HasMember("radius")) { klass.radius = parseFunction(value["radius"]); klass.radius_transition = parseTransition(value, "radius"); - klass.specifiers.insert("radius"); } if (value.HasMember("blur")) { klass.blur = parseFunction(value["blur"]); klass.blur_transition = parseTransition(value, "blur"); - klass.specifiers.insert("blur"); } return klass; @@ -668,64 +643,53 @@ TextClass StyleParser::parseTextClass(JSVal value) { if (value.HasMember("enabled")) { klass.enabled = parseFunction(value["enabled"]); - klass.specifiers.insert("enabled"); } if (value.HasMember("translate")) { std::vector values = parseArray(value["translate"], 2); klass.translate = std::array {{ values[0], values[1] }}; klass.translate_transition = parseTransition(value, "translate"); - klass.specifiers.insert("translate"); } if (value.HasMember("translate-anchor")) { klass.translateAnchor = parseTranslateAnchor(value["translate-anchor"]); - klass.specifiers.insert("translate-anchor"); } if (value.HasMember("color")) { klass.color = parseColor(value["color"]); klass.color_transition = parseTransition(value, "color"); - klass.specifiers.insert("color"); } if (value.HasMember("stroke")) { klass.halo = parseColor(value["stroke"]); klass.halo_transition = parseTransition(value, "stroke"); - klass.specifiers.insert("stroke"); } if (value.HasMember("strokeWidth")) { klass.halo_radius = parseFunction(value["strokeWidth"]); klass.halo_radius_transition = parseTransition(value, "strokeWidth"); - klass.specifiers.insert("strokeWidth"); } if (value.HasMember("strokeBlur")) { klass.halo_blur = parseFunction(value["strokeBlur"]); klass.halo_blur_transition = parseTransition(value, "strokeBlur"); - klass.specifiers.insert("strokeBlur"); } if (value.HasMember("size")) { klass.size = parseFunction(value["size"]); - klass.specifiers.insert("size"); } if (value.HasMember("rotate")) { klass.rotate = parseFunction(value["rotate"]); - klass.specifiers.insert("rotate"); } if (value.HasMember("alwaysVisible")) { klass.always_visible = parseFunction(value["alwaysVisible"]); - klass.specifiers.insert("alwaysVisible"); } if (value.HasMember("opacity")) { klass.opacity = parseFunction(value["opacity"]); klass.opacity_transition = parseTransition(value, "opacity"); - klass.specifiers.insert("opacity"); } return klass; @@ -736,13 +700,11 @@ RasterClass StyleParser::parseRasterClass(JSVal value) { if (value.HasMember("enabled")) { klass.enabled = parseFunction(value["enabled"]); - klass.specifiers.insert("enabled"); } if (value.HasMember("opacity")) { klass.opacity = parseFunction(value["opacity"]); klass.opacity_transition = parseTransition(value, "opacity"); - klass.specifiers.insert("opacity"); } return klass; @@ -753,13 +715,11 @@ CompositeClass StyleParser::parseCompositeClass(JSVal value) { if (value.HasMember("enabled")) { klass.enabled = parseFunction(value["enabled"]); - klass.specifiers.insert("enabled"); } if (value.HasMember("opacity")) { klass.opacity = parseFunction(value["opacity"]); klass.opacity_transition = parseTransition(value, "opacity"); - klass.specifiers.insert("opacity"); } return klass; @@ -771,13 +731,11 @@ BackgroundClass StyleParser::parseBackgroundClass(JSVal value) { if (value.HasMember("color")) { klass.color = parseColor(value["color"]); klass.color_transition = parseTransition(value, "color"); - klass.specifiers.insert("color"); } if (value.HasMember("opacity")) { klass.opacity = parseFunction(value["opacity"]); klass.opacity_transition = parseTransition(value, "opacity"); - klass.specifiers.insert("opacity"); } return klass;