GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-27 20:32:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

try a little change to bridge detection: if max is equal, try to find the direction with the most number of small lines.

Browse Source
This commit is contained in:
supermerill 2018-07-24 00:33:25 +02:00
parent cd46cad56e
commit fdf2c45ff0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xs/src/libslic3r/BridgeDetector.cpp
View File

@ -115,6 +115,7 @@ bool BridgeDetector::detect_angle(double bridge_direction_override)
} }
double total_length = 0; double total_length = 0;
uint32_t nbLines = 0;
double max_length = 0; double max_length = 0;
{ {
Lines clipped_lines = intersection_ln(lines, clip_area); Lines clipped_lines = intersection_ln(lines, clip_area);
@ -125,10 +126,11 @@ bool BridgeDetector::detect_angle(double bridge_direction_override)
double len = line.length(); double len = line.length();
total_length += len; total_length += len;
max_length = std::max(max_length, len); max_length = std::max(max_length, len);
nbLines++;
} }
} }
} }
if (total_length == 0.) if (total_length == 0. || nbLines == 0)
continue; continue;
have_coverage = true; have_coverage = true;
@ -139,6 +141,7 @@ bool BridgeDetector::detect_angle(double bridge_direction_override)
// $directions_coverage{$angle} = sum(map $_->area, @{$self->coverage($angle)}) // 0; // $directions_coverage{$angle} = sum(map $_->area, @{$self->coverage($angle)}) // 0;
// max length of bridged lines // max length of bridged lines
candidates[i_angle].max_length = max_length; candidates[i_angle].max_length = max_length;
candidates[i_angle].mean_length = total_length / nbLines;
} }
// if no direction produced coverage, then there's no bridge direction // if no direction produced coverage, then there's no bridge direction
@ -149,10 +152,12 @@ bool BridgeDetector::detect_angle(double bridge_direction_override)
std::sort(candidates.begin(), candidates.end()); std::sort(candidates.begin(), candidates.end());
// if any other direction is within extrusion width of coverage, prefer it if shorter // if any other direction is within extrusion width of coverage, prefer it if shorter
// shorter = shorter max length, or if in espilon (10) range, the shorter mean length.
// TODO: There are two options here - within width of the angle with most coverage, or within width of the currently perferred? // TODO: There are two options here - within width of the angle with most coverage, or within width of the currently perferred?
size_t i_best = 0; size_t i_best = 0;
for (size_t i = 1; i < candidates.size() && candidates[i_best].coverage - candidates[i].coverage < this->spacing; ++ i) for (size_t i = 1; i < candidates.size() && candidates[i_best].coverage - candidates[i].coverage < this->spacing; ++ i)
if (candidates[i].max_length < candidates[i_best].max_length) if (candidates[i].max_length < candidates[i_best].max_length ||
(candidates[i].max_length < candidates[i_best].max_length - 10 && candidates[i].mean_length < candidates[i_best].mean_length))
i_best = i; i_best = i;
this->angle = candidates[i_best].angle; this->angle = candidates[i_best].angle;

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

@ -53,6 +53,7 @@ private:
double angle; double angle;
double coverage; double coverage;
double max_length; double max_length;
double mean_length;
}; };
// Get possible briging direction candidates. // Get possible briging direction candidates.