diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-13 16:05:26 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-14 16:28:12 -0600 |
| commit | d819ece74c52658c68d4e297c9bef5a74f739e28 (patch) | |
| tree | 3f5af4a976546db7b811522c62c5ab0b504837a2 /test | |
| parent | 58de1e15c5e3f4983f445eacefb2fcc931371788 (diff) | |
| download | qtlocation-mapboxgl-d819ece74c52658c68d4e297c9bef5a74f739e28.tar.gz | |
[core] Combine SpriteAtlas::getPosition with SpriteAtlas::getImage
Diffstat (limited to 'test')
| -rw-r--r-- | test/sprite/sprite_atlas.test.cpp | 2 | ||||
| -rw-r--r-- | test/text/quads.test.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/sprite/sprite_atlas.test.cpp b/test/sprite/sprite_atlas.test.cpp index e84f8a9249..da8a781585 100644 --- a/test/sprite/sprite_atlas.test.cpp +++ b/test/sprite/sprite_atlas.test.cpp @@ -42,7 +42,7 @@ TEST(SpriteAtlas, Basic) { EXPECT_EQ(63u, atlas.getAtlasImage().size.width); EXPECT_EQ(112u, atlas.getAtlasImage().size.height); - auto pos = *atlas.getPosition("metro", SpritePatternMode::Single); + auto pos = *atlas.getImage("metro", SpritePatternMode::Single); EXPECT_DOUBLE_EQ(18, pos.size[0]); EXPECT_DOUBLE_EQ(18, pos.size[1]); EXPECT_DOUBLE_EQ(1.0f / 63, pos.tl[0]); diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp index cc4a4be8e1..69aba1a86b 100644 --- a/test/text/quads.test.cpp +++ b/test/text/quads.test.cpp @@ -14,7 +14,8 @@ TEST(getIconQuads, normal) { Anchor anchor(2.0, 3.0, 0.0, 0.5f, 0); SpriteAtlasElement image = { Rect<uint16_t>( 0, 0, 15, 11 ), - std::shared_ptr<const SpriteImage>(), + std::make_shared<const SpriteImage>(PremultipliedImage({1,1}), 1.0), + { 0, 0 }, 1.0f }; PositionedIcon shapedIcon(image, -5.0, 6.0, -7.0, 8.0, 0); @@ -44,7 +45,8 @@ TEST(getIconQuads, style) { Anchor anchor(0.0, 0.0, 0.0, 0.5f, 0); SpriteAtlasElement image = { Rect<uint16_t>( 0, 0, 20, 20 ), - std::shared_ptr<const SpriteImage>(), + std::make_shared<const SpriteImage>(PremultipliedImage({1,1}), 1.0), + { 0, 0 }, 1.0f }; PositionedIcon shapedIcon(image, -10.0, 10.0, -10.0, 10.0, 0); |