DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate points between connected components when generating polylines (flutter/engine#34)

Browse Source
This commit is contained in:
Brandon DeRosier 2022-02-25 13:24:14 -08:00 committed by Dan Field
parent dd40a0e078
commit 0b707db40b
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engine/src/flutter/impeller/geometry/geometry_unittests.cc
View File

@ -636,5 +636,24 @@ TEST(GeometryTest, CubicPathComponentPolylineDoesNotIncludePointOne) {
ASSERT_EQ(polyline.back().y, 40);
}
TEST(GeometryTest, PathCreatePolyLineDoesNotDuplicatePoints) {
Path path;
path.AddMoveComponent({10, 10});
path.AddLinearComponent({10, 10}, {20, 20});
path.AddLinearComponent({20, 20}, {30, 30});
path.AddMoveComponent({40, 40});
path.AddLinearComponent({40, 40}, {50, 50});
auto polyline = path.CreatePolyline();
ASSERT_EQ(polyline.breaks.size(), 2u);
ASSERT_EQ(polyline.points.size(), 5u);
ASSERT_EQ(polyline.points[0].x, 10);
ASSERT_EQ(polyline.points[1].x, 20);
ASSERT_EQ(polyline.points[2].x, 30);
ASSERT_EQ(polyline.points[3].x, 40);
ASSERT_EQ(polyline.points[4].x, 50);
}
} // namespace testing
} // namespace impeller

16
engine/src/flutter/impeller/geometry/path.cc
View File

@ -197,9 +197,18 @@ bool Path::UpdateMoveComponentAtIndex(size_t index,
Path::Polyline Path::CreatePolyline(
const SmoothingApproximation& approximation) const {
Polyline polyline;
auto collect_points = [&polyline](const std::vector<Point>& collection) {
polyline.points.reserve(polyline.points.size() + collection.size());
polyline.points.insert(polyline.points.end(), collection.begin(),
// TODO(99177): Refactor this to have component polyline creation always
// exclude the first point, and append the destination point for
// move components. See issue for details.
bool new_contour = true;
auto collect_points = [&polyline,
&new_contour](const std::vector<Point>& collection) {
size_t offset = new_contour ? 0 : 1;
new_contour = false;
polyline.points.reserve(polyline.points.size() + collection.size() -
offset);
polyline.points.insert(polyline.points.end(), collection.begin() + offset,
collection.end());
};
for (const auto& component : components_) {
@ -215,6 +224,7 @@ Path::Polyline Path::CreatePolyline(
break;
case ComponentType::kMove:
polyline.breaks.insert(polyline.points.size());
new_contour = true;
break;
}
}