pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the x(), y(), z() Point/Pointf/Point3/Pointf3 accessors.

Browse Source
This commit is contained in:
bubnikv
2018-08-17 15:53:43 +02:00
parent 1ba64da3fe
commit 65011f9382
60 changed files with 1083 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xs/src/libslic3r/Line.cpp
View File

@@ -10,8 +10,8 @@ namespace Slic3r {
std::string Line::wkt() const
{
std::ostringstream ss;
ss << "LINESTRING(" << this->a.x() << " " << this->a.y() << ","
<< this->b.x() << " " << this->b.y() << ")";
ss << "LINESTRING(" << this->a(0) << " " << this->a(1) << ","
<< this->b(0) << " " << this->b(1) << ")";
return ss.str();
}
@@ -108,8 +108,8 @@ bool Line::intersection(const Line &l2, Point *intersection) const
Pointf3 Linef3::intersect_plane(double z) const
{
auto v = (this->b - this->a).cast<double>();
double t = (z - this->a.z()) / v.z();
return Pointf3(this->a.x() + v.x() * t, this->a.y() + v.y() * t, z);
double t = (z - this->a(2)) / v(2);
return Pointf3(this->a(0) + v(0) * t, this->a(1) + v(1) * t, z);
}
}