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

Replaced coincides_with(const Line &line) with operator==

Browse Source
This commit is contained in:
bubnikv 2018-08-17 18:27:07 +02:00
parent 9e7634b6e8
commit ab60d8adb4
6 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Slic3r/GUI/2DBed.pm
View File

@ -1,4 +1,5 @@
# Bed shape dialog # Bed shape dialog
# still used by the Slic3r::GUI::Controller::ManualControlDialog Perl module.
package Slic3r::GUI::2DBed; package Slic3r::GUI::2DBed;
use strict; use strict;

2
xs/src/libslic3r/Line.hpp
View File

@ -28,7 +28,7 @@ public:
double length() const { return (b - a).cast<double>().norm(); } double length() const { return (b - a).cast<double>().norm(); }
Point midpoint() const { return (this->a + this->b) / 2; } Point midpoint() const { return (this->a + this->b) / 2; }
bool intersection_infinite(const Line &other, Point* point) const; bool intersection_infinite(const Line &other, Point* point) const;
bool coincides_with(const Line &line) const { return this->a == line.a && this->b == line.b; } bool operator==(const Line &rhs) const { return this->a == rhs.a && this->b == rhs.b; }
double distance_to(const Point &point) const; double distance_to(const Point &point) const;
double perp_distance_to(const Point &point) const; double perp_distance_to(const Point &point) const;
bool parallel_to(double angle) const; bool parallel_to(double angle) const;

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

@ -269,7 +269,6 @@ public:
typedef coordf_t coord_type; typedef coordf_t coord_type;
explicit Pointf3() { (*this)(0) = (*this)(1) = (*this)(2) = 0.; } explicit Pointf3() { (*this)(0) = (*this)(1) = (*this)(2) = 0.; }
// explicit Pointf3(coord_t x, coord_t y, coord_t z) { (*this)(0) = x; (*this)(1) = y; (*this)(2) = z; }
explicit Pointf3(coordf_t x, coordf_t y, coordf_t z) { (*this)(0) = x; (*this)(1) = y; (*this)(2) = z; } explicit Pointf3(coordf_t x, coordf_t y, coordf_t z) { (*this)(0) = x; (*this)(1) = y; (*this)(2) = z; }
// This constructor allows you to construct Pointf from Eigen expressions // This constructor allows you to construct Pointf from Eigen expressions
template<typename OtherDerived> template<typename OtherDerived>

2
xs/src/perlglue.cpp
View File

@ -495,7 +495,7 @@ void from_SV(SV* point_sv, Point* point)
AV* point_av = (AV*)SvRV(point_sv); AV* point_av = (AV*)SvRV(point_sv);
// get a double from Perl and round it, otherwise // get a double from Perl and round it, otherwise
// it would get truncated // it would get truncated
(*point) = Point(lrint(SvNV(*av_fetch(point_av, 0, 0))), lrint(SvNV(*av_fetch(point_av, 1, 0)))); (*point) = Point(SvNV(*av_fetch(point_av, 0, 0)), SvNV(*av_fetch(point_av, 1, 0)));
} }
void from_SV_check(SV* point_sv, Point* point) void from_SV_check(SV* point_sv, Point* point)

1
xs/src/xsinit.h
View File

@ -77,6 +77,7 @@ extern "C" {
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#undef Zero #undef Zero
#undef Packet #undef Packet
#undef _
} }
#endif #endif

2
xs/xsp/Line.xsp
View File

@ -69,7 +69,7 @@ Line::coincides_with(line_sv)
CODE: CODE:
Line line; Line line;
from_SV_check(line_sv, &line); from_SV_check(line_sv, &line);
RETVAL = THIS->coincides_with(line); RETVAL = (*THIS) == line;
OUTPUT: OUTPUT:
RETVAL RETVAL