3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-22 16:21:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Refactoring: move direction math into a single function. Includes some fixes and adjustments

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-05-02 18:46:22 +02:00
parent 8240f71d07
commit cb1527f7ef
9 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xs/src/Geometry.cpp
View file

@ -93,6 +93,14 @@ chained_path_items(Points &points, T &items, T &retval)
}
template void chained_path_items(Points &points, ClipperLib::PolyNodes &items, ClipperLib::PolyNodes &retval);
bool
directions_parallel(double angle1, double angle2, double max_diff)
{
double diff = fabs(angle1 - angle2);
max_diff += EPSILON;
return diff < max_diff || fabs(diff - PI) < max_diff;
}
Line
MedialAxis::edge_to_line(const VD::edge_type &edge) const
{

1
xs/src/Geometry.hpp
View file

@ -15,6 +15,7 @@ void convex_hull(Points &points, Polygon* hull);
void chained_path(Points &points, std::vector<Points::size_type> &retval, Point start_near);
void chained_path(Points &points, std::vector<Points::size_type> &retval);
template<class T> void chained_path_items(Points &points, T &items, T &retval);
bool directions_parallel(double angle1, double angle2, double max_diff = 0);
class MedialAxis {
public:

4
xs/src/Line.cpp
View file

@ -1,3 +1,4 @@
#include "Geometry.hpp"
#include "Line.hpp"
#include "Polyline.hpp"
#include <algorithm>
@ -113,8 +114,7 @@ Line::direction() const
bool
Line::parallel_to(double angle) const {
double diff = abs(this->direction() - angle);
return (diff < EPSILON) || (abs(diff - PI) < EPSILON);
return Slic3r::Geometry::directions_parallel(this->direction(), angle);
}
bool