public_mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-16 08:54:26 +00:00
Code Issues Activity

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
xs/src/libslic3r/BoundingBox.cpp
+2 -1
View File
@@ -271,7 +271,8 @@ template bool BoundingBoxBase<Pointf>::contains(const Pointf &point) const;
template <class PointClass> bool
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<Pointf>::overlap(const BoundingBoxBase<Pointf> &point) const;