Chromium Code Reviews| Index: cc/quads/draw_polygon_unittest.cc |
| diff --git a/cc/quads/draw_polygon_unittest.cc b/cc/quads/draw_polygon_unittest.cc |
| index eb6d1625986bd19dc12683f1fcd234522a8e1266..13f5e7c6e8387642ab4415730aeccf664cb6289c 100644 |
| --- a/cc/quads/draw_polygon_unittest.cc |
| +++ b/cc/quads/draw_polygon_unittest.cc |
| @@ -74,7 +74,7 @@ TEST(DrawPolygonConstructionTest, TestNormal) { |
| EXPECT_NORMAL(polygon, 0.0f, 0.0f, 1.0f); |
| } |
| -TEST(DrawPolygonConstructionTest, InverseNormal) { |
| +TEST(DrawPolygonConstructionTest, DISABLED_BackwardsWoundNormal) { |
| std::vector<gfx::Point3F> vertices; |
| vertices.push_back(gfx::Point3F(0.0f, 10.0f, 0.0f)); |
| vertices.push_back(gfx::Point3F(10.0f, 10.0f, 0.0f)); |
| @@ -82,7 +82,7 @@ TEST(DrawPolygonConstructionTest, InverseNormal) { |
| vertices.push_back(gfx::Point3F(0.0f, 0.0f, 0.0f)); |
| CREATE_TEST_DRAW_POLYGON(polygon, vertices, 1); |
| - EXPECT_NORMAL(polygon, 0.0f, 0.0f, -1.0f); |
| + EXPECT_NORMAL(polygon, 0.0f, 0.0f, 1.0f); |
| } |
| TEST(DrawPolygonConstructionTest, ClippedNormal) { |
| @@ -125,28 +125,75 @@ TEST(DrawPolygonConstructionTest, ManyVertexNormal) { |
| } |
| // A simple rect being transformed. |
| -TEST(DrawPolygonConstructionTest, DizzyNormal) { |
| +TEST(DrawPolygonConstructionTest, SimpleNormal) { |
| gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| gfx::Transform transform_i(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
| DrawPolygon polygon_i(NULL, src, transform_i, 1); |
| EXPECT_NORMAL(polygon_i, 0.0f, 0.0f, 1.0f); |
| +} |
| + |
| +TEST(DrawPolygonConstructionTest, NormalInvertXY) { |
| + gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| gfx::Transform tranform_a(0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
|
Peter Mayo
2016/04/05 21:56:07
sp: tran-s-form
|
| DrawPolygon polygon_a(NULL, src, tranform_a, 2); |
| + |
| EXPECT_NORMAL(polygon_a, 0.0f, 0.0f, -1.0f); |
|
Peter Mayo
2016/04/05 21:56:07
Wong - swapping Axes should not invert the normal.
|
| +} |
| + |
| +TEST(DrawPolygonConstructionTest, NormalInvertXZ) { |
| + gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| gfx::Transform tranform_b(0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1); |
| DrawPolygon polygon_b(NULL, src, tranform_b, 3); |
| + |
| EXPECT_NORMAL(polygon_b, -1.0f, 0.0f, 0.0f); |
| +} |
| + |
| +TEST(DrawPolygonConstructionTest, NormalRotate90) { |
| + gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| + |
| + gfx::Transform tranform_b(0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1); |
| + DrawPolygon polygon_b(NULL, src, tranform_b, 3); |
| + |
| + EXPECT_NORMAL(polygon_b, 0.0f, 0.0f, 1.0f); |
| +} |
| + |
| +TEST(DrawPolygonConstructionTest, NormalInvertYZ) { |
| + gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| gfx::Transform tranform_c(1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1); |
| DrawPolygon polygon_c(NULL, src, tranform_c, 4); |
| + |
| EXPECT_NORMAL(polygon_c, 0.0f, -1.0f, 0.0f); |
| +} |
| + |
| +TEST(DrawPolygonConstructionTest, DISABLED_InvertXNormal) { |
| + gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| gfx::Transform tranform_d(-1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
| DrawPolygon polygon_d(NULL, src, tranform_d, 5); |
| + |
| + EXPECT_NORMAL(polygon_d, 0.0f, 0.0f, 1.0f); |
| +} |
| + |
| +TEST(DrawPolygonConstructionTest, DISABLED_InvertYNormal) { |
| + gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| + |
| + gfx::Transform tranform_d(1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
| + DrawPolygon polygon_d(NULL, src, tranform_d, 5); |
| + |
| + EXPECT_NORMAL(polygon_d, 0.0f, 0.0f, 1.0f); |
| +} |
| + |
| +TEST(DrawPolygonConstructionTest, DISABLED_InvertZNormal) { |
| + gfx::RectF src(-0.1f, -10.0f, 0.2f, 20.0f); |
| + |
| + gfx::Transform tranform_e(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1); |
| + DrawPolygon polygon_d(NULL, src, tranform_e, 5); |
| + |
| EXPECT_NORMAL(polygon_d, 0.0f, 0.0f, -1.0f); |
| } |