Fix MoveTo for fills (flutter#32)

egramond · Apr 27, 2022 · f0a7b4e · f0a7b4e
1 parent 4be3053
commit f0a7b4e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/impeller/entity/entity_unittests.cc b/impeller/entity/entity_unittests.cc
@@ -66,7 +66,7 @@ TEST_F(EntityTest, TriangleInsideASquare) {
   ASSERT_TRUE(OpenPlaygroundHere(entity));
 }
 
-TEST_F(EntityTest, DISABLED_BadCubicCurveTest) {
+TEST_F(EntityTest, CubicCurveTest) {
   // Compare with https://fiddle.skia.org/c/b3625f26122c9de7afe7794fcf25ead3
   Path path =
       PathBuilder{}
@@ -88,7 +88,7 @@ TEST_F(EntityTest, DISABLED_BadCubicCurveTest) {
   ASSERT_TRUE(OpenPlaygroundHere(entity));
 }
 
-TEST_F(EntityTest, DISABLED_BadCubicCurveAndOverlapTest) {
+TEST_F(EntityTest, CubicCurveAndOverlapTest) {
   // Compare with https://fiddle.skia.org/c/7a05a3e186c65a8dfb732f68020aae06
   Path path =
       PathBuilder{}

diff --git a/impeller/renderer/tessellator.cc b/impeller/renderer/tessellator.cc
@@ -61,12 +61,25 @@ bool Tessellator::Tessellate(const Path::Polyline& contours,
   /// Feed contour information to the tessellator.
   ///
   static_assert(sizeof(Point) == 2 * sizeof(float));
-  ::tessAddContour(tessellator.get(),       // the C tessellator
-                   kVertexSize,             //
-                   contours.points.data(),  //
-                   sizeof(Point),           //
-                   contours.points.size()   //
-  );
+  size_t start_point_index = 0;
+  for (size_t end_point_index : contours.breaks) {
+    end_point_index = std::min(end_point_index, contours.points.size());
+    ::tessAddContour(tessellator.get(),  // the C tessellator
+                     kVertexSize,        //
+                     contours.points.data() + start_point_index,  //
+                     sizeof(Point),                               //
+                     end_point_index - start_point_index          //
+    );
+    start_point_index = end_point_index;
+  }
+  if (start_point_index < contours.points.size()) {
+    ::tessAddContour(tessellator.get(),  // the C tessellator
+                     kVertexSize,        //
+                     contours.points.data() + start_point_index,  //
+                     sizeof(Point),                               //
+                     contours.points.size() - start_point_index   //
+    );
+  }
 
   //----------------------------------------------------------------------------
   /// Let's tessellate.