3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 20:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types:

Browse source 
Changed the Point3 / Pointf3 to derive from the Eigen Vec3crd / Vec3d.
Replaced the Point::concide_with() method calls with == operator.
Reduced some compiler warnings.
This commit is contained in:
bubnikv 2018-08-15 13:51:40 +02:00
parent f34252a27b
commit 3b89717149
19 changed files with 187 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

17
xs/src/libslic3r/Line.cpp
View file

@ -109,7 +109,7 @@ Line::intersection_infinite(const Line &other, Point* point) const
bool
Line::coincides_with(const Line &line) const
{
return this->a.coincides_with(line.a) && this->b.coincides_with(line.b);
return this->a == line.a && this->b == line.b;
}
double
@ -220,22 +220,19 @@ Line::ccw(const Point& point) const
double Line3::length() const
{
return (b.data - a.data).norm();
return (b - a).norm();
}
Vector3 Line3::vector() const
{
return Vector3(b.data - a.data);
return Vector3(b - a);
}
Pointf3
Linef3::intersect_plane(double z) const
Pointf3 Linef3::intersect_plane(double z) const
{
return Pointf3(
this->a.x() + (this->b.x() - this->a.x()) * (z - this->a.z()) / (this->b.z() - this->a.z()),
this->a.y() + (this->b.y() - this->a.y()) * (z - this->a.z()) / (this->b.z() - this->a.z()),
z
);
Vec3d v = this->b - this->a;
double t = (z - this->a.z()) / v.z();
return Pointf3(this->a.x() + v.x() * t, this->a.y() + v.y() * t, z);
}
void