diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/text/cross_tile_symbol_index.test.cpp | 12 | ||||
-rw-r--r-- | test/text/quads.test.cpp | 30 |
2 files changed, 25 insertions, 17 deletions
diff --git a/test/text/cross_tile_symbol_index.test.cpp b/test/text/cross_tile_symbol_index.test.cpp index a02055e70f..cb3806e656 100644 --- a/test/text/cross_tile_symbol_index.test.cpp +++ b/test/text/cross_tile_symbol_index.test.cpp @@ -16,8 +16,16 @@ SymbolInstance makeSymbolInstance(float x, float y, std::u16string key) { std::array<float, 2> variableTextOffset{{0.0f, 0.0f}}; style::SymbolPlacementType placementType = style::SymbolPlacementType::Point; - auto sharedData = std::make_shared<SymbolInstanceSharedData>( - std::move(line), shaping, nullopt, nullopt, layout_, placementType, textOffset, imageMap, false); + auto sharedData = std::make_shared<SymbolInstanceSharedData>(std::move(line), + shaping, + nullopt, + nullopt, + layout_, + placementType, + textOffset, + imageMap, + SymbolContent::IconSDF, + false); return SymbolInstance(anchor, std::move(sharedData), shaping, nullopt, nullopt, 0, 0, placementType, textOffset, 0, 0, iconOffset, subfeature, 0, 0, key, 0.0f, 0.0f, 0.0f, variableTextOffset, false); } diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp index 4d7f254efa..64255c72db 100644 --- a/test/text/quads.test.cpp +++ b/test/text/quads.test.cpp @@ -1,10 +1,11 @@ #include <mbgl/geometry/anchor.hpp> +#include <mbgl/layout/symbol_instance.hpp> #include <mbgl/style/image_impl.hpp> +#include <mbgl/style/layers/symbol_layer_properties.hpp> #include <mbgl/test/util.hpp> +#include <mbgl/text/glyph.hpp> #include <mbgl/text/quads.hpp> #include <mbgl/text/shaping.hpp> -#include <mbgl/text/glyph.hpp> -#include <mbgl/style/layers/symbol_layer_properties.hpp> using namespace mbgl; using namespace mbgl::style; @@ -21,8 +22,7 @@ TEST(getIconQuads, normal) { GeometryCoordinates line; - SymbolQuad quad = - getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_EQ(quad.tl.x, -14); EXPECT_EQ(quad.tl.y, -10); @@ -60,7 +60,7 @@ TEST(getIconQuads, style) { EXPECT_FLOAT_EQ(-18.5f, shapedIcon.left()); SymbolLayoutProperties::Evaluated layout; - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -19.5); EXPECT_FLOAT_EQ(quad.tl.y, -19.5); @@ -76,7 +76,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -64.4444427); EXPECT_FLOAT_EQ(quad.tl.y, 0); @@ -92,7 +92,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -32.2222214); EXPECT_FLOAT_EQ(quad.tl.y, -5); @@ -108,7 +108,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -43.3333321); EXPECT_FLOAT_EQ(quad.tl.y, -5); @@ -124,7 +124,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -30); EXPECT_FLOAT_EQ(quad.tl.y, -12.2222214); @@ -141,7 +141,7 @@ TEST(getIconQuads, style) { SymbolLayoutProperties::Evaluated layout; auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -20); EXPECT_FLOAT_EQ(quad.tl.y, -6.11111069); @@ -157,7 +157,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{5, 10, 5, 20}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -20); EXPECT_FLOAT_EQ(quad.tl.y, -11.666666); @@ -173,7 +173,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -64.4444427); EXPECT_FLOAT_EQ(quad.tl.y, -12.2222214); @@ -189,7 +189,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -32.2222214); EXPECT_FLOAT_EQ(quad.tl.y, -6.11111069); @@ -205,7 +205,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -43.3333321); EXPECT_FLOAT_EQ(quad.tl.y, -11.666666); @@ -223,7 +223,7 @@ TEST(getIconQuads, style) { layout.get<TextSize>() = 12.0f; auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 5, 10, 15}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -48.3333321); EXPECT_FLOAT_EQ(quad.tl.y, -6.66666603); |