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

New constructors for the bounding box with min/max points were added.

Browse Source 
empty(bbox) function template was added.
This commit is contained in:
bubnikv 2016-04-10 19:02:00 +02:00
parent 33ddb13e5d
commit c8ff517389
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xs/src/libslic3r/BoundingBox.hpp
View File

@ -21,6 +21,7 @@ class BoundingBoxBase
bool defined; bool defined;
BoundingBoxBase() : defined(false) {}; BoundingBoxBase() : defined(false) {};
BoundingBoxBase(const PointClass &pmin, const PointClass &pmax) : min(pmin), max(pmax) {}
BoundingBoxBase(const std::vector<PointClass> &points); BoundingBoxBase(const std::vector<PointClass> &points);
void merge(const PointClass &point); void merge(const PointClass &point);
void merge(const std::vector<PointClass> &points); void merge(const std::vector<PointClass> &points);
@ -37,6 +38,7 @@ class BoundingBox3Base : public BoundingBoxBase<PointClass>
{ {
public: public:
BoundingBox3Base() : BoundingBoxBase<PointClass>() {}; BoundingBox3Base() : BoundingBoxBase<PointClass>() {};
BoundingBox3Base(const PointClass &pmin, const PointClass &pmax) : BoundingBoxBase<PointClass>(pmin, pmax) {}
BoundingBox3Base(const std::vector<PointClass> &points); BoundingBox3Base(const std::vector<PointClass> &points);
void merge(const PointClass &point); void merge(const PointClass &point);
void merge(const std::vector<PointClass> &points); void merge(const std::vector<PointClass> &points);
@ -54,6 +56,7 @@ class BoundingBox : public BoundingBoxBase<Point>
Polygon polygon() const; Polygon polygon() const;
BoundingBox() : BoundingBoxBase<Point>() {}; BoundingBox() : BoundingBoxBase<Point>() {};
BoundingBox(const Point &pmin, const Point &pmax) : BoundingBoxBase<Point>(pmin, pmax) {};
BoundingBox(const Points &points) : BoundingBoxBase<Point>(points) {}; BoundingBox(const Points &points) : BoundingBoxBase<Point>(points) {};
BoundingBox(const Lines &lines); BoundingBox(const Lines &lines);
}; };
@ -65,15 +68,39 @@ class BoundingBox3 : public BoundingBox3Base<Point3> {};
class BoundingBoxf : public BoundingBoxBase<Pointf> { class BoundingBoxf : public BoundingBoxBase<Pointf> {
public: public:
BoundingBoxf() : BoundingBoxBase<Pointf>() {}; BoundingBoxf() : BoundingBoxBase<Pointf>() {};
BoundingBoxf(const Pointf &pmin, const Pointf &pmax) : BoundingBoxBase<Pointf>(pmin, pmax) {};
BoundingBoxf(const std::vector<Pointf> &points) : BoundingBoxBase<Pointf>(points) {}; BoundingBoxf(const std::vector<Pointf> &points) : BoundingBoxBase<Pointf>(points) {};
}; };
class BoundingBoxf3 : public BoundingBox3Base<Pointf3> { class BoundingBoxf3 : public BoundingBox3Base<Pointf3> {
public: public:
BoundingBoxf3() : BoundingBox3Base<Pointf3>() {}; BoundingBoxf3() : BoundingBox3Base<Pointf3>() {};
BoundingBoxf3(const Pointf3 &pmin, const Pointf3 &pmax) : BoundingBox3Base<Pointf3>(pmin, pmax) {};
BoundingBoxf3(const std::vector<Pointf3> &points) : BoundingBox3Base<Pointf3>(points) {}; BoundingBoxf3(const std::vector<Pointf3> &points) : BoundingBox3Base<Pointf3>(points) {};
}; };
template<typename VT>
inline bool operator==(const BoundingBoxBase<VT> &bb1, const BoundingBoxBase<VT> &bb2)
{
return bb1.min == bb2.min && bb1.max == bb2.max;
}
template<typename VT>
inline bool operator!=(const BoundingBoxBase<VT> &bb1, const BoundingBoxBase<VT> &bb2)
{
return !(bb1 == bb2);
}
template<typename VT>
inline bool empty(const BoundingBoxBase<VT> &bb)
{
return bb.min.x > bb.max.y || bb.min.y > bb.max.y;
}
template<typename VT>
inline bool empty(const BoundingBox3Base<VT> &bb)
{
return bb.min.x > bb.max.x || bb.min.y > bb.max.y || bb.min.z > bb.max.z;}
} }
#endif #endif