tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a5cdbb084e489751297ffdfeb98ad208cfe03054
MapLibreParticleLab/test/text/quads.test.cpp
Ansis Brammanis e514138b69 [core] improve legibility of labels that follow lines 
port https://github.com/mapbox/mapbox-gl-js/pull/4781

This improves legibility of labels that follow lines in pitched views.
The previous approach used the limited information in the shader to
calculate put the glyph in approximatelyright place. The new approach
does this more accurately by doing it on the cpu where we have access to
the entire line geometry.
2017-07-11 09:10:24 -07:00

268 lines
8.2 KiB
C++
Raw Blame History

#include <mbgl/geometry/anchor.hpp>
#include <mbgl/style/image_impl.hpp>
#include <mbgl/test/util.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;
TEST(getIconQuads, normal) {
SymbolLayoutProperties::Evaluated layout;
Anchor anchor(2.0, 3.0, 0.0, 0.5f, 0);
ImagePosition image = {
mapbox::Bin(-1, 15, 11, 0, 0),
style::Image::Impl("test", PremultipliedImage({1,1}), 1.0)
};
auto shapedIcon = PositionedIcon::shapeIcon(image, {{ -6.5f, -4.5f }}, 0);
GeometryCoordinates line;
Shaping shapedText;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 16.0f, shapedText);
EXPECT_EQ(quad.tl.x, -14);
EXPECT_EQ(quad.tl.y, -10);
EXPECT_EQ(quad.tr.x, 1);
EXPECT_EQ(quad.tr.y, -10);
EXPECT_EQ(quad.bl.x, -14);
EXPECT_EQ(quad.bl.y, 1);
EXPECT_EQ(quad.br.x, 1);
EXPECT_EQ(quad.br.y, 1);
}
TEST(getIconQuads, style) {
Anchor anchor(0.0, 0.0, 0.0, 0.5f, 0);
ImagePosition image = {
mapbox::Bin(-1, 20, 20, 0, 0),
style::Image::Impl("test", PremultipliedImage({1,1}), 1.0)
};
auto shapedIcon = PositionedIcon::shapeIcon(image, {{ -9.5f, -9.5f }}, 0);
GeometryCoordinates line;
Shaping shapedText;
shapedText.top = -10.0f;
shapedText.bottom = 30.0f;
shapedText.left = -60.0f;
shapedText.right = 20.0f;
shapedText.positionedGlyphs.emplace_back(PositionedGlyph(32, 0.0f, 0.0f, 0));
// none
{
SymbolLayoutProperties::Evaluated layout;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -19.5);
EXPECT_EQ(quad.tl.y, -19.5);
EXPECT_EQ(quad.tr.x, 0.5);
EXPECT_EQ(quad.tr.y, -19.5);
EXPECT_EQ(quad.bl.x, -19.5);
EXPECT_EQ(quad.bl.y, 0.5);
EXPECT_EQ(quad.br.x, 0.5);
EXPECT_EQ(quad.br.y, 0.5);
}
// width
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 24.0f;
layout.get<IconTextFit>() = IconTextFitType::Width;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 24.0f, shapedText);
EXPECT_EQ(quad.tl.x, -60);
EXPECT_EQ(quad.tl.y, 0);
EXPECT_EQ(quad.tr.x, 20);
EXPECT_EQ(quad.tr.y, 0);
EXPECT_EQ(quad.bl.x, -60);
EXPECT_EQ(quad.bl.y, 20);
EXPECT_EQ(quad.br.x, 20);
EXPECT_EQ(quad.br.y, 20);
}
// width x textSize
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 12.0f;
layout.get<IconTextFit>() = IconTextFitType::Width;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -30);
EXPECT_EQ(quad.tl.y, -5);
EXPECT_EQ(quad.tr.x, 10);
EXPECT_EQ(quad.tr.y, -5);
EXPECT_EQ(quad.bl.x, -30);
EXPECT_EQ(quad.bl.y, 15);
EXPECT_EQ(quad.br.x, 10);
EXPECT_EQ(quad.br.y, 15);
}
// width x textSize + padding
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 12.0f;
layout.get<IconTextFit>() = IconTextFitType::Width;
layout.get<IconTextFitPadding>()[0] = 5.0f;
layout.get<IconTextFitPadding>()[1] = 10.0f;
layout.get<IconTextFitPadding>()[2] = 5.0f;
layout.get<IconTextFitPadding>()[3] = 10.0f;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -40);
EXPECT_EQ(quad.tl.y, -10);
EXPECT_EQ(quad.tr.x, 20);
EXPECT_EQ(quad.tr.y, -10);
EXPECT_EQ(quad.bl.x, -40);
EXPECT_EQ(quad.bl.y, 20);
EXPECT_EQ(quad.br.x, 20);
EXPECT_EQ(quad.br.y, 20);
}
// height
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 24.0f;
layout.get<IconTextFit>() = IconTextFitType::Height;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 24.0f, shapedText);
EXPECT_EQ(quad.tl.x, -30);
EXPECT_EQ(quad.tl.y, -10);
EXPECT_EQ(quad.tr.x, -10);
EXPECT_EQ(quad.tr.y, -10);
EXPECT_EQ(quad.bl.x, -30);
EXPECT_EQ(quad.bl.y, 30);
EXPECT_EQ(quad.br.x, -10);
EXPECT_EQ(quad.br.y, 30);
}
// height x textSize
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 12.0f;
layout.get<IconTextFit>() = IconTextFitType::Height;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -20);
EXPECT_EQ(quad.tl.y, -5);
EXPECT_EQ(quad.tr.x, 0);
EXPECT_EQ(quad.tr.y, -5);
EXPECT_EQ(quad.bl.x, -20);
EXPECT_EQ(quad.bl.y, 15);
EXPECT_EQ(quad.br.x, 0);
EXPECT_EQ(quad.br.y, 15);
}
// height x textSize + padding
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 12.0f;
layout.get<IconTextFit>() = IconTextFitType::Height;
layout.get<IconTextFitPadding>()[0] = 5.0f;
layout.get<IconTextFitPadding>()[1] = 10.0f;
layout.get<IconTextFitPadding>()[2] = 5.0f;
layout.get<IconTextFitPadding>()[3] = 10.0f;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -30);
EXPECT_EQ(quad.tl.y, -10);
EXPECT_EQ(quad.tr.x, 10);
EXPECT_EQ(quad.tr.y, -10);
EXPECT_EQ(quad.bl.x, -30);
EXPECT_EQ(quad.bl.y, 20);
EXPECT_EQ(quad.br.x, 10);
EXPECT_EQ(quad.br.y, 20);
}
// both
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 24.0f;
layout.get<IconTextFit>() = IconTextFitType::Both;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 24.0f, shapedText);
EXPECT_EQ(quad.tl.x, -60);
EXPECT_EQ(quad.tl.y, -10);
EXPECT_EQ(quad.tr.x, 20);
EXPECT_EQ(quad.tr.y, -10);
EXPECT_EQ(quad.bl.x, -60);
EXPECT_EQ(quad.bl.y, 30);
EXPECT_EQ(quad.br.x, 20);
EXPECT_EQ(quad.br.y, 30);
}
// both x textSize
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 12.0f;
layout.get<IconTextFit>() = IconTextFitType::Both;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -30);
EXPECT_EQ(quad.tl.y, -5);
EXPECT_EQ(quad.tr.x, 10);
EXPECT_EQ(quad.tr.y, -5);
EXPECT_EQ(quad.bl.x, -30);
EXPECT_EQ(quad.bl.y, 15);
EXPECT_EQ(quad.br.x, 10);
EXPECT_EQ(quad.br.y, 15);
}
// both x textSize + padding
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 12.0f;
layout.get<IconTextFit>() = IconTextFitType::Both;
layout.get<IconTextFitPadding>()[0] = 5.0f;
layout.get<IconTextFitPadding>()[1] = 10.0f;
layout.get<IconTextFitPadding>()[2] = 5.0f;
layout.get<IconTextFitPadding>()[3] = 10.0f;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -40);
EXPECT_EQ(quad.tl.y, -10);
EXPECT_EQ(quad.tr.x, 20);
EXPECT_EQ(quad.tr.y, -10);
EXPECT_EQ(quad.bl.x, -40);
EXPECT_EQ(quad.bl.y, 20);
EXPECT_EQ(quad.br.x, 20);
EXPECT_EQ(quad.br.y, 20);
}
// both x textSize + padding t/r/b/l
{
SymbolLayoutProperties::Evaluated layout;
layout.get<TextSize>() = 12.0f;
layout.get<IconTextFit>() = IconTextFitType::Both;
layout.get<IconTextFitPadding>()[0] = 0.0f;
layout.get<IconTextFitPadding>()[1] = 5.0f;
layout.get<IconTextFitPadding>()[2] = 10.0f;
layout.get<IconTextFitPadding>()[3] = 15.0f;
SymbolQuad quad =
getIconQuad(shapedIcon, layout, 12.0f, shapedText);
EXPECT_EQ(quad.tl.x, -45);
EXPECT_EQ(quad.tl.y, -5);
EXPECT_EQ(quad.tr.x, 15);
EXPECT_EQ(quad.tr.y, -5);
EXPECT_EQ(quad.bl.x, -45);
EXPECT_EQ(quad.bl.y, 25);
EXPECT_EQ(quad.br.x, 15);
EXPECT_EQ(quad.br.y, 25);
}
}
Reference in New Issue View Git Blame Copy Permalink