3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 04:02:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

More unit tests for bridge angle detection

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-04-08 15:18:37 +02:00
parent 9be57f750d
commit 38f6e3b643
3 changed files with 63 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/Slic3r/Layer/BridgeDetector.pm
View file

@ -5,9 +5,9 @@ use List::Util qw(first sum);
use Slic3r::Geometry qw(PI scaled_epsilon rad2deg epsilon);
use Slic3r::Geometry::Clipper qw(intersection_pl intersection_ex);
has 'lower_slices' => (is => 'ro', required => 1); # ExPolygons or ExPolygonCollection
has 'perimeter_flow' => (is => 'ro', required => 1);
has 'infill_flow' => (is => 'ro', required => 1);
has 'lower_slices' => (is => 'rw', required => 1); # ExPolygons or ExPolygonCollection
has 'perimeter_flow' => (is => 'rw', required => 1);
has 'infill_flow' => (is => 'rw', required => 1);
sub detect_angle {
my ($self, $expolygon) = @_;
@ -30,7 +30,7 @@ sub detect_angle {
if (0) {
require "Slic3r/SVG.pm";
Slic3r::SVG::output("bridge_$expolygon.svg",
Slic3r::SVG::output("bridge.svg",
expolygons => [ $expolygon ],
red_expolygons => [ @lower ],
polylines => [ @edges ],
@ -42,7 +42,7 @@ sub detect_angle {
my @midpoints = map $_->midpoint, @chords;
my $line_between_midpoints = Slic3r::Line->new(@midpoints);
$bridge_angle = $line_between_midpoints->direction;
} elsif (@edges == 1 && $edges[0][0]->coincides_with($edges[0][-1])) {
} elsif (@edges == 1 && !$edges[0][0]->coincides_with($edges[0][-1])) {
# Don't use this logic if $edges[0] is actually a closed loop
# TODO: this case includes both U-shaped bridges and plain overhangs;
# we need a trapezoidation algorithm to detect the actual bridged area

11
lib/Slic3r/Polygon.pm
View file

@ -61,18 +61,23 @@ sub clip_as_polyline {
$self_pl->[0]->translate(1, 0);
my @polylines = @{intersection_pl([$self_pl], $polygons)};
if (@polylines == 2) {
if (@polylines == 1) {
if ($polylines[0][0]->coincides_with($self_pl->[0])) {
# compensate the above workaround for Clipper bug
$polylines[0][0]->translate(-1, 0);
}
} elsif (@polylines == 2) {
# If the split_at_first_point() call above happens to split the polygon inside the clipping area
# we would get two consecutive polylines instead of a single one, so we use this ugly hack to
# recombine them back into a single one in order to trigger the @edges == 2 logic below.
# This needs to be replaced with something way better.
if ($polylines[0][-1]->coincides_width($self_pl->[-1]) && $polylines[-1][0]->coincides_width($self_pl->[0])) {
if ($polylines[0][-1]->coincides_with($self_pl->[-1]) && $polylines[-1][0]->coincides_width($self_pl->[0])) {
my $p = $polylines[0]->clone;
$p->pop_back;
$p->append(@{$polylines[-1]});
return [$p];
}
if ($polylines[0][0]->coincides_width($self_pl->[0]) && $polylines[-1][-1]->coincides_width($self_pl->[-1])) {
if ($polylines[0][0]->coincides_with($self_pl->[0]) && $polylines[-1][-1]->coincides_width($self_pl->[-1])) {
my $p = $polylines[-1]->clone;
$p->pop_back;
$p->append(@{$polylines[0]});