diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-30 16:01:59 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-31 13:26:27 -0700 |
| commit | c4f9582bfa9be832eb2eb349249918db8b867ec9 (patch) | |
| tree | 18116f417ab24e420664ff26256c5e0a9db2d095 /test | |
| parent | d7a55a4be1300d79da0c63aefdf5d48d0c45a404 (diff) | |
| download | qtlocation-mapboxgl-c4f9582bfa9be832eb2eb349249918db8b867ec9.tar.gz | |
[core] Pass fully-evaluated layout properties to SymbolInstance and quad methods
Diffstat (limited to 'test')
| -rw-r--r-- | test/text/quads.test.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp index dc81a34312..42bc0f2048 100644 --- a/test/text/quads.test.cpp +++ b/test/text/quads.test.cpp @@ -10,7 +10,7 @@ using namespace mbgl; using namespace mbgl::style; TEST(getIconQuads, normal) { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; Anchor anchor(2.0, 3.0, 0.0, 0.5f, 0); SpriteAtlasElement image = { Rect<uint16_t>( 0, 0, 15, 11 ), @@ -59,7 +59,7 @@ TEST(getIconQuads, style) { // none { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; SymbolQuad quad = getIconQuad(anchor, shapedIcon, line, layout, SymbolPlacementType::Point, shapedText); @@ -80,7 +80,7 @@ TEST(getIconQuads, style) { // width { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 24.0f; layout.get<IconTextFit>() = IconTextFitType::Width; SymbolQuad quad = @@ -98,7 +98,7 @@ TEST(getIconQuads, style) { // width x textSize { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 12.0f; layout.get<IconTextFit>() = IconTextFitType::Width; SymbolQuad quad = @@ -116,7 +116,7 @@ TEST(getIconQuads, style) { // width x textSize + padding { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 12.0f; layout.get<IconTextFit>() = IconTextFitType::Width; layout.get<IconTextFitPadding>()[0] = 5.0f; @@ -138,7 +138,7 @@ TEST(getIconQuads, style) { // height { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 24.0f; layout.get<IconTextFit>() = IconTextFitType::Height; SymbolQuad quad = @@ -156,7 +156,7 @@ TEST(getIconQuads, style) { // height x textSize { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 12.0f; layout.get<IconTextFit>() = IconTextFitType::Height; SymbolQuad quad = @@ -174,7 +174,7 @@ TEST(getIconQuads, style) { // height x textSize + padding { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 12.0f; layout.get<IconTextFit>() = IconTextFitType::Height; layout.get<IconTextFitPadding>()[0] = 5.0f; @@ -196,7 +196,7 @@ TEST(getIconQuads, style) { // both { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 24.0f; layout.get<IconTextFit>() = IconTextFitType::Both; SymbolQuad quad = @@ -214,7 +214,7 @@ TEST(getIconQuads, style) { // both x textSize { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 12.0f; layout.get<IconTextFit>() = IconTextFitType::Both; SymbolQuad quad = @@ -232,7 +232,7 @@ TEST(getIconQuads, style) { // both x textSize + padding { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 12.0f; layout.get<IconTextFit>() = IconTextFitType::Both; layout.get<IconTextFitPadding>()[0] = 5.0f; @@ -254,7 +254,7 @@ TEST(getIconQuads, style) { // both x textSize + padding t/r/b/l { - SymbolLayoutProperties::PossiblyEvaluated layout; + SymbolLayoutProperties::Evaluated layout; layout.get<TextSize>() = 12.0f; layout.get<IconTextFit>() = IconTextFitType::Both; layout.get<IconTextFitPadding>()[0] = 0.0f; |