diff options
author | Young Hahn <young@mapbox.com> | 2016-06-15 17:13:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-15 17:13:31 -0400 |
commit | 199ea2a82a74cf2f7b63078e2dd4b8274c061851 (patch) | |
tree | 5d56478a020a911745d793b8ac5d7f236730c621 /src/mbgl | |
parent | a020e535cac36d69a8939fb7956260d2217c65b4 (diff) | |
download | qtlocation-mapboxgl-199ea2a82a74cf2f7b63078e2dd4b8274c061851.tar.gz |
Support for icon-text-fit, icon-text-fit-padding (#5334)
* Add support for icon-text-fit
* Port unit tests for getIconQuads() from js => cpp
* Add support for padding in all 4 directions.
* Update all hashes post-merge
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/renderer/symbol_bucket.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/symbol_layer.cpp | 14 | ||||
-rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/property_evaluator.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/property_parsing.cpp | 19 | ||||
-rw-r--r-- | src/mbgl/style/types.cpp | 7 | ||||
-rw-r--r-- | src/mbgl/text/quads.cpp | 44 | ||||
-rw-r--r-- | src/mbgl/text/quads.hpp | 2 |
9 files changed, 90 insertions, 8 deletions
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 60624fa59e..e34aedb47e 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -51,7 +51,7 @@ SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, // Create the quad used for rendering the icon. iconQuads(addToBuffers && shapedIcon ? - getIconQuads(anchor, shapedIcon, line, layout, iconAlongLine) : + getIconQuads(anchor, shapedIcon, line, layout, iconAlongLine, shapedText) : SymbolQuads()), // Create the collision features that will be used to check whether this symbol instance can be placed diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 282873b501..38a898deca 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -106,6 +106,20 @@ PropertyValue<float> SymbolLayer::getIconSize() const { void SymbolLayer::setIconSize(PropertyValue<float> value) { impl->layout.iconSize.set(value); } +PropertyValue<IconTextFitType> SymbolLayer::getIconTextFit() const { + return impl->layout.iconTextFit.get(); +} + +void SymbolLayer::setIconTextFit(PropertyValue<IconTextFitType> value) { + impl->layout.iconTextFit.set(value); +} +PropertyValue<std::array<float, 4>> SymbolLayer::getIconTextFitPadding() const { + return impl->layout.iconTextFitPadding.get(); +} + +void SymbolLayer::setIconTextFitPadding(PropertyValue<std::array<float, 4>> value) { + impl->layout.iconTextFitPadding.set(value); +} PropertyValue<std::string> SymbolLayer::getIconImage() const { return impl->layout.iconImage.get(); } diff --git a/src/mbgl/style/layers/symbol_layer_properties.cpp b/src/mbgl/style/layers/symbol_layer_properties.cpp index 5c6f65112d..d77d10700c 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.cpp +++ b/src/mbgl/style/layers/symbol_layer_properties.cpp @@ -14,6 +14,8 @@ void SymbolLayoutProperties::parse(const JSValue& value) { iconOptional.parse("icon-optional", value); iconRotationAlignment.parse("icon-rotation-alignment", value); iconSize.parse("icon-size", value); + iconTextFit.parse("icon-text-fit", value); + iconTextFitPadding.parse("icon-text-fit-padding", value); iconImage.parse("icon-image", value); iconRotate.parse("icon-rotate", value); iconPadding.parse("icon-padding", value); @@ -49,6 +51,8 @@ void SymbolLayoutProperties::recalculate(const CalculationParameters& parameters iconOptional.calculate(parameters); iconRotationAlignment.calculate(parameters); iconSize.calculate(parameters); + iconTextFit.calculate(parameters); + iconTextFitPadding.calculate(parameters); iconImage.calculate(parameters); iconRotate.calculate(parameters); iconPadding.calculate(parameters); diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index 772445f051..1882c03fef 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -25,6 +25,8 @@ public: LayoutProperty<bool> iconOptional { false }; LayoutProperty<AlignmentType> iconRotationAlignment { AlignmentType::Viewport }; LayoutProperty<float> iconSize { 1 }; + LayoutProperty<IconTextFitType> iconTextFit { IconTextFitType::None }; + LayoutProperty<std::array<float, 4>> iconTextFitPadding { {{ 0, 0, 0, 0 }} }; LayoutProperty<std::string> iconImage { "" }; LayoutProperty<float> iconRotate { 0 }; LayoutProperty<float> iconPadding { 2 }; diff --git a/src/mbgl/style/property_evaluator.cpp b/src/mbgl/style/property_evaluator.cpp index 7b91b9e500..3394d69e41 100644 --- a/src/mbgl/style/property_evaluator.cpp +++ b/src/mbgl/style/property_evaluator.cpp @@ -19,6 +19,7 @@ template <> inline Color defaultStopsValue() { return { 0, 0, 0, 1 }; } template <> inline std::vector<float> defaultStopsValue() { return {{ 1, 0 }}; } template <> inline std::vector<std::string> defaultStopsValue() { return {{}}; } template <> inline std::array<float, 2> defaultStopsValue() { return {{ 0, 0 }}; } +template <> inline std::array<float, 4> defaultStopsValue() { return {{ 0, 0, 0, 0 }}; } template <> inline std::string defaultStopsValue() { return {}; } template <> inline TranslateAnchorType defaultStopsValue() { return {}; } @@ -30,6 +31,7 @@ template <> inline TextAnchorType defaultStopsValue() { return {}; } template <> inline TextJustifyType defaultStopsValue() { return {}; } template <> inline TextTransformType defaultStopsValue() { return {}; } template <> inline AlignmentType defaultStopsValue() { return {}; } +template <> inline IconTextFitType defaultStopsValue() { return {}; }; template <typename T> T PropertyEvaluator<T>::operator()(const Function<T>& fn) const { @@ -87,6 +89,7 @@ template class PropertyEvaluator<Color>; template class PropertyEvaluator<std::vector<float>>; template class PropertyEvaluator<std::vector<std::string>>; template class PropertyEvaluator<std::array<float, 2>>; +template class PropertyEvaluator<std::array<float, 4>>; template class PropertyEvaluator<std::string>; template class PropertyEvaluator<TranslateAnchorType>; @@ -98,6 +101,7 @@ template class PropertyEvaluator<TextAnchorType>; template class PropertyEvaluator<TextJustifyType>; template class PropertyEvaluator<TextTransformType>; template class PropertyEvaluator<AlignmentType>; +template class PropertyEvaluator<IconTextFitType>; template <typename T> Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const Undefined&) const { diff --git a/src/mbgl/style/property_parsing.cpp b/src/mbgl/style/property_parsing.cpp index f5e0cca993..2b08ba8788 100644 --- a/src/mbgl/style/property_parsing.cpp +++ b/src/mbgl/style/property_parsing.cpp @@ -71,6 +71,25 @@ optional<std::array<float, 2>> parseConstant(const char* name, const JSValue& va } template <> +optional<std::array<float, 4>> parseConstant(const char* name, const JSValue& value) { + if (value.IsArray() && value.Size() == 4 && + value[rapidjson::SizeType(0)].IsNumber() && + value[rapidjson::SizeType(1)].IsNumber() && + value[rapidjson::SizeType(2)].IsNumber() && + value[rapidjson::SizeType(3)].IsNumber()) { + + float first = value[rapidjson::SizeType(0)].GetDouble(); + float second = value[rapidjson::SizeType(1)].GetDouble(); + float third = value[rapidjson::SizeType(2)].GetDouble(); + float fourth = value[rapidjson::SizeType(3)].GetDouble(); + return { {{ first, second, third, fourth }} }; + } else { + Log::Warning(Event::ParseStyle, "value of '%s' must be an array of four numbers", name); + return {}; + } +} + +template <> optional<std::vector<float>> parseConstant(const char* name, const JSValue& value) { if (!value.IsArray()) { Log::Warning(Event::ParseStyle, "value of '%s' must be an array of numbers", name); diff --git a/src/mbgl/style/types.cpp b/src/mbgl/style/types.cpp index d292d2d5b4..25a1753870 100644 --- a/src/mbgl/style/types.cpp +++ b/src/mbgl/style/types.cpp @@ -77,4 +77,11 @@ MBGL_DEFINE_ENUM(AlignmentType, { { AlignmentType::Undefined, "undefined" }, }); +MBGL_DEFINE_ENUM(IconTextFitType, { + { IconTextFitType::None, "none" }, + { IconTextFitType::Both, "both" }, + { IconTextFitType::Width, "width" }, + { IconTextFitType::Height, "height" }, +}); + } // namespace mbgl diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index a46b329d1a..727b86f610 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -15,7 +15,7 @@ const float globalMinScale = 0.5f; // underscale by 1 zoom level SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, const SymbolLayoutProperties& layout, - const bool alongLine) { + const bool alongLine, const Shaping& shapedText) { auto image = *(shapedIcon.image); @@ -24,11 +24,43 @@ SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon, auto right = left + image.pos.w / image.relativePixelRatio; auto top = shapedIcon.top - border; auto bottom = top + image.pos.h / image.relativePixelRatio; - Point<float> tl{left, top}; - Point<float> tr{right, top}; - Point<float> br{right, bottom}; - Point<float> bl{left, bottom}; - + Point<float> tl; + Point<float> tr; + Point<float> br; + Point<float> bl; + + if (layout.iconTextFit != IconTextFitType::None && shapedText) { + auto iconWidth = right - left; + auto iconHeight = bottom - top; + auto size = layout.textSize / 24.0f; + auto textLeft = shapedText.left * size; + auto textRight = shapedText.right * size; + auto textTop = shapedText.top * size; + auto textBottom = shapedText.bottom * size; + auto textWidth = textRight - textLeft; + auto textHeight = textBottom - textTop;; + auto padT = layout.iconTextFitPadding.value[0]; + auto padR = layout.iconTextFitPadding.value[1]; + auto padB = layout.iconTextFitPadding.value[2]; + auto padL = layout.iconTextFitPadding.value[3]; + auto offsetY = layout.iconTextFit == IconTextFitType::Width ? (textHeight - iconHeight) * 0.5 : 0; + auto offsetX = layout.iconTextFit == IconTextFitType::Height ? (textWidth - iconWidth) * 0.5 : 0; + auto width = layout.iconTextFit == IconTextFitType::Width || layout.iconTextFit == IconTextFitType::Both ? textWidth : iconWidth; + auto height = layout.iconTextFit == IconTextFitType::Height || layout.iconTextFit == IconTextFitType::Both ? textHeight : iconHeight; + left = textLeft + offsetX - padL; + top = textTop + offsetY - padT; + right = textLeft + offsetX + padR + width; + bottom = textTop + offsetY + padB + height; + tl = {left, top}; + tr = {right, top}; + br = {right, bottom}; + bl = {left, bottom}; + } else { + tl = {left, top}; + tr = {right, top}; + br = {right, bottom}; + bl = {left, bottom}; + } float angle = layout.iconRotate * util::DEG2RAD; if (alongLine) { diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 0ea5129238..dd64af682a 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -40,7 +40,7 @@ typedef std::vector<SymbolQuad> SymbolQuads; SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, const style::SymbolLayoutProperties&, - const bool alongLine); + const bool alongLine, const Shaping& shapedText); SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, const float boxScale, const GeometryCoordinates& line, const style::SymbolLayoutProperties&, |