diff options
| author | bubnikv <bubnikv@gmail.com> | 2016-10-21 17:53:42 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2016-10-21 17:53:42 +0300 |
| commit | 1fb57e439ef61bf99f9f23c06bfc774935180f33 (patch) | |
| tree | 22650f82ce29d63484c1e179c96be9e0752db7ef /xs/src/libslic3r/Point.hpp | |
| parent | 15d3e94a66f7be869a77171841fcfe1726f44c56 (diff) | |
Defined the +-* operators on Pointf.
Removed the deprecated VibrationLimit feature.
Added triangle infill.
The Prusa3D fork of Slic3r has been marked as "Slic3r Prusa Edition"
with menus pointing to the prusa3d/slic3r github release page
and Prusa3D drivers downloads page.
Diffstat (limited to 'xs/src/libslic3r/Point.hpp')
| -rw-r--r-- | xs/src/libslic3r/Point.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xs/src/libslic3r/Point.hpp b/xs/src/libslic3r/Point.hpp index 58747690a..2cf046133 100644 --- a/xs/src/libslic3r/Point.hpp +++ b/xs/src/libslic3r/Point.hpp @@ -66,9 +66,9 @@ class Point Vector vector_to(const Point &point) const; }; -Point operator+(const Point& point1, const Point& point2); -Point operator-(const Point& point1, const Point& point2); -Point operator*(double scalar, const Point& point2); +inline Point operator+(const Point& point1, const Point& point2) { return Point(point1.x + point2.x, point1.y + point2.y); } +inline Point operator-(const Point& point1, const Point& point2) { return Point(point1.x - point2.x, point1.y - point2.y); } +inline Point operator*(double scalar, const Point& point2) { return Point(scalar * point2.x, scalar * point2.y); } class Point3 : public Point { @@ -102,6 +102,10 @@ class Pointf Vectorf vector_to(const Pointf &point) const; }; +inline Pointf operator+(const Pointf& point1, const Pointf& point2) { return Pointf(point1.x + point2.x, point1.y + point2.y); } +inline Pointf operator-(const Pointf& point1, const Pointf& point2) { return Pointf(point1.x - point2.x, point1.y - point2.y); } +inline Pointf operator*(double scalar, const Pointf& point2) { return Pointf(scalar * point2.x, scalar * point2.y); } + class Pointf3 : public Pointf { public: |