From e044e0aab9f63883e935d94e0cf9aceb37f4e6eb Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 28 Feb 2017 17:17:45 -0800 Subject: [core] Avoid using std::function in property_setter.hpp --- .../style/conversion/make_property_setters.hpp | 322 ++++++++++----------- .../style/conversion/make_property_setters.hpp.ejs | 6 +- include/mbgl/style/conversion/property_setter.hpp | 79 ++--- 3 files changed, 209 insertions(+), 198 deletions(-) (limited to 'include/mbgl/style/conversion') diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp index 32fa810f0b..623cc09098 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp +++ b/include/mbgl/style/conversion/make_property_setters.hpp @@ -25,45 +25,45 @@ auto makeLayoutPropertySetters() { result["visibility"] = &setVisibility; - result["line-cap"] = makePropertySetter(&LineLayer::setLineCap); - result["line-join"] = makePropertySetter(&LineLayer::setLineJoin); - result["line-miter-limit"] = makePropertySetter(&LineLayer::setLineMiterLimit); - result["line-round-limit"] = makePropertySetter(&LineLayer::setLineRoundLimit); - - result["symbol-placement"] = makePropertySetter(&SymbolLayer::setSymbolPlacement); - result["symbol-spacing"] = makePropertySetter(&SymbolLayer::setSymbolSpacing); - result["symbol-avoid-edges"] = makePropertySetter(&SymbolLayer::setSymbolAvoidEdges); - result["icon-allow-overlap"] = makePropertySetter(&SymbolLayer::setIconAllowOverlap); - result["icon-ignore-placement"] = makePropertySetter(&SymbolLayer::setIconIgnorePlacement); - result["icon-optional"] = makePropertySetter(&SymbolLayer::setIconOptional); - result["icon-rotation-alignment"] = makePropertySetter(&SymbolLayer::setIconRotationAlignment); - result["icon-size"] = makePropertySetter(&SymbolLayer::setIconSize); - result["icon-text-fit"] = makePropertySetter(&SymbolLayer::setIconTextFit); - result["icon-text-fit-padding"] = makePropertySetter(&SymbolLayer::setIconTextFitPadding); - result["icon-image"] = makePropertySetter(&SymbolLayer::setIconImage); - result["icon-rotate"] = makePropertySetter(&SymbolLayer::setIconRotate); - result["icon-padding"] = makePropertySetter(&SymbolLayer::setIconPadding); - result["icon-keep-upright"] = makePropertySetter(&SymbolLayer::setIconKeepUpright); - result["icon-offset"] = makePropertySetter(&SymbolLayer::setIconOffset); - result["text-pitch-alignment"] = makePropertySetter(&SymbolLayer::setTextPitchAlignment); - result["text-rotation-alignment"] = makePropertySetter(&SymbolLayer::setTextRotationAlignment); - result["text-field"] = makePropertySetter(&SymbolLayer::setTextField); - result["text-font"] = makePropertySetter(&SymbolLayer::setTextFont); - result["text-size"] = makePropertySetter(&SymbolLayer::setTextSize); - result["text-max-width"] = makePropertySetter(&SymbolLayer::setTextMaxWidth); - result["text-line-height"] = makePropertySetter(&SymbolLayer::setTextLineHeight); - result["text-letter-spacing"] = makePropertySetter(&SymbolLayer::setTextLetterSpacing); - result["text-justify"] = makePropertySetter(&SymbolLayer::setTextJustify); - result["text-anchor"] = makePropertySetter(&SymbolLayer::setTextAnchor); - result["text-max-angle"] = makePropertySetter(&SymbolLayer::setTextMaxAngle); - result["text-rotate"] = makePropertySetter(&SymbolLayer::setTextRotate); - result["text-padding"] = makePropertySetter(&SymbolLayer::setTextPadding); - result["text-keep-upright"] = makePropertySetter(&SymbolLayer::setTextKeepUpright); - result["text-transform"] = makePropertySetter(&SymbolLayer::setTextTransform); - result["text-offset"] = makePropertySetter(&SymbolLayer::setTextOffset); - result["text-allow-overlap"] = makePropertySetter(&SymbolLayer::setTextAllowOverlap); - result["text-ignore-placement"] = makePropertySetter(&SymbolLayer::setTextIgnorePlacement); - result["text-optional"] = makePropertySetter(&SymbolLayer::setTextOptional); + result["line-cap"] = &setLayoutProperty, &LineLayer::setLineCap>; + result["line-join"] = &setLayoutProperty, &LineLayer::setLineJoin>; + result["line-miter-limit"] = &setLayoutProperty, &LineLayer::setLineMiterLimit>; + result["line-round-limit"] = &setLayoutProperty, &LineLayer::setLineRoundLimit>; + + result["symbol-placement"] = &setLayoutProperty, &SymbolLayer::setSymbolPlacement>; + result["symbol-spacing"] = &setLayoutProperty, &SymbolLayer::setSymbolSpacing>; + result["symbol-avoid-edges"] = &setLayoutProperty, &SymbolLayer::setSymbolAvoidEdges>; + result["icon-allow-overlap"] = &setLayoutProperty, &SymbolLayer::setIconAllowOverlap>; + result["icon-ignore-placement"] = &setLayoutProperty, &SymbolLayer::setIconIgnorePlacement>; + result["icon-optional"] = &setLayoutProperty, &SymbolLayer::setIconOptional>; + result["icon-rotation-alignment"] = &setLayoutProperty, &SymbolLayer::setIconRotationAlignment>; + result["icon-size"] = &setLayoutProperty, &SymbolLayer::setIconSize>; + result["icon-text-fit"] = &setLayoutProperty, &SymbolLayer::setIconTextFit>; + result["icon-text-fit-padding"] = &setLayoutProperty>, &SymbolLayer::setIconTextFitPadding>; + result["icon-image"] = &setLayoutProperty, &SymbolLayer::setIconImage>; + result["icon-rotate"] = &setLayoutProperty, &SymbolLayer::setIconRotate>; + result["icon-padding"] = &setLayoutProperty, &SymbolLayer::setIconPadding>; + result["icon-keep-upright"] = &setLayoutProperty, &SymbolLayer::setIconKeepUpright>; + result["icon-offset"] = &setLayoutProperty>, &SymbolLayer::setIconOffset>; + result["text-pitch-alignment"] = &setLayoutProperty, &SymbolLayer::setTextPitchAlignment>; + result["text-rotation-alignment"] = &setLayoutProperty, &SymbolLayer::setTextRotationAlignment>; + result["text-field"] = &setLayoutProperty, &SymbolLayer::setTextField>; + result["text-font"] = &setLayoutProperty>, &SymbolLayer::setTextFont>; + result["text-size"] = &setLayoutProperty, &SymbolLayer::setTextSize>; + result["text-max-width"] = &setLayoutProperty, &SymbolLayer::setTextMaxWidth>; + result["text-line-height"] = &setLayoutProperty, &SymbolLayer::setTextLineHeight>; + result["text-letter-spacing"] = &setLayoutProperty, &SymbolLayer::setTextLetterSpacing>; + result["text-justify"] = &setLayoutProperty, &SymbolLayer::setTextJustify>; + result["text-anchor"] = &setLayoutProperty, &SymbolLayer::setTextAnchor>; + result["text-max-angle"] = &setLayoutProperty, &SymbolLayer::setTextMaxAngle>; + result["text-rotate"] = &setLayoutProperty, &SymbolLayer::setTextRotate>; + result["text-padding"] = &setLayoutProperty, &SymbolLayer::setTextPadding>; + result["text-keep-upright"] = &setLayoutProperty, &SymbolLayer::setTextKeepUpright>; + result["text-transform"] = &setLayoutProperty, &SymbolLayer::setTextTransform>; + result["text-offset"] = &setLayoutProperty>, &SymbolLayer::setTextOffset>; + result["text-allow-overlap"] = &setLayoutProperty, &SymbolLayer::setTextAllowOverlap>; + result["text-ignore-placement"] = &setLayoutProperty, &SymbolLayer::setTextIgnorePlacement>; + result["text-optional"] = &setLayoutProperty, &SymbolLayer::setTextOptional>; @@ -76,128 +76,128 @@ template auto makePaintPropertySetters() { std::unordered_map> result; - result["fill-antialias"] = makePropertySetter(&FillLayer::setFillAntialias); - result["fill-antialias-transition"] = makeTransitionSetter(&FillLayer::setFillAntialiasTransition); - result["fill-opacity"] = makePropertySetter(&FillLayer::setFillOpacity); - result["fill-opacity-transition"] = makeTransitionSetter(&FillLayer::setFillOpacityTransition); - result["fill-color"] = makePropertySetter(&FillLayer::setFillColor); - result["fill-color-transition"] = makeTransitionSetter(&FillLayer::setFillColorTransition); - result["fill-outline-color"] = makePropertySetter(&FillLayer::setFillOutlineColor); - result["fill-outline-color-transition"] = makeTransitionSetter(&FillLayer::setFillOutlineColorTransition); - result["fill-translate"] = makePropertySetter(&FillLayer::setFillTranslate); - result["fill-translate-transition"] = makeTransitionSetter(&FillLayer::setFillTranslateTransition); - result["fill-translate-anchor"] = makePropertySetter(&FillLayer::setFillTranslateAnchor); - result["fill-translate-anchor-transition"] = makeTransitionSetter(&FillLayer::setFillTranslateAnchorTransition); - result["fill-pattern"] = makePropertySetter(&FillLayer::setFillPattern); - result["fill-pattern-transition"] = makeTransitionSetter(&FillLayer::setFillPatternTransition); - - result["line-opacity"] = makePropertySetter(&LineLayer::setLineOpacity); - result["line-opacity-transition"] = makeTransitionSetter(&LineLayer::setLineOpacityTransition); - result["line-color"] = makePropertySetter(&LineLayer::setLineColor); - result["line-color-transition"] = makeTransitionSetter(&LineLayer::setLineColorTransition); - result["line-translate"] = makePropertySetter(&LineLayer::setLineTranslate); - result["line-translate-transition"] = makeTransitionSetter(&LineLayer::setLineTranslateTransition); - result["line-translate-anchor"] = makePropertySetter(&LineLayer::setLineTranslateAnchor); - result["line-translate-anchor-transition"] = makeTransitionSetter(&LineLayer::setLineTranslateAnchorTransition); - result["line-width"] = makePropertySetter(&LineLayer::setLineWidth); - result["line-width-transition"] = makeTransitionSetter(&LineLayer::setLineWidthTransition); - result["line-gap-width"] = makePropertySetter(&LineLayer::setLineGapWidth); - result["line-gap-width-transition"] = makeTransitionSetter(&LineLayer::setLineGapWidthTransition); - result["line-offset"] = makePropertySetter(&LineLayer::setLineOffset); - result["line-offset-transition"] = makeTransitionSetter(&LineLayer::setLineOffsetTransition); - result["line-blur"] = makePropertySetter(&LineLayer::setLineBlur); - result["line-blur-transition"] = makeTransitionSetter(&LineLayer::setLineBlurTransition); - result["line-dasharray"] = makePropertySetter(&LineLayer::setLineDasharray); - result["line-dasharray-transition"] = makeTransitionSetter(&LineLayer::setLineDasharrayTransition); - result["line-pattern"] = makePropertySetter(&LineLayer::setLinePattern); - result["line-pattern-transition"] = makeTransitionSetter(&LineLayer::setLinePatternTransition); - - result["icon-opacity"] = makePropertySetter(&SymbolLayer::setIconOpacity); - result["icon-opacity-transition"] = makeTransitionSetter(&SymbolLayer::setIconOpacityTransition); - result["icon-color"] = makePropertySetter(&SymbolLayer::setIconColor); - result["icon-color-transition"] = makeTransitionSetter(&SymbolLayer::setIconColorTransition); - result["icon-halo-color"] = makePropertySetter(&SymbolLayer::setIconHaloColor); - result["icon-halo-color-transition"] = makeTransitionSetter(&SymbolLayer::setIconHaloColorTransition); - result["icon-halo-width"] = makePropertySetter(&SymbolLayer::setIconHaloWidth); - result["icon-halo-width-transition"] = makeTransitionSetter(&SymbolLayer::setIconHaloWidthTransition); - result["icon-halo-blur"] = makePropertySetter(&SymbolLayer::setIconHaloBlur); - result["icon-halo-blur-transition"] = makeTransitionSetter(&SymbolLayer::setIconHaloBlurTransition); - result["icon-translate"] = makePropertySetter(&SymbolLayer::setIconTranslate); - result["icon-translate-transition"] = makeTransitionSetter(&SymbolLayer::setIconTranslateTransition); - result["icon-translate-anchor"] = makePropertySetter(&SymbolLayer::setIconTranslateAnchor); - result["icon-translate-anchor-transition"] = makeTransitionSetter(&SymbolLayer::setIconTranslateAnchorTransition); - result["text-opacity"] = makePropertySetter(&SymbolLayer::setTextOpacity); - result["text-opacity-transition"] = makeTransitionSetter(&SymbolLayer::setTextOpacityTransition); - result["text-color"] = makePropertySetter(&SymbolLayer::setTextColor); - result["text-color-transition"] = makeTransitionSetter(&SymbolLayer::setTextColorTransition); - result["text-halo-color"] = makePropertySetter(&SymbolLayer::setTextHaloColor); - result["text-halo-color-transition"] = makeTransitionSetter(&SymbolLayer::setTextHaloColorTransition); - result["text-halo-width"] = makePropertySetter(&SymbolLayer::setTextHaloWidth); - result["text-halo-width-transition"] = makeTransitionSetter(&SymbolLayer::setTextHaloWidthTransition); - result["text-halo-blur"] = makePropertySetter(&SymbolLayer::setTextHaloBlur); - result["text-halo-blur-transition"] = makeTransitionSetter(&SymbolLayer::setTextHaloBlurTransition); - result["text-translate"] = makePropertySetter(&SymbolLayer::setTextTranslate); - result["text-translate-transition"] = makeTransitionSetter(&SymbolLayer::setTextTranslateTransition); - result["text-translate-anchor"] = makePropertySetter(&SymbolLayer::setTextTranslateAnchor); - result["text-translate-anchor-transition"] = makeTransitionSetter(&SymbolLayer::setTextTranslateAnchorTransition); - - result["circle-radius"] = makePropertySetter(&CircleLayer::setCircleRadius); - result["circle-radius-transition"] = makeTransitionSetter(&CircleLayer::setCircleRadiusTransition); - result["circle-color"] = makePropertySetter(&CircleLayer::setCircleColor); - result["circle-color-transition"] = makeTransitionSetter(&CircleLayer::setCircleColorTransition); - result["circle-blur"] = makePropertySetter(&CircleLayer::setCircleBlur); - result["circle-blur-transition"] = makeTransitionSetter(&CircleLayer::setCircleBlurTransition); - result["circle-opacity"] = makePropertySetter(&CircleLayer::setCircleOpacity); - result["circle-opacity-transition"] = makeTransitionSetter(&CircleLayer::setCircleOpacityTransition); - result["circle-translate"] = makePropertySetter(&CircleLayer::setCircleTranslate); - result["circle-translate-transition"] = makeTransitionSetter(&CircleLayer::setCircleTranslateTransition); - result["circle-translate-anchor"] = makePropertySetter(&CircleLayer::setCircleTranslateAnchor); - result["circle-translate-anchor-transition"] = makeTransitionSetter(&CircleLayer::setCircleTranslateAnchorTransition); - result["circle-pitch-scale"] = makePropertySetter(&CircleLayer::setCirclePitchScale); - result["circle-pitch-scale-transition"] = makeTransitionSetter(&CircleLayer::setCirclePitchScaleTransition); - result["circle-stroke-width"] = makePropertySetter(&CircleLayer::setCircleStrokeWidth); - result["circle-stroke-width-transition"] = makeTransitionSetter(&CircleLayer::setCircleStrokeWidthTransition); - result["circle-stroke-color"] = makePropertySetter(&CircleLayer::setCircleStrokeColor); - result["circle-stroke-color-transition"] = makeTransitionSetter(&CircleLayer::setCircleStrokeColorTransition); - result["circle-stroke-opacity"] = makePropertySetter(&CircleLayer::setCircleStrokeOpacity); - result["circle-stroke-opacity-transition"] = makeTransitionSetter(&CircleLayer::setCircleStrokeOpacityTransition); - - result["fill-extrusion-opacity"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionOpacity); - result["fill-extrusion-opacity-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionOpacityTransition); - result["fill-extrusion-color"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionColor); - result["fill-extrusion-color-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionColorTransition); - result["fill-extrusion-translate"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionTranslate); - result["fill-extrusion-translate-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionTranslateTransition); - result["fill-extrusion-translate-anchor"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionTranslateAnchor); - result["fill-extrusion-translate-anchor-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionTranslateAnchorTransition); - result["fill-extrusion-pattern"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionPattern); - result["fill-extrusion-pattern-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionPatternTransition); - result["fill-extrusion-height"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionHeight); - result["fill-extrusion-height-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionHeightTransition); - result["fill-extrusion-base"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionBase); - result["fill-extrusion-base-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionBaseTransition); - - result["raster-opacity"] = makePropertySetter(&RasterLayer::setRasterOpacity); - result["raster-opacity-transition"] = makeTransitionSetter(&RasterLayer::setRasterOpacityTransition); - result["raster-hue-rotate"] = makePropertySetter(&RasterLayer::setRasterHueRotate); - result["raster-hue-rotate-transition"] = makeTransitionSetter(&RasterLayer::setRasterHueRotateTransition); - result["raster-brightness-min"] = makePropertySetter(&RasterLayer::setRasterBrightnessMin); - result["raster-brightness-min-transition"] = makeTransitionSetter(&RasterLayer::setRasterBrightnessMinTransition); - result["raster-brightness-max"] = makePropertySetter(&RasterLayer::setRasterBrightnessMax); - result["raster-brightness-max-transition"] = makeTransitionSetter(&RasterLayer::setRasterBrightnessMaxTransition); - result["raster-saturation"] = makePropertySetter(&RasterLayer::setRasterSaturation); - result["raster-saturation-transition"] = makeTransitionSetter(&RasterLayer::setRasterSaturationTransition); - result["raster-contrast"] = makePropertySetter(&RasterLayer::setRasterContrast); - result["raster-contrast-transition"] = makeTransitionSetter(&RasterLayer::setRasterContrastTransition); - result["raster-fade-duration"] = makePropertySetter(&RasterLayer::setRasterFadeDuration); - result["raster-fade-duration-transition"] = makeTransitionSetter(&RasterLayer::setRasterFadeDurationTransition); - - result["background-color"] = makePropertySetter(&BackgroundLayer::setBackgroundColor); - result["background-color-transition"] = makeTransitionSetter(&BackgroundLayer::setBackgroundColorTransition); - result["background-pattern"] = makePropertySetter(&BackgroundLayer::setBackgroundPattern); - result["background-pattern-transition"] = makeTransitionSetter(&BackgroundLayer::setBackgroundPatternTransition); - result["background-opacity"] = makePropertySetter(&BackgroundLayer::setBackgroundOpacity); - result["background-opacity-transition"] = makeTransitionSetter(&BackgroundLayer::setBackgroundOpacityTransition); + result["fill-antialias"] = &setPaintProperty, &FillLayer::setFillAntialias>; + result["fill-antialias-transition"] = &setTransition; + result["fill-opacity"] = &setPaintProperty, &FillLayer::setFillOpacity>; + result["fill-opacity-transition"] = &setTransition; + result["fill-color"] = &setPaintProperty, &FillLayer::setFillColor>; + result["fill-color-transition"] = &setTransition; + result["fill-outline-color"] = &setPaintProperty, &FillLayer::setFillOutlineColor>; + result["fill-outline-color-transition"] = &setTransition; + result["fill-translate"] = &setPaintProperty>, &FillLayer::setFillTranslate>; + result["fill-translate-transition"] = &setTransition; + result["fill-translate-anchor"] = &setPaintProperty, &FillLayer::setFillTranslateAnchor>; + result["fill-translate-anchor-transition"] = &setTransition; + result["fill-pattern"] = &setPaintProperty, &FillLayer::setFillPattern>; + result["fill-pattern-transition"] = &setTransition; + + result["line-opacity"] = &setPaintProperty, &LineLayer::setLineOpacity>; + result["line-opacity-transition"] = &setTransition; + result["line-color"] = &setPaintProperty, &LineLayer::setLineColor>; + result["line-color-transition"] = &setTransition; + result["line-translate"] = &setPaintProperty>, &LineLayer::setLineTranslate>; + result["line-translate-transition"] = &setTransition; + result["line-translate-anchor"] = &setPaintProperty, &LineLayer::setLineTranslateAnchor>; + result["line-translate-anchor-transition"] = &setTransition; + result["line-width"] = &setPaintProperty, &LineLayer::setLineWidth>; + result["line-width-transition"] = &setTransition; + result["line-gap-width"] = &setPaintProperty, &LineLayer::setLineGapWidth>; + result["line-gap-width-transition"] = &setTransition; + result["line-offset"] = &setPaintProperty, &LineLayer::setLineOffset>; + result["line-offset-transition"] = &setTransition; + result["line-blur"] = &setPaintProperty, &LineLayer::setLineBlur>; + result["line-blur-transition"] = &setTransition; + result["line-dasharray"] = &setPaintProperty>, &LineLayer::setLineDasharray>; + result["line-dasharray-transition"] = &setTransition; + result["line-pattern"] = &setPaintProperty, &LineLayer::setLinePattern>; + result["line-pattern-transition"] = &setTransition; + + result["icon-opacity"] = &setPaintProperty, &SymbolLayer::setIconOpacity>; + result["icon-opacity-transition"] = &setTransition; + result["icon-color"] = &setPaintProperty, &SymbolLayer::setIconColor>; + result["icon-color-transition"] = &setTransition; + result["icon-halo-color"] = &setPaintProperty, &SymbolLayer::setIconHaloColor>; + result["icon-halo-color-transition"] = &setTransition; + result["icon-halo-width"] = &setPaintProperty, &SymbolLayer::setIconHaloWidth>; + result["icon-halo-width-transition"] = &setTransition; + result["icon-halo-blur"] = &setPaintProperty, &SymbolLayer::setIconHaloBlur>; + result["icon-halo-blur-transition"] = &setTransition; + result["icon-translate"] = &setPaintProperty>, &SymbolLayer::setIconTranslate>; + result["icon-translate-transition"] = &setTransition; + result["icon-translate-anchor"] = &setPaintProperty, &SymbolLayer::setIconTranslateAnchor>; + result["icon-translate-anchor-transition"] = &setTransition; + result["text-opacity"] = &setPaintProperty, &SymbolLayer::setTextOpacity>; + result["text-opacity-transition"] = &setTransition; + result["text-color"] = &setPaintProperty, &SymbolLayer::setTextColor>; + result["text-color-transition"] = &setTransition; + result["text-halo-color"] = &setPaintProperty, &SymbolLayer::setTextHaloColor>; + result["text-halo-color-transition"] = &setTransition; + result["text-halo-width"] = &setPaintProperty, &SymbolLayer::setTextHaloWidth>; + result["text-halo-width-transition"] = &setTransition; + result["text-halo-blur"] = &setPaintProperty, &SymbolLayer::setTextHaloBlur>; + result["text-halo-blur-transition"] = &setTransition; + result["text-translate"] = &setPaintProperty>, &SymbolLayer::setTextTranslate>; + result["text-translate-transition"] = &setTransition; + result["text-translate-anchor"] = &setPaintProperty, &SymbolLayer::setTextTranslateAnchor>; + result["text-translate-anchor-transition"] = &setTransition; + + result["circle-radius"] = &setPaintProperty, &CircleLayer::setCircleRadius>; + result["circle-radius-transition"] = &setTransition; + result["circle-color"] = &setPaintProperty, &CircleLayer::setCircleColor>; + result["circle-color-transition"] = &setTransition; + result["circle-blur"] = &setPaintProperty, &CircleLayer::setCircleBlur>; + result["circle-blur-transition"] = &setTransition; + result["circle-opacity"] = &setPaintProperty, &CircleLayer::setCircleOpacity>; + result["circle-opacity-transition"] = &setTransition; + result["circle-translate"] = &setPaintProperty>, &CircleLayer::setCircleTranslate>; + result["circle-translate-transition"] = &setTransition; + result["circle-translate-anchor"] = &setPaintProperty, &CircleLayer::setCircleTranslateAnchor>; + result["circle-translate-anchor-transition"] = &setTransition; + result["circle-pitch-scale"] = &setPaintProperty, &CircleLayer::setCirclePitchScale>; + result["circle-pitch-scale-transition"] = &setTransition; + result["circle-stroke-width"] = &setPaintProperty, &CircleLayer::setCircleStrokeWidth>; + result["circle-stroke-width-transition"] = &setTransition; + result["circle-stroke-color"] = &setPaintProperty, &CircleLayer::setCircleStrokeColor>; + result["circle-stroke-color-transition"] = &setTransition; + result["circle-stroke-opacity"] = &setPaintProperty, &CircleLayer::setCircleStrokeOpacity>; + result["circle-stroke-opacity-transition"] = &setTransition; + + result["fill-extrusion-opacity"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionOpacity>; + result["fill-extrusion-opacity-transition"] = &setTransition; + result["fill-extrusion-color"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionColor>; + result["fill-extrusion-color-transition"] = &setTransition; + result["fill-extrusion-translate"] = &setPaintProperty>, &FillExtrusionLayer::setFillExtrusionTranslate>; + result["fill-extrusion-translate-transition"] = &setTransition; + result["fill-extrusion-translate-anchor"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionTranslateAnchor>; + result["fill-extrusion-translate-anchor-transition"] = &setTransition; + result["fill-extrusion-pattern"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionPattern>; + result["fill-extrusion-pattern-transition"] = &setTransition; + result["fill-extrusion-height"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionHeight>; + result["fill-extrusion-height-transition"] = &setTransition; + result["fill-extrusion-base"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionBase>; + result["fill-extrusion-base-transition"] = &setTransition; + + result["raster-opacity"] = &setPaintProperty, &RasterLayer::setRasterOpacity>; + result["raster-opacity-transition"] = &setTransition; + result["raster-hue-rotate"] = &setPaintProperty, &RasterLayer::setRasterHueRotate>; + result["raster-hue-rotate-transition"] = &setTransition; + result["raster-brightness-min"] = &setPaintProperty, &RasterLayer::setRasterBrightnessMin>; + result["raster-brightness-min-transition"] = &setTransition; + result["raster-brightness-max"] = &setPaintProperty, &RasterLayer::setRasterBrightnessMax>; + result["raster-brightness-max-transition"] = &setTransition; + result["raster-saturation"] = &setPaintProperty, &RasterLayer::setRasterSaturation>; + result["raster-saturation-transition"] = &setTransition; + result["raster-contrast"] = &setPaintProperty, &RasterLayer::setRasterContrast>; + result["raster-contrast-transition"] = &setTransition; + result["raster-fade-duration"] = &setPaintProperty, &RasterLayer::setRasterFadeDuration>; + result["raster-fade-duration-transition"] = &setTransition; + + result["background-color"] = &setPaintProperty, &BackgroundLayer::setBackgroundColor>; + result["background-color-transition"] = &setTransition; + result["background-pattern"] = &setPaintProperty, &BackgroundLayer::setBackgroundPattern>; + result["background-pattern-transition"] = &setTransition; + result["background-opacity"] = &setPaintProperty, &BackgroundLayer::setBackgroundOpacity>; + result["background-opacity-transition"] = &setTransition; return result; } diff --git a/include/mbgl/style/conversion/make_property_setters.hpp.ejs b/include/mbgl/style/conversion/make_property_setters.hpp.ejs index 65fbdea63e..a99e75aec7 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp.ejs +++ b/include/mbgl/style/conversion/make_property_setters.hpp.ejs @@ -22,7 +22,7 @@ auto makeLayoutPropertySetters() { <% for (const layer of locals.layers) { -%> <% for (const property of layer.layoutProperties) { -%> - result["<%- property.name %>"] = makePropertySetter(&<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>); + result["<%- property.name %>"] = &setLayoutPropertyLayer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; <% } -%> <% } -%> @@ -35,8 +35,8 @@ auto makePaintPropertySetters() { <% for (const layer of locals.layers) { -%> <% for (const property of layer.paintProperties) { -%> - result["<%- property.name %>"] = makePropertySetter(&<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>); - result["<%- property.name %>-transition"] = makeTransitionSetter(&<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>Transition); + result["<%- property.name %>"] = &setPaintPropertyLayer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; + result["<%- property.name %>-transition"] = &setTransitionLayer, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>Transition>; <% } -%> <% } -%> diff --git a/include/mbgl/style/conversion/property_setter.hpp b/include/mbgl/style/conversion/property_setter.hpp index 6a15c64026..51ec4778d9 100644 --- a/include/mbgl/style/conversion/property_setter.hpp +++ b/include/mbgl/style/conversion/property_setter.hpp @@ -7,7 +7,6 @@ #include #include -#include #include namespace mbgl { @@ -15,45 +14,57 @@ namespace style { namespace conversion { template -using LayoutPropertySetter = std::function (Layer&, const V&)>; +using LayoutPropertySetter = optional (*) (Layer&, const V&); template -using PaintPropertySetter = std::function (Layer&, const V&, const optional&)>; - -template -auto makePropertySetter(void (L::*setter)(PropertyValue, const Args&...args)) { - return [setter] (Layer& layer, const V& value, const Args&...args) -> optional { - L* typedLayer = layer.as(); - if (!typedLayer) { - return Error { "layer doesn't support this property" }; - } - - Result typedValue = convert(value); - if (!typedValue) { - return typedValue.error(); - } - - (typedLayer->*setter)(*typedValue, args...); - return {}; - }; +using PaintPropertySetter = optional (*) (Layer&, const V&, const optional&); + +template +optional setLayoutProperty(Layer& layer, const V& value) { + L* typedLayer = layer.as(); + if (!typedLayer) { + return Error { "layer doesn't support this property" }; + } + + Result typedValue = convert(value); + if (!typedValue) { + return typedValue.error(); + } + + (typedLayer->*setter)(*typedValue); + return {}; +} + +template &)> +optional setPaintProperty(Layer& layer, const V& value, const optional& klass) { + L* typedLayer = layer.as(); + if (!typedLayer) { + return Error { "layer doesn't support this property" }; + } + + Result typedValue = convert(value); + if (!typedValue) { + return typedValue.error(); + } + + (typedLayer->*setter)(*typedValue, klass); + return {}; } -template -auto makeTransitionSetter(void (L::*setter)(const TransitionOptions&, const Args&...args)) { - return [setter] (Layer& layer, const V& value, const Args&...args) -> optional { - L* typedLayer = layer.as(); - if (!typedLayer) { - return Error { "layer doesn't support this property" }; - } +template &)> +optional setTransition(Layer& layer, const V& value, const optional& klass) { + L* typedLayer = layer.as(); + if (!typedLayer) { + return Error { "layer doesn't support this property" }; + } - Result transition = convert(value); - if (!transition) { - return transition.error(); - } + Result transition = convert(value); + if (!transition) { + return transition.error(); + } - (typedLayer->*setter)(*transition, args...); - return {}; - }; + (typedLayer->*setter)(*transition, klass); + return {}; } template -- cgit v1.2.1