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

Fixing some compiler warnings

Browse source
This commit is contained in:
Vojtech Bubnik 2021-05-25 20:46:31 +02:00
parent 8a297be74e
commit dd79a2b832
2 changed files with 13 additions and 25 deletions
src/libslic3r
Geometry.cpp

16
src/libslic3r/Geometry.cpp
View file

@ -201,21 +201,11 @@ using namespace boost::polygon; // provides also high() and low()
namespace Slic3r { namespace Geometry {
static bool sort_points(const Point& a, const Point& b)
{
return (a(0) < b(0)) || (a(0) == b(0) && a(1) < b(1));
}
static bool sort_pointfs(const Vec3d& a, const Vec3d& b)
{
return (a(0) < b(0)) || (a(0) == b(0) && a(1) < b(1));
}
// This implementation is based on Andrew's monotone chain 2D convex hull algorithm
Polygon convex_hull(Points pts)
{
std::sort(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a(0) < b(0) || (a(0) == b(0) && a(1) < b(1)); });
pts.erase(std::unique(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a(0) == b(0) && a(1) == b(1); }), pts.end());
std::sort(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a.x() < b.x() || (a.x() == b.x() && a.y() < b.y()); });
pts.erase(std::unique(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a.x() == b.x() && a.y() == b.y(); }), pts.end());
Polygon hull;
int n = (int)pts.size();
@ -245,7 +235,7 @@ Pointf3s convex_hull(Pointf3s points)
{
assert(points.size() >= 3);
// sort input points
std::sort(points.begin(), points.end(), sort_pointfs);
std::sort(points.begin(), points.end(), [](const Vec3d &a, const Vec3d &b){ return a.x() < b.x() || (a.x() == b.x() && a.y() < b.y()); });
int n = points.size(), k = 0;
Pointf3s hull;