juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 20:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes to 'ArcFitter'

Browse Source
This commit is contained in:
Aleksandr Dobkin
2026-03-13 02:12:10 -07:00
parent 9fae402d62
commit ba5b06196a
2 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/libslic3r/ArcFitter.cpp
View File

@@ -1,5 +1,4 @@
#include "ArcFitter.hpp" #include "ArcFitter.hpp"
#include "Point.hpp"
#include "Polyline.hpp" #include "Polyline.hpp"
#include <cmath> #include <cmath>
@@ -7,17 +6,7 @@
namespace Slic3r { namespace Slic3r {
// Helper functions to dispatch to the correct douglas_peucker implementation void ArcFitter::do_arc_fitting(const Points& points, std::vector<PathFittingData>& result, double tolerance)
static inline Points douglas_peucker_helper(const Points &points, double tolerance) {
return MultiPoint::_douglas_peucker(points, tolerance);
}
static inline Points3 douglas_peucker_helper(const Points3 &points, double tolerance) {
return MultiPoint3::_douglas_peucker(points, tolerance);
}
template <typename POINTS>
static void do_arc_fitting_tmpl(const POINTS& points, std::vector<PathFittingData>& result, double tolerance)
{ {
#ifdef DEBUG_ARC_FITTING #ifdef DEBUG_ARC_FITTING
static int irun = 0; static int irun = 0;
@@ -50,7 +39,7 @@ static void do_arc_fitting_tmpl(const POINTS& points, std::vector<PathFittingDat
size_t back_index = 0; size_t back_index = 0;
ArcSegment last_arc; ArcSegment last_arc;
bool can_fit = false; bool can_fit = false;
POINTS current_segment; Points current_segment;
current_segment.reserve(points.size()); current_segment.reserve(points.size());
ArcSegment target_arc; ArcSegment target_arc;
for (size_t i = 0; i < points.size(); i++) { for (size_t i = 0; i < points.size(); i++) {
@@ -60,7 +49,7 @@ static void do_arc_fitting_tmpl(const POINTS& points, std::vector<PathFittingDat
if (back_index - front_index < 2) if (back_index - front_index < 2)
continue; continue;
can_fit = ArcSegment::try_create_arc(current_segment, target_arc, to_polyline(current_segment).length(), can_fit = ArcSegment::try_create_arc(current_segment, target_arc, Polyline(current_segment).length(),
DEFAULT_SCALED_MAX_RADIUS, DEFAULT_SCALED_MAX_RADIUS,
tolerance, tolerance,
DEFAULT_ARC_LENGTH_PERCENT_TOLERANCE); DEFAULT_ARC_LENGTH_PERCENT_TOLERANCE);
@@ -68,24 +57,24 @@ static void do_arc_fitting_tmpl(const POINTS& points, std::vector<PathFittingDat
//BBS: can be fit as arc, then save arc data temperarily //BBS: can be fit as arc, then save arc data temperarily
last_arc = target_arc; last_arc = target_arc;
if (back_index == points.size() - 1) { if (back_index == points.size() - 1) {
result.emplace_back(PathFittingData{ front_index, result.emplace_back(std::move(PathFittingData{ front_index,
back_index, back_index,
last_arc.direction == ArcDirection::Arc_Dir_CCW ? EMovePathType::Arc_move_ccw : EMovePathType::Arc_move_cw, last_arc.direction == ArcDirection::Arc_Dir_CCW ? EMovePathType::Arc_move_ccw : EMovePathType::Arc_move_cw,
last_arc }); last_arc }));
front_index = back_index; front_index = back_index;
} }
} else { } else {
if (back_index - front_index > 2) { if (back_index - front_index > 2) {
//BBS: althought current point_stack can't be fit as arc, //BBS: althought current point_stack can't be fit as arc,
//but previous must can be fit if removing the top in stack, so save last arc //but previous must can be fit if removing the top in stack, so save last arc
result.emplace_back(PathFittingData{ front_index, result.emplace_back(std::move(PathFittingData{ front_index,
back_index - 1, back_index - 1,
last_arc.direction == ArcDirection::Arc_Dir_CCW ? EMovePathType::Arc_move_ccw : EMovePathType::Arc_move_cw, last_arc.direction == ArcDirection::Arc_Dir_CCW ? EMovePathType::Arc_move_ccw : EMovePathType::Arc_move_cw,
last_arc }); last_arc }));
} else { } else {
//BBS: save the first segment as line move when 3 point-line can't be fit as arc move //BBS: save the first segment as line move when 3 point-line can't be fit as arc move
if (result.empty() || result.back().path_type != EMovePathType::Linear_move) if (result.empty() || result.back().path_type != EMovePathType::Linear_move)
result.emplace_back(PathFittingData{front_index, front_index + 1, EMovePathType::Linear_move, ArcSegment()}); result.emplace_back(std::move(PathFittingData{front_index, front_index + 1, EMovePathType::Linear_move, ArcSegment()}));
else if(result.back().path_type == EMovePathType::Linear_move) else if(result.back().path_type == EMovePathType::Linear_move)
result.back().end_point_index = front_index + 1; result.back().end_point_index = front_index + 1;
} }
@@ -98,25 +87,14 @@ static void do_arc_fitting_tmpl(const POINTS& points, std::vector<PathFittingDat
//BBS: handle the remain data //BBS: handle the remain data
if (front_index != back_index) { if (front_index != back_index) {
if (result.empty() || result.back().path_type != EMovePathType::Linear_move) if (result.empty() || result.back().path_type != EMovePathType::Linear_move)
result.emplace_back(PathFittingData{front_index, back_index, EMovePathType::Linear_move, ArcSegment()}); result.emplace_back(std::move(PathFittingData{front_index, back_index, EMovePathType::Linear_move, ArcSegment()}));
else if (result.back().path_type == EMovePathType::Linear_move) else if (result.back().path_type == EMovePathType::Linear_move)
result.back().end_point_index = back_index; result.back().end_point_index = back_index;
} }
result.shrink_to_fit(); result.shrink_to_fit();
} }
void ArcFitter::do_arc_fitting(const Points &points, std::vector<PathFittingData>& result, double tolerance) void ArcFitter::do_arc_fitting_and_simplify(Points& points, std::vector<PathFittingData>& result, double tolerance)
{
do_arc_fitting_tmpl(points, result, tolerance);
}
void ArcFitter::do_arc_fitting(const Points3 &points, std::vector<PathFittingData>& result, double tolerance)
{
do_arc_fitting_tmpl(points, result, tolerance);
}
template <typename POINTS>
static void do_arc_fitting_and_simplify_tmpl(POINTS &points, std::vector<PathFittingData>& result, double tolerance)
{ {
//BBS: 1 do arc fit first //BBS: 1 do arc fit first
if (abs(tolerance) > SCALED_EPSILON) if (abs(tolerance) > SCALED_EPSILON)
@@ -128,12 +106,12 @@ static void do_arc_fitting_and_simplify_tmpl(POINTS &points, std::vector<PathFit
//for arc part, only need to keep start and end point //for arc part, only need to keep start and end point
if (result.size() == 1 && result[0].path_type == EMovePathType::Linear_move) { if (result.size() == 1 && result[0].path_type == EMovePathType::Linear_move) {
//BBS: all are straight segment, directly use DP simplify //BBS: all are straight segment, directly use DP simplify
points = douglas_peucker_helper(points, tolerance); points = MultiPoint::_douglas_peucker(points, tolerance);
result[0].end_point_index = points.size() - 1; result[0].end_point_index = points.size() - 1;
return; return;
} else { } else {
//BBS: has both arc part and straight part, we should spilit the straight part out and do DP simplify //BBS: has both arc part and straight part, we should spilit the straight part out and do DP simplify
POINTS simplified_points; Points simplified_points;
simplified_points.reserve(points.size()); simplified_points.reserve(points.size());
simplified_points.push_back(points[0]); simplified_points.push_back(points[0]);
std::vector<size_t> reduce_count(result.size(), 0); std::vector<size_t> reduce_count(result.size(), 0);
@@ -146,11 +124,11 @@ static void do_arc_fitting_and_simplify_tmpl(POINTS &points, std::vector<PathFit
//For arc part, theoretically, we only need to keep the start and end point, and //For arc part, theoretically, we only need to keep the start and end point, and
//delete all other point. But when considering wipe operation, we must keep the original //delete all other point. But when considering wipe operation, we must keep the original
//point data and shouldn't reduce too much by only saving start and end point. //point data and shouldn't reduce too much by only saving start and end point.
POINTS straight_or_arc_part; Points straight_or_arc_part;
straight_or_arc_part.reserve(end_index - start_index + 1); straight_or_arc_part.reserve(end_index - start_index + 1);
for (size_t j = start_index; j <= end_index; j++) for (size_t j = start_index; j <= end_index; j++)
straight_or_arc_part.push_back(points[j]); straight_or_arc_part.push_back(points[j]);
straight_or_arc_part = douglas_peucker_helper(straight_or_arc_part, tolerance); straight_or_arc_part = MultiPoint::_douglas_peucker(straight_or_arc_part, tolerance);
//BBS: how many point has been reduced //BBS: how many point has been reduced
reduce_count[i] = end_index - start_index + 1 - straight_or_arc_part.size(); reduce_count[i] = end_index - start_index + 1 - straight_or_arc_part.size();
//BBS: save the simplified result //BBS: save the simplified result
@@ -172,14 +150,4 @@ static void do_arc_fitting_and_simplify_tmpl(POINTS &points, std::vector<PathFit
} }
} }
void ArcFitter::do_arc_fitting_and_simplify(Points& points, std::vector<PathFittingData>& result, double tolerance)
{
do_arc_fitting_and_simplify_tmpl(points, result, tolerance);
}
void ArcFitter::do_arc_fitting_and_simplify(Points3& points, std::vector<PathFittingData>& result, double tolerance)
{
do_arc_fitting_and_simplify_tmpl(points, result, tolerance);
}
} }

2
src/libslic3r/ArcFitter.hpp
View File

@@ -42,11 +42,9 @@ class ArcFitter {
public: public:
//BBS: this function is used to check the point list and return which part can fit as arc, which part should be line //BBS: this function is used to check the point list and return which part can fit as arc, which part should be line
static void do_arc_fitting(const Points& points, std::vector<PathFittingData> &result, double tolerance); static void do_arc_fitting(const Points& points, std::vector<PathFittingData> &result, double tolerance);
static void do_arc_fitting(const Points3& points, std::vector<PathFittingData> &result, double tolerance);
//BBS: this function is used to check the point list and return which part can fit as arc, which part should be line. //BBS: this function is used to check the point list and return which part can fit as arc, which part should be line.
//By the way, it also use DP simplify to reduce point of straight part and only keep the start and end point of arc. //By the way, it also use DP simplify to reduce point of straight part and only keep the start and end point of arc.
static void do_arc_fitting_and_simplify(Points& points, std::vector<PathFittingData>& result, double tolerance); static void do_arc_fitting_and_simplify(Points& points, std::vector<PathFittingData>& result, double tolerance);
static void do_arc_fitting_and_simplify(Points3& points, std::vector<PathFittingData>& result, double tolerance);
}; };
} }