[core] Simplify and fix sprite atlas coordinate calculations

* Always return image metrics exclusive of padding
* Work with integer coordinates whenever possible
* Eliminate redundant SpriteAtlasElement members
* Fix asymmetric re-padding in getIconQuad when pixelRatio != 1
* Add explanatory comments

3 files changed, 142 insertions, 171 deletions

diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp
index e0ca635ddf..b291816562 100644
--- a/test/gl/bucket.test.cpp
+++ b/test/gl/bucket.test.cpp
@@ -12,17 +12,17 @@
 using namespace mbgl;
 
 TEST(Buckets, CircleBucket) {
-    CircleBucket bucket { { {0, 0, 0}, MapMode::Still }, {} };
+    CircleBucket bucket { { {0, 0, 0}, MapMode::Still, 1.0 }, {} };
     ASSERT_FALSE(bucket.hasData());
 }
 
 TEST(Buckets, FillBucket) {
-    FillBucket bucket { { {0, 0, 0}, MapMode::Still }, {} };
+    FillBucket bucket { { {0, 0, 0}, MapMode::Still, 1.0 }, {} };
     ASSERT_FALSE(bucket.hasData());
 }
 
 TEST(Buckets, LineBucket) {
-    LineBucket bucket { { {0, 0, 0}, MapMode::Still }, {}, {} };
+    LineBucket bucket { { {0, 0, 0}, MapMode::Still, 1.0 }, {}, {} };
     ASSERT_FALSE(bucket.hasData());
 }
 
diff --git a/test/sprite/sprite_atlas.test.cpp b/test/sprite/sprite_atlas.test.cpp
index f6953e61f7..c673c5ca0e 100644
--- a/test/sprite/sprite_atlas.test.cpp
+++ b/test/sprite/sprite_atlas.test.cpp
@@ -26,34 +26,21 @@ TEST(SpriteAtlas, Basic) {
         atlas.addImage(image->impl);
     }
 
-    EXPECT_EQ(1.0f, atlas.getPixelRatio());
-    EXPECT_EQ(63u, atlas.getSize().width);
-    EXPECT_EQ(112u, atlas.getSize().height);
+    EXPECT_EQ(63u, atlas.getPixelSize().width);
+    EXPECT_EQ(112u, atlas.getPixelSize().height);
 
     auto metro = *atlas.getIcon("metro");
-    float imagePixelRatio = metro.relativePixelRatio * atlas.getPixelRatio();
-    EXPECT_EQ(0, metro.pos.x);
-    EXPECT_EQ(0, metro.pos.y);
-    EXPECT_EQ(20, metro.pos.w);
-    EXPECT_EQ(20, metro.pos.h);
-    EXPECT_EQ(18, metro.size[0]);
-    EXPECT_EQ(18, metro.size[1]);
-    EXPECT_EQ(18u, metro.size[0] * imagePixelRatio);
-    EXPECT_EQ(18u, metro.size[1] * imagePixelRatio);
-    EXPECT_EQ(1.0f, imagePixelRatio);
-
+    EXPECT_EQ(1, metro.tl()[0]);
+    EXPECT_EQ(1, metro.tl()[1]);
+    EXPECT_EQ(19, metro.br()[0]);
+    EXPECT_EQ(19, metro.br()[1]);
+    EXPECT_EQ(18, metro.displaySize()[0]);
+    EXPECT_EQ(18, metro.displaySize()[1]);
+    EXPECT_EQ(1.0f, metro.pixelRatio);
 
     EXPECT_EQ(63u, atlas.getAtlasImage().size.width);
     EXPECT_EQ(112u, atlas.getAtlasImage().size.height);
 
-    auto pos = *atlas.getIcon("metro");
-    EXPECT_DOUBLE_EQ(18, pos.size[0]);
-    EXPECT_DOUBLE_EQ(18, pos.size[1]);
-    EXPECT_DOUBLE_EQ(1.0f / 63, pos.tl[0]);
-    EXPECT_DOUBLE_EQ(1.0f / 112, pos.tl[1]);
-    EXPECT_DOUBLE_EQ(19.0f / 63, pos.br[0]);
-    EXPECT_DOUBLE_EQ(19.0f / 112, pos.br[1]);
-
     auto missing = atlas.getIcon("doesnotexist");
     EXPECT_FALSE(missing);
 
@@ -66,10 +53,10 @@ TEST(SpriteAtlas, Basic) {
 
     // Different wrapping mode produces different image.
     auto metro2 = *atlas.getPattern("metro");
-    EXPECT_EQ(20, metro2.pos.x);
-    EXPECT_EQ(0, metro2.pos.y);
-    EXPECT_EQ(20, metro2.pos.w);
-    EXPECT_EQ(20, metro2.pos.h);
+    EXPECT_EQ(21, metro2.tl()[0]);
+    EXPECT_EQ(1, metro2.tl()[1]);
+    EXPECT_EQ(39, metro2.br()[0]);
+    EXPECT_EQ(19, metro2.br()[1]);
 
     test::checkImage("test/fixtures/sprite_atlas/basic", atlas.getAtlasImage());
 }
@@ -83,25 +70,17 @@ TEST(SpriteAtlas, Size) {
         atlas.addImage(image->impl);
     }
 
-    EXPECT_DOUBLE_EQ(1.4f, atlas.getPixelRatio());
-    EXPECT_EQ(63u, atlas.getSize().width);
-    EXPECT_EQ(112u, atlas.getSize().height);
+    EXPECT_EQ(89u, atlas.getPixelSize().width);
+    EXPECT_EQ(157u, atlas.getPixelSize().height);
 
     auto metro = *atlas.getIcon("metro");
-    float imagePixelRatio = metro.relativePixelRatio * atlas.getPixelRatio();
-    EXPECT_EQ(0, metro.pos.x);
-    EXPECT_EQ(0, metro.pos.y);
-    EXPECT_EQ(15, metro.pos.w);
-    EXPECT_EQ(15, metro.pos.h);
-    EXPECT_EQ(18, metro.size[0]);
-    EXPECT_EQ(18, metro.size[1]);
-    EXPECT_EQ(18u, metro.size[0] * imagePixelRatio);
-    EXPECT_EQ(18u, metro.size[1] * imagePixelRatio);
-    EXPECT_EQ(1.0f, imagePixelRatio);
-
-    // Now the image was created lazily.
-    EXPECT_EQ(89u, atlas.getAtlasImage().size.width);
-    EXPECT_EQ(157u, atlas.getAtlasImage().size.height);
+    EXPECT_EQ(1, metro.tl()[0]);
+    EXPECT_EQ(1, metro.tl()[1]);
+    EXPECT_EQ(19, metro.br()[0]);
+    EXPECT_EQ(19, metro.br()[1]);
+    EXPECT_EQ(18, metro.displaySize()[0]);
+    EXPECT_EQ(18, metro.displaySize()[1]);
+    EXPECT_EQ(1.0f, metro.pixelRatio);
 
     test::checkImage("test/fixtures/sprite_atlas/size", atlas.getAtlasImage());
 }
@@ -109,22 +88,18 @@ TEST(SpriteAtlas, Size) {
 TEST(SpriteAtlas, Updates) {
     SpriteAtlas atlas({ 32, 32 }, 1);
 
-    EXPECT_EQ(1.0f, atlas.getPixelRatio());
-    EXPECT_EQ(32u, atlas.getSize().width);
-    EXPECT_EQ(32u, atlas.getSize().height);
+    EXPECT_EQ(32u, atlas.getPixelSize().width);
+    EXPECT_EQ(32u, atlas.getPixelSize().height);
 
     atlas.addImage(makeMutable<style::Image::Impl>("one", PremultipliedImage({ 16, 12 }), 1));
     auto one = *atlas.getIcon("one");
-    float imagePixelRatio = one.relativePixelRatio * atlas.getPixelRatio();
-    EXPECT_EQ(0, one.pos.x);
-    EXPECT_EQ(0, one.pos.y);
-    EXPECT_EQ(18, one.pos.w);
-    EXPECT_EQ(14, one.pos.h);
-    EXPECT_EQ(16, one.size[0]);
-    EXPECT_EQ(12, one.size[1]);
-    EXPECT_EQ(16u, one.size[0] * imagePixelRatio);
-    EXPECT_EQ(12u, one.size[1] * imagePixelRatio);
-    EXPECT_EQ(1.0f, imagePixelRatio);
+    EXPECT_EQ(1, one.tl()[0]);
+    EXPECT_EQ(1, one.tl()[1]);
+    EXPECT_EQ(17, one.br()[0]);
+    EXPECT_EQ(13, one.br()[1]);
+    EXPECT_EQ(16, one.displaySize()[0]);
+    EXPECT_EQ(12, one.displaySize()[1]);
+    EXPECT_EQ(1.0f, one.pixelRatio);
 
     // Now the image was created lazily.
     EXPECT_EQ(32u, atlas.getAtlasImage().size.width);
diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp
index 1f2e24ca5e..4c40b41a97 100644
--- a/test/text/quads.test.cpp
+++ b/test/text/quads.test.cpp
@@ -14,9 +14,7 @@ TEST(getIconQuads, normal) {
     Anchor anchor(2.0, 3.0, 0.0, 0.5f, 0);
     SpriteAtlasElement image = {
         Rect<uint16_t>( 0, 0, 15, 11 ),
-        style::Image::Impl("test", PremultipliedImage({1,1}), 1.0),
-        { 0, 0 },
-        1.0f
+        style::Image::Impl("test", PremultipliedImage({1,1}), 1.0)
     };
 
     auto shapedIcon = PositionedIcon::shapeIcon(image, {{ -6.5f, -4.5f }}, 0);
@@ -27,28 +25,26 @@ TEST(getIconQuads, normal) {
     SymbolQuad quad =
         getIconQuad(anchor, shapedIcon, line, layout, 16.0f, SymbolPlacementType::Point, shapedText);
 
-    ASSERT_EQ(quad.anchorPoint.x, 2);
-    ASSERT_EQ(quad.anchorPoint.y, 3);
-    ASSERT_EQ(quad.tl.x, -8);
-    ASSERT_EQ(quad.tl.y, -6);
-    ASSERT_EQ(quad.tr.x, 7);
-    ASSERT_EQ(quad.tr.y, -6);
-    ASSERT_EQ(quad.bl.x, -8);
-    ASSERT_EQ(quad.bl.y, 5);
-    ASSERT_EQ(quad.br.x, 7);
-    ASSERT_EQ(quad.br.y, 5);
-    ASSERT_EQ(quad.anchorAngle, 0.0f);
-    ASSERT_EQ(quad.glyphAngle, 0.0f);
-    ASSERT_EQ(quad.minScale, 0.5f);
+    EXPECT_EQ(quad.anchorPoint.x, 2);
+    EXPECT_EQ(quad.anchorPoint.y, 3);
+    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);
+    EXPECT_EQ(quad.anchorAngle, 0.0f);
+    EXPECT_EQ(quad.glyphAngle, 0.0f);
+    EXPECT_EQ(quad.minScale, 0.5f);
 }
 
 TEST(getIconQuads, style) {
     Anchor anchor(0.0, 0.0, 0.0, 0.5f, 0);
     SpriteAtlasElement image = {
         Rect<uint16_t>( 0, 0, 20, 20 ),
-        style::Image::Impl("test", PremultipliedImage({1,1}), 1.0),
-        { 0, 0 },
-        1.0f
+        style::Image::Impl("test", PremultipliedImage({1,1}), 1.0)
     };
 
     auto shapedIcon = PositionedIcon::shapeIcon(image, {{ -9.5f, -9.5f }}, 0);
@@ -67,19 +63,19 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.anchorPoint.x, 0);
-        ASSERT_EQ(quad.anchorPoint.y, 0);
-        ASSERT_EQ(quad.tl.x, -11);
-        ASSERT_EQ(quad.tl.y, -11);
-        ASSERT_EQ(quad.tr.x, 9);
-        ASSERT_EQ(quad.tr.y, -11);
-        ASSERT_EQ(quad.bl.x, -11);
-        ASSERT_EQ(quad.bl.y, 9);
-        ASSERT_EQ(quad.br.x, 9);
-        ASSERT_EQ(quad.br.y, 9);
-        ASSERT_EQ(quad.anchorAngle, 0.0f);
-        ASSERT_EQ(quad.glyphAngle, 0.0f);
-        ASSERT_EQ(quad.minScale, 0.5f);
+        EXPECT_EQ(quad.anchorPoint.x, 0);
+        EXPECT_EQ(quad.anchorPoint.y, 0);
+        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);
+        EXPECT_EQ(quad.anchorAngle, 0.0f);
+        EXPECT_EQ(quad.glyphAngle, 0.0f);
+        EXPECT_EQ(quad.minScale, 0.5f);
     }
 
     // width
@@ -90,14 +86,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 24.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -60);
-        ASSERT_EQ(quad.tl.y, 0);
-        ASSERT_EQ(quad.tr.x, 20);
-        ASSERT_EQ(quad.tr.y, 0);
-        ASSERT_EQ(quad.bl.x, -60);
-        ASSERT_EQ(quad.bl.y, 20);
-        ASSERT_EQ(quad.br.x, 20);
-        ASSERT_EQ(quad.br.y, 20);
+        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
@@ -108,14 +104,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -30);
-        ASSERT_EQ(quad.tl.y, -5);
-        ASSERT_EQ(quad.tr.x, 10);
-        ASSERT_EQ(quad.tr.y, -5);
-        ASSERT_EQ(quad.bl.x, -30);
-        ASSERT_EQ(quad.bl.y, 15);
-        ASSERT_EQ(quad.br.x, 10);
-        ASSERT_EQ(quad.br.y, 15);
+        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
@@ -130,14 +126,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -40);
-        ASSERT_EQ(quad.tl.y, -10);
-        ASSERT_EQ(quad.tr.x, 20);
-        ASSERT_EQ(quad.tr.y, -10);
-        ASSERT_EQ(quad.bl.x, -40);
-        ASSERT_EQ(quad.bl.y, 20);
-        ASSERT_EQ(quad.br.x, 20);
-        ASSERT_EQ(quad.br.y, 20);
+        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
@@ -148,14 +144,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 24.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -30);
-        ASSERT_EQ(quad.tl.y, -10);
-        ASSERT_EQ(quad.tr.x, -10);
-        ASSERT_EQ(quad.tr.y, -10);
-        ASSERT_EQ(quad.bl.x, -30);
-        ASSERT_EQ(quad.bl.y, 30);
-        ASSERT_EQ(quad.br.x, -10);
-        ASSERT_EQ(quad.br.y, 30);
+        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
@@ -166,14 +162,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -20);
-        ASSERT_EQ(quad.tl.y, -5);
-        ASSERT_EQ(quad.tr.x, 0);
-        ASSERT_EQ(quad.tr.y, -5);
-        ASSERT_EQ(quad.bl.x, -20);
-        ASSERT_EQ(quad.bl.y, 15);
-        ASSERT_EQ(quad.br.x, 0);
-        ASSERT_EQ(quad.br.y, 15);
+        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
@@ -188,14 +184,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -30);
-        ASSERT_EQ(quad.tl.y, -10);
-        ASSERT_EQ(quad.tr.x, 10);
-        ASSERT_EQ(quad.tr.y, -10);
-        ASSERT_EQ(quad.bl.x, -30);
-        ASSERT_EQ(quad.bl.y, 20);
-        ASSERT_EQ(quad.br.x, 10);
-        ASSERT_EQ(quad.br.y, 20);
+        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
@@ -206,14 +202,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 24.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -60);
-        ASSERT_EQ(quad.tl.y, -10);
-        ASSERT_EQ(quad.tr.x, 20);
-        ASSERT_EQ(quad.tr.y, -10);
-        ASSERT_EQ(quad.bl.x, -60);
-        ASSERT_EQ(quad.bl.y, 30);
-        ASSERT_EQ(quad.br.x, 20);
-        ASSERT_EQ(quad.br.y, 30);
+        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
@@ -224,14 +220,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -30);
-        ASSERT_EQ(quad.tl.y, -5);
-        ASSERT_EQ(quad.tr.x, 10);
-        ASSERT_EQ(quad.tr.y, -5);
-        ASSERT_EQ(quad.bl.x, -30);
-        ASSERT_EQ(quad.bl.y, 15);
-        ASSERT_EQ(quad.br.x, 10);
-        ASSERT_EQ(quad.br.y, 15);
+        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
@@ -246,14 +242,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -40);
-        ASSERT_EQ(quad.tl.y, -10);
-        ASSERT_EQ(quad.tr.x, 20);
-        ASSERT_EQ(quad.tr.y, -10);
-        ASSERT_EQ(quad.bl.x, -40);
-        ASSERT_EQ(quad.bl.y, 20);
-        ASSERT_EQ(quad.br.x, 20);
-        ASSERT_EQ(quad.br.y, 20);
+        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
@@ -268,14 +264,14 @@ TEST(getIconQuads, style) {
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, 12.0f, SymbolPlacementType::Point, shapedText);
 
-        ASSERT_EQ(quad.tl.x, -45);
-        ASSERT_EQ(quad.tl.y, -5);
-        ASSERT_EQ(quad.tr.x, 15);
-        ASSERT_EQ(quad.tr.y, -5);
-        ASSERT_EQ(quad.bl.x, -45);
-        ASSERT_EQ(quad.bl.y, 25);
-        ASSERT_EQ(quad.br.x, 15);
-        ASSERT_EQ(quad.br.y, 25);
+        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);
     }
 }