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

Redefined the ==, != operators of Point and BoundingBox classes

Browse source 
to become members of their respective classes to avoid type clashes
through implicit casting operators of ConfigOption classes.
This commit is contained in:
bubnikv 2017-10-17 14:36:30 +02:00
parent a191fbbec8
commit a91d7cb2f7
2 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
xs/src/libslic3r/BoundingBox.hpp
View file

@ -15,7 +15,7 @@ typedef Pointf3 Sizef3;
template <class PointClass>
class BoundingBoxBase
{
public:
public:
PointClass min;
PointClass max;
bool defined;
@ -42,12 +42,14 @@ class BoundingBoxBase
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);
}
bool operator==(const BoundingBoxBase<PointClass> &rhs) { return this->min == rhs.min && this->max == rhs.max; }
bool operator!=(const BoundingBoxBase<PointClass> &rhs) { return ! (*this == rhs); }
};
template <class PointClass>
class BoundingBox3Base : public BoundingBoxBase<PointClass>
{
public:
public:
BoundingBox3Base() : BoundingBoxBase<PointClass>() {};
BoundingBox3Base(const PointClass &pmin, const PointClass &pmax) :
BoundingBoxBase<PointClass>(pmin, pmax)
@ -66,7 +68,7 @@ class BoundingBox3Base : public BoundingBoxBase<PointClass>
class BoundingBox : public BoundingBoxBase<Point>
{
public:
public:
void polygon(Polygon* polygon) const;
Polygon polygon() const;
BoundingBox rotated(double angle) const;
@ -87,6 +89,7 @@ class BoundingBox : public BoundingBoxBase<Point>
class BoundingBox3 : public BoundingBox3Base<Point3>
{
public:
BoundingBox3() : BoundingBox3Base<Point3>() {};
BoundingBox3(const Point3 &pmin, const Point3 &pmax) : BoundingBox3Base<Point3>(pmin, pmax) {};
BoundingBox3(const std::vector<Point3> &points) : BoundingBox3Base<Point3>(points) {};
@ -108,18 +111,6 @@ public:
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)
{