3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't grow horizontal shells having acute angles. #1387

Browse Source
This commit is contained in:
Alessandro Ranellucci 2013-09-06 17:43:40 +02:00
parent 9484c377d9
commit cb677c45de
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Slic3r/Geometry/Clipper.pm
View File

@ -5,9 +5,9 @@ use warnings;
require Exporter; require Exporter;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT_OK = qw(offset offset_ex our @EXPORT_OK = qw(offset offset_ex
diff_ex diff union_ex intersection_ex xor_ex JT_ROUND diff_ex diff union_ex intersection_ex xor_ex JT_ROUND JT_MITER
JT_SQUARE is_counter_clockwise union_pt offset2 offset2_ex traverse_pt JT_SQUARE is_counter_clockwise union_pt offset2 offset2_ex traverse_pt
intersection union); intersection union CLIPPER_OFFSET_SCALE);
use Slic3r::Geometry qw(scale); use Slic3r::Geometry qw(scale);

9
lib/Slic3r/Print/Object.pm
View File

@ -5,7 +5,7 @@ use List::Util qw(min max sum first);
use Slic3r::ExtrusionPath ':roles'; use Slic3r::ExtrusionPath ':roles';
use Slic3r::Geometry qw(X Y Z PI scale unscale deg2rad rad2deg scaled_epsilon chained_path_points); use Slic3r::Geometry qw(X Y Z PI scale unscale deg2rad rad2deg scaled_epsilon chained_path_points);
use Slic3r::Geometry::Clipper qw(diff diff_ex intersection intersection_ex union union_ex use Slic3r::Geometry::Clipper qw(diff diff_ex intersection intersection_ex union union_ex
offset offset_ex offset2); offset offset_ex offset2 CLIPPER_OFFSET_SCALE JT_MITER);
use Slic3r::Surface ':types'; use Slic3r::Surface ':types';
has 'print' => (is => 'ro', weak_ref => 1, required => 1); has 'print' => (is => 'ro', weak_ref => 1, required => 1);
@ -628,10 +628,15 @@ sub discover_horizontal_shells {
# make sure the new internal solid is wide enough, as it might get collapsed when # make sure the new internal solid is wide enough, as it might get collapsed when
# spacing is added in Fill.pm # spacing is added in Fill.pm
{ {
# we use a higher miterLimit here to handle areas with acute angles
# in those cases, the default miterLimit would cut the corner and we'd
# get a triangle in $too_narrow; if we grow it below then the shell
# would have a different shape from the external surface and we'd still
# have the same angle, so the next shell would be grown even more and so on.
my $margin = 3 * $layerm->solid_infill_flow->scaled_width; # require at least this size my $margin = 3 * $layerm->solid_infill_flow->scaled_width; # require at least this size
my $too_narrow = diff_ex( my $too_narrow = diff_ex(
[ map @$_, @$new_internal_solid ], [ map @$_, @$new_internal_solid ],
offset2([ map @$_, @$new_internal_solid ], -$margin, +$margin), offset2([ map @$_, @$new_internal_solid ], -$margin, +$margin, CLIPPER_OFFSET_SCALE, JT_MITER, 5),
1, 1,
); );

1
xs/xsp/Clipper.xsp
View File

@ -16,6 +16,7 @@ _constant()
JT_MITER = jtMiter JT_MITER = jtMiter
JT_ROUND = jtRound JT_ROUND = jtRound
JT_SQUARE = jtSquare JT_SQUARE = jtSquare
CLIPPER_OFFSET_SCALE = CLIPPER_OFFSET_SCALE
CODE: CODE:
RETVAL = ix; RETVAL = ix;
OUTPUT: RETVAL OUTPUT: RETVAL