GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 20:52:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tagged constructors for Point, Point3, Pointf, Pointf3 as constexpr to extend their use

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-12 23:13:02 -05:00
parent 932a238328
commit 05c900a283
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xs/src/libslic3r/Point.hpp
View File

@ -33,11 +33,11 @@ class Point
public: public:
coord_t x; coord_t x;
coord_t y; coord_t y;
Point(coord_t _x = 0, coord_t _y = 0): x(_x), y(_y) {}; constexpr Point(coord_t _x = 0, coord_t _y = 0): x(_x), y(_y) {};
Point(int _x, int _y): x(_x), y(_y) {}; constexpr Point(int _x, int _y): x(_x), y(_y) {};
Point(long long _x, long long _y): x(_x), y(_y) {}; // for Clipper constexpr Point(long long _x, long long _y): x(_x), y(_y) {}; // for Clipper
Point(double x, double y); Point(double x, double y);
static Point new_scale(coordf_t x, coordf_t y) { static constexpr Point new_scale(coordf_t x, coordf_t y) {
return Point(scale_(x), scale_(y)); return Point(scale_(x), scale_(y));
}; };
@ -102,8 +102,8 @@ class Point3 : public Point
{ {
public: public:
coord_t z; coord_t z;
explicit Point3(coord_t _x = 0, coord_t _y = 0, coord_t _z = 0): Point(_x, _y), z(_z) {}; explicit constexpr Point3(coord_t _x = 0, coord_t _y = 0, coord_t _z = 0): Point(_x, _y), z(_z) {};
bool coincides_with(const Point3 &point3) const { return this->x == point3.x && this->y == point3.y && this->z == point3.z; } bool constexpr coincides_with(const Point3 &point3) const { return this->x == point3.x && this->y == point3.y && this->z == point3.z; }
}; };
std::ostream& operator<<(std::ostream &stm, const Pointf &pointf); std::ostream& operator<<(std::ostream &stm, const Pointf &pointf);
@ -113,11 +113,11 @@ class Pointf
public: public:
coordf_t x; coordf_t x;
coordf_t y; coordf_t y;
explicit Pointf(coordf_t _x = 0, coordf_t _y = 0): x(_x), y(_y) {}; explicit constexpr Pointf(coordf_t _x = 0, coordf_t _y = 0): x(_x), y(_y) {};
static Pointf new_unscale(coord_t x, coord_t y) { static constexpr Pointf new_unscale(coord_t x, coord_t y) {
return Pointf(unscale(x), unscale(y)); return Pointf(unscale(x), unscale(y));
}; };
static Pointf new_unscale(const Point &p) { static constexpr Pointf new_unscale(const Point &p) {
return Pointf(unscale(p.x), unscale(p.y)); return Pointf(unscale(p.x), unscale(p.y));
}; };
@ -141,8 +141,8 @@ class Pointf3 : public Pointf
{ {
public: public:
coordf_t z; coordf_t z;
explicit Pointf3(coordf_t _x = 0, coordf_t _y = 0, coordf_t _z = 0): Pointf(_x, _y), z(_z) {}; explicit constexpr Pointf3(coordf_t _x = 0, coordf_t _y = 0, coordf_t _z = 0): Pointf(_x, _y), z(_z) {};
static Pointf3 new_unscale(coord_t x, coord_t y, coord_t z) { static constexpr Pointf3 new_unscale(coord_t x, coord_t y, coord_t z) {
return Pointf3(unscale(x), unscale(y), unscale(z)); return Pointf3(unscale(x), unscale(y), unscale(z));
}; };
void scale(double factor); void scale(double factor);