3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing EdgeGrid after recent refactoring.

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-02-11 13:40:15 +01:00
parent bdd6685566
commit 92d0bc2cfd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libslic3r/EdgeGrid.cpp
View File

@ -25,16 +25,10 @@
namespace Slic3r { namespace Slic3r {
EdgeGrid::Grid::~Grid()
{
m_contours.clear();
m_cell_data.clear();
m_cells.clear();
}
void EdgeGrid::Grid::create(const Polygons &polygons, coord_t resolution) void EdgeGrid::Grid::create(const Polygons &polygons, coord_t resolution)
{ {
// Collect the contours. // Collect the contours.
m_contours.clear();
m_contours.reserve(std::count_if(polygons.begin(), polygons.end(), [](const Polygon &p) { return ! p.empty(); })); m_contours.reserve(std::count_if(polygons.begin(), polygons.end(), [](const Polygon &p) { return ! p.empty(); }));
for (const Polygon &polygon : polygons) for (const Polygon &polygon : polygons)
if (! polygon.empty()) if (! polygon.empty())
@ -46,6 +40,7 @@ void EdgeGrid::Grid::create(const Polygons &polygons, coord_t resolution)
void EdgeGrid::Grid::create(const std::vector<const Polygon*> &polygons, coord_t resolution) void EdgeGrid::Grid::create(const std::vector<const Polygon*> &polygons, coord_t resolution)
{ {
// Collect the contours. // Collect the contours.
m_contours.clear();
m_contours.reserve(std::count_if(polygons.begin(), polygons.end(), [](const Polygon *p) { return ! p->empty(); })); m_contours.reserve(std::count_if(polygons.begin(), polygons.end(), [](const Polygon *p) { return ! p->empty(); }));
for (const Polygon *polygon : polygons) for (const Polygon *polygon : polygons)
if (! polygon->empty()) if (! polygon->empty())
@ -57,6 +52,7 @@ void EdgeGrid::Grid::create(const std::vector<const Polygon*> &polygons, coord_t
void EdgeGrid::Grid::create(const std::vector<Points> &polygons, coord_t resolution, bool open_polylines) void EdgeGrid::Grid::create(const std::vector<Points> &polygons, coord_t resolution, bool open_polylines)
{ {
// Collect the contours. // Collect the contours.
m_contours.clear();
m_contours.reserve(std::count_if(polygons.begin(), polygons.end(), [](const Points &p) { return p.size() > 1; })); m_contours.reserve(std::count_if(polygons.begin(), polygons.end(), [](const Points &p) { return p.size() > 1; }));
for (const Points &points : polygons) for (const Points &points : polygons)
if (points.size() > 1) { if (points.size() > 1) {
@ -79,6 +75,7 @@ void EdgeGrid::Grid::create(const std::vector<Points> &polygons, coord_t resolut
void EdgeGrid::Grid::create(const Polygons &polygons, const Polylines &polylines, coord_t resolution) void EdgeGrid::Grid::create(const Polygons &polygons, const Polylines &polylines, coord_t resolution)
{ {
// Collect the contours. // Collect the contours.
m_contours.clear();
m_contours.reserve( m_contours.reserve(
std::count_if(polygons.begin(), polygons.end(), [](const Polygon &p) { return p.size() > 1; }) + std::count_if(polygons.begin(), polygons.end(), [](const Polygon &p) { return p.size() > 1; }) +
std::count_if(polylines.begin(), polylines.end(), [](const Polyline &p) { return p.size() > 1; })); std::count_if(polylines.begin(), polylines.end(), [](const Polyline &p) { return p.size() > 1; }));
@ -104,6 +101,7 @@ void EdgeGrid::Grid::create(const Polygons &polygons, const Polylines &polylines
void EdgeGrid::Grid::create(const ExPolygon &expoly, coord_t resolution) void EdgeGrid::Grid::create(const ExPolygon &expoly, coord_t resolution)
{ {
m_contours.clear();
m_contours.reserve((expoly.contour.empty() ? 0 : 1) + std::count_if(expoly.holes.begin(), expoly.holes.end(), [](const Polygon &p) { return ! p.empty(); })); m_contours.reserve((expoly.contour.empty() ? 0 : 1) + std::count_if(expoly.holes.begin(), expoly.holes.end(), [](const Polygon &p) { return ! p.empty(); }));
if (! expoly.contour.empty()) if (! expoly.contour.empty())
m_contours.emplace_back(expoly.contour.points, false); m_contours.emplace_back(expoly.contour.points, false);
@ -125,6 +123,7 @@ void EdgeGrid::Grid::create(const ExPolygons &expolygons, coord_t resolution)
} }
// Collect the contours. // Collect the contours.
m_contours.clear();
m_contours.reserve(ncontours); m_contours.reserve(ncontours);
for (const ExPolygon &expoly : expolygons) { for (const ExPolygon &expoly : expolygons) {
if (! expoly.contour.empty()) if (! expoly.contour.empty())

1
src/libslic3r/EdgeGrid.hpp
View File

@ -74,7 +74,6 @@ class Grid
public: public:
Grid() = default; Grid() = default;
Grid(const BoundingBox &bbox) : m_bbox(bbox) {} Grid(const BoundingBox &bbox) : m_bbox(bbox) {}
~Grid();
void set_bbox(const BoundingBox &bbox) { m_bbox = bbox; } void set_bbox(const BoundingBox &bbox) { m_bbox = bbox; }