3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 03:37:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added a free "cross product" function to Pointf (thinking the Pointf is

Browse source 
really a vector in this case).

Made the == operator inline.
This commit is contained in:
bubnikv 2016-11-28 17:34:52 +01:00
parent 695c92fb00
commit 8b0784f26c
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/src/libslic3r/Point.cpp
View file

@ -12,12 +12,6 @@ Point::Point(double x, double y)
this->y = lrint(y); this->y = lrint(y);
} }
bool
Point::operator==(const Point& rhs) const
{
return this->coincides_with(rhs);
}
std::string std::string
Point::wkt() const Point::wkt() const
{ {

4
xs/src/libslic3r/Point.hpp
View file

@ -36,7 +36,7 @@ class Point
static Point new_scale(coordf_t x, coordf_t y) { static Point new_scale(coordf_t x, coordf_t y) {
return Point(scale_(x), scale_(y)); return Point(scale_(x), scale_(y));
}; };
bool operator==(const Point& rhs) const; bool operator==(const Point& rhs) const { return this->x == rhs.x && this->y == rhs.y; }
std::string wkt() const; std::string wkt() const;
std::string dump_perl() const; std::string dump_perl() const;
void scale(double factor); void scale(double factor);
@ -105,6 +105,8 @@ class Pointf
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-(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); } inline Pointf operator*(double scalar, const Pointf& point2) { return Pointf(scalar * point2.x, scalar * point2.y); }
inline Pointf operator*(const Pointf& point2, double scalar) { return Pointf(scalar * point2.x, scalar * point2.y); }
inline coordf_t cross(const Pointf &v1, const Pointf &v2) { return v1.x * v2.y - v1.y * v2.x; }
class Pointf3 : public Pointf class Pointf3 : public Pointf
{ {