3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 10:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Finished merging of bridging regions.

Browse source
This commit is contained in:
bubnikv 2016-09-30 16:11:19 +02:00
parent 3a81e6bee4
commit d2635ab799
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xs/src/libslic3r/BoundingBox.cpp
View file

@ -271,7 +271,8 @@ template bool BoundingBoxBase<Pointf>::contains(const Pointf &point) const;
template <class PointClass> bool template <class PointClass> bool
BoundingBoxBase<PointClass>::overlap(const BoundingBoxBase<PointClass> &other) const BoundingBoxBase<PointClass>::overlap(const BoundingBoxBase<PointClass> &other) const
{ {
return this->contains(other.min) || other.contains(this->min); return ! (this->max.x < other.min.x || this->min.x > other.max.x ||
this->max.y < other.min.y || this->min.y > other.max.y);
} }
template bool BoundingBoxBase<Point>::overlap(const BoundingBoxBase<Point> &point) const; template bool BoundingBoxBase<Point>::overlap(const BoundingBoxBase<Point> &point) const;
template bool BoundingBoxBase<Pointf>::overlap(const BoundingBoxBase<Pointf> &point) const; template bool BoundingBoxBase<Pointf>::overlap(const BoundingBoxBase<Pointf> &point) const;

14
xs/src/libslic3r/ExPolygon.cpp
View file

@ -165,8 +165,22 @@ ExPolygon::has_boundary_point(const Point &point) const
bool bool
ExPolygon::overlaps(const ExPolygon &other) const ExPolygon::overlaps(const ExPolygon &other) const
{ {
#if 0
BoundingBox bbox = get_extents(other);
bbox.merge(get_extents(*this));
static int iRun = 0;
char path[2048];
sprintf(path, "out\\ExPolygon_overlaps-%d.svg", iRun ++);
SVG svg(path, bbox);
svg.draw(*this);
svg.draw_outline(*this);
svg.draw_outline(other, "blue");
#endif
Polylines pl_out; Polylines pl_out;
intersection((Polylines)other, *this, &pl_out); intersection((Polylines)other, *this, &pl_out);
#if 0
svg.draw(pl_out, "red");
#endif
if (! pl_out.empty()) if (! pl_out.empty())
return true; return true;
return ! other.contour.points.empty() && this->contains_b(other.contour.points.front()); return ! other.contour.points.empty() && this->contains_b(other.contour.points.front());

2
xs/src/libslic3r/ExPolygon.hpp
View file

@ -38,7 +38,7 @@ class ExPolygon
// Does this expolygon overlap another expolygon? // Does this expolygon overlap another expolygon?
// Either the ExPolygons intersect, or one is fully inside the other, // Either the ExPolygons intersect, or one is fully inside the other,
// and it is not inside a hole of the other expolygon. // and it is not inside a hole of the other expolygon.
bool overlap(const ExPolygon &other) const; bool overlaps(const ExPolygon &other) const;
void simplify_p(double tolerance, Polygons* polygons) const; void simplify_p(double tolerance, Polygons* polygons) const;
Polygons simplify_p(double tolerance) const; Polygons simplify_p(double tolerance) const;