Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3878)

Unified Diff: cc/quads/draw_polygon_unittest.cc

Issue 2043283002: Perform BSP polygon splitting and orientation selection in a single step. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update test expectations Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/quads/draw_polygon_unittest.cc
diff --git a/cc/quads/draw_polygon_unittest.cc b/cc/quads/draw_polygon_unittest.cc
index 884777fc2244e8cc3a1df4e308347100d90f4c08..c145546b17cd883f5d5a8ae2417d448dd551621f 100644
--- a/cc/quads/draw_polygon_unittest.cc
+++ b/cc/quads/draw_polygon_unittest.cc
@@ -298,13 +298,12 @@ TEST(DrawPolygonSplitTest, BasicSplit) {
CREATE_NEW_DRAW_POLYGON(
polygon_b, vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1);
- EXPECT_EQ(BSP_SPLIT, DrawPolygon::SideCompare(polygon_b, polygon_a));
-
std::unique_ptr<DrawPolygon> front_polygon;
std::unique_ptr<DrawPolygon> back_polygon;
- polygon_b.Split(polygon_a, &front_polygon, &back_polygon);
- EXPECT_EQ(BSP_FRONT, DrawPolygon::SideCompare(*front_polygon, polygon_a));
- EXPECT_EQ(BSP_BACK, DrawPolygon::SideCompare(*back_polygon, polygon_a));
+ EXPECT_FALSE(
+ polygon_a.SplitPolygon(polygon_b, &front_polygon, &back_polygon));
+ EXPECT_TRUE(front_polygon != nullptr);
+ EXPECT_TRUE(back_polygon != nullptr);
std::vector<gfx::Point3F> test_points_a;
test_points_a.push_back(gfx::Point3F(5.0f, 0.0f, 0.0f));
@@ -342,16 +341,12 @@ TEST(DrawPolygonSplitTest, AngledSplit) {
CREATE_NEW_DRAW_POLYGON(
polygon_b, vertices_b, gfx::Vector3dF(0.707107f, 0.0f, -0.707107f), 1);
- EXPECT_EQ(BSP_SPLIT, DrawPolygon::SideCompare(polygon_a, polygon_b));
-
std::unique_ptr<DrawPolygon> front_polygon;
std::unique_ptr<DrawPolygon> back_polygon;
- polygon_a.Split(polygon_b, &front_polygon, &back_polygon);
- EXPECT_EQ(BSP_FRONT, DrawPolygon::SideCompare(*front_polygon, polygon_b));
- EXPECT_EQ(BSP_BACK, DrawPolygon::SideCompare(*back_polygon, polygon_b));
-
- EXPECT_EQ(3u, front_polygon->points().size());
- EXPECT_EQ(5u, back_polygon->points().size());
+ EXPECT_FALSE(
+ polygon_b.SplitPolygon(polygon_a, &front_polygon, &back_polygon));
+ EXPECT_TRUE(front_polygon != nullptr);
+ EXPECT_TRUE(back_polygon != nullptr);
std::vector<gfx::Point3F> test_points_a;
test_points_a.push_back(gfx::Point3F(10.0f, 0.0f, 9.0f));

Powered by Google App Engine
This is Rietveld 408576698