mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-15 02:37:51 -06:00
Refactoring: moved slicing code to new TriangleMesh class, leaving in STL just what's needed to read that particular input format. Slic3r will now warn if model is not manifold. #16
This commit is contained in:
parent
15d060019f
commit
d51a37a0ae
16 changed files with 642 additions and 451 deletions
|
@ -2,8 +2,7 @@ package Slic3r::Layer;
|
|||
use Moo;
|
||||
|
||||
use Math::Clipper ':all';
|
||||
use Slic3r::Geometry qw(polygon_lines points_coincide angle3points polyline_lines nearest_point
|
||||
line_length collinear X Y A B PI);
|
||||
use Slic3r::Geometry qw(collinear X Y A B PI);
|
||||
use Slic3r::Geometry::Clipper qw(union_ex diff_ex intersection_ex PFT_EVENODD);
|
||||
use XXX;
|
||||
|
||||
|
@ -18,7 +17,7 @@ has 'id' => (
|
|||
# these need to be merged in continuos (closed) polylines
|
||||
has 'lines' => (
|
||||
is => 'rw',
|
||||
#isa => 'ArrayRef[Slic3r::Line]',
|
||||
#isa => 'ArrayRef[Slic3r::TriangleMesh::IntersectionLine]',
|
||||
default => sub { [] },
|
||||
);
|
||||
|
||||
|
@ -98,202 +97,19 @@ sub add_line {
|
|||
my $self = shift;
|
||||
my ($line) = @_;
|
||||
|
||||
return if $line->a->coincides_with($line->b);
|
||||
|
||||
push @{ $self->lines }, $line;
|
||||
return $line;
|
||||
}
|
||||
|
||||
# merge overlapping lines
|
||||
sub cleanup_lines {
|
||||
my $self = shift;
|
||||
|
||||
my $lines = $self->lines;
|
||||
my $line_count = @$lines;
|
||||
|
||||
for (my $i = 0; $i <= $#$lines-1; $i++) {
|
||||
for (my $j = $i+1; $j <= $#$lines; $j++) {
|
||||
# lines are collinear and overlapping?
|
||||
next unless collinear($lines->[$i], $lines->[$j], 1);
|
||||
|
||||
# lines have same orientation?
|
||||
next unless ($lines->[$i][A][X] <=> $lines->[$i][B][X]) == ($lines->[$j][A][X] <=> $lines->[$j][B][X])
|
||||
&& ($lines->[$i][A][Y] <=> $lines->[$i][B][Y]) == ($lines->[$j][A][Y] <=> $lines->[$j][B][Y]);
|
||||
|
||||
# resulting line
|
||||
my @x = sort { $a <=> $b } ($lines->[$i][A][X], $lines->[$i][B][X], $lines->[$j][A][X], $lines->[$j][B][X]);
|
||||
my @y = sort { $a <=> $b } ($lines->[$i][A][Y], $lines->[$i][B][Y], $lines->[$j][A][Y], $lines->[$j][B][Y]);
|
||||
my $new_line = Slic3r::Line->new([$x[0], $y[0]], [$x[-1], $y[-1]]);
|
||||
for (X, Y) {
|
||||
($new_line->[A][$_], $new_line->[B][$_]) = ($new_line->[B][$_], $new_line->[A][$_])
|
||||
if $lines->[$i][A][$_] > $lines->[$i][B][$_];
|
||||
}
|
||||
|
||||
# save new line and remove found one
|
||||
$lines->[$i] = $new_line;
|
||||
splice @$lines, $j, 1;
|
||||
$j--;
|
||||
}
|
||||
}
|
||||
|
||||
Slic3r::debugf " merging %d lines resulted in %d lines\n", $line_count, scalar(@$lines);
|
||||
}
|
||||
|
||||
# build polylines from lines
|
||||
sub make_surfaces {
|
||||
my $self = shift;
|
||||
|
||||
if (0) {
|
||||
printf "Layer was sliced at z = %f\n", $self->slice_z * $Slic3r::resolution;
|
||||
require "Slic3r/SVG.pm";
|
||||
Slic3r::SVG::output(undef, "lines.svg",
|
||||
lines => [ grep !$_->isa('Slic3r::Line::FacetEdge'), @{$self->lines} ],
|
||||
red_lines => [ grep $_->isa('Slic3r::Line::FacetEdge'), @{$self->lines} ],
|
||||
);
|
||||
}
|
||||
|
||||
my (@polygons, %visited_lines, @discarded_lines, @discarded_polylines) = ();
|
||||
|
||||
my $detect = sub {
|
||||
my @lines = @{$self->lines};
|
||||
(@polygons, %visited_lines, @discarded_lines, @discarded_polylines) = ();
|
||||
my $get_point_id = sub { sprintf "%.0f,%.0f", @{$_[0]} };
|
||||
|
||||
my (%pointmap, @pointmap_keys) = ();
|
||||
foreach my $line (@lines) {
|
||||
my $point_id = $get_point_id->($line->[A]);
|
||||
if (!exists $pointmap{$point_id}) {
|
||||
$pointmap{$point_id} = [];
|
||||
push @pointmap_keys, $line->[A];
|
||||
}
|
||||
push @{ $pointmap{$point_id} }, $line;
|
||||
}
|
||||
|
||||
my $n = 0;
|
||||
while (my $first_line = shift @lines) {
|
||||
next if $visited_lines{ $first_line->id };
|
||||
my @points = @$first_line;
|
||||
|
||||
my @seen_lines = ($first_line);
|
||||
my %seen_points = map { $get_point_id->($points[$_]) => $_ } 0..1;
|
||||
|
||||
CYCLE: while (1) {
|
||||
my $next_lines = $pointmap{ $get_point_id->($points[-1]) };
|
||||
|
||||
# shouldn't we find the point, let's try with a slower algorithm
|
||||
# as approximation may make the coordinates differ
|
||||
if (!$next_lines) {
|
||||
my $nearest_point = nearest_point($points[-1], \@pointmap_keys);
|
||||
#printf " we have a nearest point: %f,%f (%s)\n", @$nearest_point, $get_point_id->($nearest_point);
|
||||
|
||||
if ($nearest_point) {
|
||||
local $Slic3r::Geometry::epsilon = 1000000;
|
||||
$next_lines = $pointmap{$get_point_id->($nearest_point)}
|
||||
if points_coincide($points[-1], $nearest_point);
|
||||
}
|
||||
}
|
||||
|
||||
if (0 && !$next_lines) {
|
||||
require "Slic3r/SVG.pm";
|
||||
Slic3r::SVG::output(undef, "no_lines.svg",
|
||||
lines => [ grep !$_->isa('Slic3r::Line::FacetEdge'), @{$self->lines} ],
|
||||
red_lines => [ grep $_->isa('Slic3r::Line::FacetEdge'), @{$self->lines} ],
|
||||
points => [ $points[-1] ],
|
||||
no_arrows => 1,
|
||||
);
|
||||
}
|
||||
|
||||
$next_lines
|
||||
or die sprintf("No lines start at point %s. This shouldn't happen. Please check the model for manifoldness.\n", $get_point_id->($points[-1]));
|
||||
last CYCLE if !@$next_lines;
|
||||
|
||||
my @ordered_next_lines = sort
|
||||
{ angle3points($points[-1], $points[-2], $next_lines->[$a][B]) <=> angle3points($points[-1], $points[-2], $next_lines->[$b][B]) }
|
||||
0..$#$next_lines;
|
||||
|
||||
#if (@$next_lines > 1) {
|
||||
# Slic3r::SVG::output(undef, "next_line.svg",
|
||||
# lines => $next_lines,
|
||||
# red_lines => [ polyline_lines([@points]) ],
|
||||
# green_lines => [ $next_lines->[ $ordered_next_lines[0] ] ],
|
||||
# );
|
||||
#}
|
||||
|
||||
my ($next_line) = splice @$next_lines, $ordered_next_lines[0], 1;
|
||||
push @seen_lines, $next_line;
|
||||
|
||||
push @points, $next_line->[B];
|
||||
|
||||
my $point_id = $get_point_id->($points[-1]);
|
||||
if ($seen_points{$point_id}) {
|
||||
splice @points, 0, $seen_points{$point_id};
|
||||
last CYCLE;
|
||||
}
|
||||
|
||||
$seen_points{$point_id} = $#points;
|
||||
}
|
||||
|
||||
if (@points < 4 || !points_coincide($points[0], $points[-1])) {
|
||||
# discarding polyline
|
||||
push @discarded_lines, @seen_lines;
|
||||
if (@points > 2) {
|
||||
push @discarded_polylines, [@points];
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
$visited_lines{ $_->id } = 1 for @seen_lines;
|
||||
pop @points;
|
||||
Slic3r::debugf "Discovered polygon of %d points\n", scalar(@points);
|
||||
push @polygons, Slic3r::Polygon->new(@points);
|
||||
$polygons[-1]->cleanup;
|
||||
}
|
||||
};
|
||||
|
||||
$detect->();
|
||||
|
||||
# Now, if we got a clean and manifold model then @polygons would contain everything
|
||||
# we need to draw our layer. In real life, sadly, things are different and it is likely
|
||||
# that the above algorithm wasn't able to detect every polygon. This may happen because
|
||||
# of non-manifoldness or because of many close lines, often overlapping; both situations
|
||||
# make a head-to-tail search difficult.
|
||||
# On the other hand, we can safely assume that every polygon we detected is correct, as
|
||||
# the above algorithm is quite strict. We can take a brute force approach to connect any
|
||||
# other line.
|
||||
|
||||
# So, let's first check what lines were not detected as part of polygons.
|
||||
if (@discarded_lines) {
|
||||
Slic3r::debugf " %d lines out of %d were discarded and %d polylines were not closed\n",
|
||||
scalar(@discarded_lines), scalar(@{$self->lines}), scalar(@discarded_polylines);
|
||||
print " Warning: errors while parsing this layer (dirty or non-manifold model).\n";
|
||||
print " Retrying with slower algorithm.\n";
|
||||
|
||||
if (0) {
|
||||
require "Slic3r/SVG.pm";
|
||||
Slic3r::SVG::output(undef, "layer" . $self->id . "_detected.svg",
|
||||
white_polygons => \@polygons,
|
||||
);
|
||||
Slic3r::SVG::output(undef, "layer" . $self->id . "_discarded_lines.svg",
|
||||
red_lines => \@discarded_lines,
|
||||
);
|
||||
Slic3r::SVG::output(undef, "layer" . $self->id . "_discarded_polylines.svg",
|
||||
polylines => \@discarded_polylines,
|
||||
);
|
||||
}
|
||||
|
||||
$self->cleanup_lines;
|
||||
eval { $detect->(); };
|
||||
warn $@ if $@;
|
||||
|
||||
if (@discarded_lines) {
|
||||
print " Warning: even slow detection algorithm threw errors. Review the output before printing.\n";
|
||||
}
|
||||
}
|
||||
my ($loops) = @_;
|
||||
|
||||
{
|
||||
my $expolygons = union_ex([ @polygons ], PFT_EVENODD);
|
||||
my $expolygons = union_ex($loops, PFT_EVENODD);
|
||||
Slic3r::debugf " %d surface(s) having %d holes detected from %d polylines\n",
|
||||
scalar(@$expolygons), scalar(map $_->holes, @$expolygons), scalar(@polygons);
|
||||
scalar(@$expolygons), scalar(map $_->holes, @$expolygons), scalar(@$loops);
|
||||
|
||||
push @{$self->surfaces},
|
||||
map Slic3r::Surface->cast_from_expolygon($_, surface_type => 'internal'),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue