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

Merge branch 'call_get_layer' of github.com:sapir/Slic3r into sapir-call_get_layer

Browse Source 
Conflicts:
	lib/Slic3r/Print.pm
This commit is contained in:
Alessandro Ranellucci 2014-06-14 00:05:24 +02:00
commit e24b3a8916
4 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Slic3r/Print.pm
View File

@ -557,7 +557,7 @@ sub make_skirt {
? scalar(@{$object->layers}) ? scalar(@{$object->layers})
: min($self->config->skirt_height, scalar(@{$object->layers})); : min($self->config->skirt_height, scalar(@{$object->layers}));
my $highest_layer = $object->layers->[$skirt_height-1]; my $highest_layer = $object->get_layer($skirt_height - 1);
$skirt_height_z = max($skirt_height_z, $highest_layer->print_z); $skirt_height_z = max($skirt_height_z, $highest_layer->print_z);
} }
@ -685,7 +685,7 @@ sub make_brim {
my @islands = (); # array of polygons my @islands = (); # array of polygons
foreach my $obj_idx (0 .. ($self->object_count - 1)) { foreach my $obj_idx (0 .. ($self->object_count - 1)) {
my $object = $self->objects->[$obj_idx]; my $object = $self->objects->[$obj_idx];
my $layer0 = $object->layers->[0]; my $layer0 = $object->get_layer(0);
my @object_islands = ( my @object_islands = (
(map $_->contour, @{$layer0->slices}), (map $_->contour, @{$layer0->slices}),
); );

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

@ -161,9 +161,10 @@ sub slice {
### Slic3r::debugf "Layer %d: height = %s; slice_z = %s; print_z = %s\n", $id, $height, $slice_z, $print_z; ### Slic3r::debugf "Layer %d: height = %s; slice_z = %s; print_z = %s\n", $id, $height, $slice_z, $print_z;
$self->add_layer($id, $height, $print_z, $slice_z); $self->add_layer($id, $height, $print_z, $slice_z);
if (@{$self->layers} >= 2) { if ($self->layer_count >= 2) {
$self->layers->[-2]->set_upper_layer($self->layers->[-1]); my $lc = $self->layer_count;
$self->layers->[-1]->set_lower_layer($self->layers->[-2]); $self->get_layer($lc - 2)->set_upper_layer($self->get_layer($lc - 1));
$self->get_layer($lc - 1)->set_lower_layer($self->get_layer($lc - 2));
} }
$id++; $id++;
@ -184,7 +185,7 @@ sub slice {
for my $region_id (0..($self->region_count - 1)) { for my $region_id (0..($self->region_count - 1)) {
my $expolygons_by_layer = $self->_slice_region($region_id, \@z, 0); my $expolygons_by_layer = $self->_slice_region($region_id, \@z, 0);
for my $layer_id (0..$#$expolygons_by_layer) { for my $layer_id (0..$#$expolygons_by_layer) {
my $layerm = $self->layers->[$layer_id]->regions->[$region_id]; my $layerm = $self->get_layer($layer_id)->regions->[$region_id];
$layerm->slices->clear; $layerm->slices->clear;
foreach my $expolygon (@{ $expolygons_by_layer->[$layer_id] }) { foreach my $expolygon (@{ $expolygons_by_layer->[$layer_id] }) {
$layerm->slices->append(Slic3r::Surface->new( $layerm->slices->append(Slic3r::Surface->new(
@ -205,8 +206,8 @@ sub slice {
next if $other_region_id == $region_id; next if $other_region_id == $region_id;
for my $layer_id (0..$#$expolygons_by_layer) { for my $layer_id (0..$#$expolygons_by_layer) {
my $layerm = $self->layers->[$layer_id]->regions->[$region_id]; my $layerm = $self->get_layer($layer_id)->regions->[$region_id];
my $other_layerm = $self->layers->[$layer_id]->regions->[$other_region_id]; my $other_layerm = $self->get_layer($layer_id)->regions->[$other_region_id];
my $other_slices = [ map $_->p, @{$other_layerm->slices} ]; # Polygons my $other_slices = [ map $_->p, @{$other_layerm->slices} ]; # Polygons
my $my_parts = intersection_ex( my $my_parts = intersection_ex(
@ -236,7 +237,7 @@ sub slice {
# remove last layer(s) if empty # remove last layer(s) if empty
$self->delete_layer($self->layer_count - 1) $self->delete_layer($self->layer_count - 1)
while $self->layer_count && (!map @{$_->slices}, @{$self->layers->[-1]->regions}); while $self->layer_count && (!map @{$_->slices}, @{$self->get_layer($self->layer_count - 1)->regions});
foreach my $layer (@{ $self->layers }) { foreach my $layer (@{ $self->layers }) {
# apply size compensation # apply size compensation
@ -299,7 +300,7 @@ sub slice {
# detect slicing errors # detect slicing errors
my $warning_thrown = 0; my $warning_thrown = 0;
for my $i (0 .. ($self->layer_count - 1)) { for my $i (0 .. ($self->layer_count - 1)) {
my $layer = $self->layers->[$i]; my $layer = $self->get_layer($i);
next unless $layer->slicing_errors; next unless $layer->slicing_errors;
if (!$warning_thrown) { if (!$warning_thrown) {
warn "The model has overlapping or self-intersecting facets. I tried to repair it, " warn "The model has overlapping or self-intersecting facets. I tried to repair it, "
@ -316,14 +317,14 @@ sub slice {
my (@upper_surfaces, @lower_surfaces); my (@upper_surfaces, @lower_surfaces);
for (my $j = $i+1; $j < $self->layer_count; $j++) { for (my $j = $i+1; $j < $self->layer_count; $j++) {
if (!$self->layers->[$j]->slicing_errors) { if (!$self->get_layer($j)->slicing_errors) {
@upper_surfaces = @{$self->layers->[$j]->region($region_id)->slices}; @upper_surfaces = @{$self->get_layer($j)->region($region_id)->slices};
last; last;
} }
} }
for (my $j = $i-1; $j >= 0; $j--) { for (my $j = $i-1; $j >= 0; $j--) {
if (!$self->layers->[$j]->slicing_errors) { if (!$self->get_layer($j)->slicing_errors) {
@lower_surfaces = @{$self->layers->[$j]->region($region_id)->slices}; @lower_surfaces = @{$self->get_layer($j)->region($region_id)->slices};
last; last;
} }
} }
@ -349,10 +350,10 @@ sub slice {
} }
# remove empty layers from bottom # remove empty layers from bottom
while (@{$self->layers} && !@{$self->layers->[0]->slices}) { while (@{$self->layers} && !@{$self->get_layer(0)->slices}) {
shift @{$self->layers}; shift @{$self->layers};
for (my $i = 0; $i <= $#{$self->layers}; $i++) { for (my $i = 0; $i <= $#{$self->layers}; $i++) {
$self->layers->[$i]->id( $self->layers->[$i]->id-1 ); $self->get_layer($i)->id( $self->get_layer($i)->id-1 );
} }
} }
@ -423,8 +424,8 @@ sub make_perimeters {
if ($region->config->extra_perimeters && $region_perimeters > 0 && $region->config->fill_density > 0) { if ($region->config->extra_perimeters && $region_perimeters > 0 && $region->config->fill_density > 0) {
for my $i (0 .. ($self->layer_count - 2)) { for my $i (0 .. ($self->layer_count - 2)) {
my $layerm = $self->layers->[$i]->regions->[$region_id]; my $layerm = $self->get_layer($i)->regions->[$region_id];
my $upper_layerm = $self->layers->[$i+1]->regions->[$region_id]; my $upper_layerm = $self->get_layer($i+1)->regions->[$region_id];
my $perimeter_spacing = $layerm->flow(FLOW_ROLE_PERIMETER)->scaled_spacing; my $perimeter_spacing = $layerm->flow(FLOW_ROLE_PERIMETER)->scaled_spacing;
my $ext_perimeter_spacing = $layerm->flow(FLOW_ROLE_EXTERNAL_PERIMETER)->scaled_spacing; my $ext_perimeter_spacing = $layerm->flow(FLOW_ROLE_EXTERNAL_PERIMETER)->scaled_spacing;
@ -476,7 +477,7 @@ sub make_perimeters {
thread_cb => sub { thread_cb => sub {
my $q = shift; my $q = shift;
while (defined (my $i = $q->dequeue)) { while (defined (my $i = $q->dequeue)) {
$self->layers->[$i]->make_perimeters; $self->get_layer($i)->make_perimeters;
} }
}, },
collect_cb => sub {}, collect_cb => sub {},
@ -553,7 +554,7 @@ sub infill {
my $q = shift; my $q = shift;
while (defined (my $obj_layer = $q->dequeue)) { while (defined (my $obj_layer = $q->dequeue)) {
my ($i, $region_id) = @$obj_layer; my ($i, $region_id) = @$obj_layer;
my $layerm = $self->layers->[$i]->regions->[$region_id]; my $layerm = $self->get_layer($i)->regions->[$region_id];
$layerm->fills->clear; $layerm->fills->clear;
$layerm->fills->append( $self->fill_maker->make_fill($layerm) ); $layerm->fills->append( $self->fill_maker->make_fill($layerm) );
} }
@ -618,7 +619,7 @@ sub detect_surfaces_type {
for my $region_id (0 .. ($self->print->regions_count-1)) { for my $region_id (0 .. ($self->print->regions_count-1)) {
for my $i (0 .. ($self->layer_count - 1)) { for my $i (0 .. ($self->layer_count - 1)) {
my $layerm = $self->layers->[$i]->regions->[$region_id]; my $layerm = $self->get_layer($i)->regions->[$region_id];
# prepare a reusable subroutine to make surface differences # prepare a reusable subroutine to make surface differences
my $difference = sub { my $difference = sub {
@ -636,8 +637,8 @@ sub detect_surfaces_type {
# comparison happens against the *full* slices (considering all regions) # comparison happens against the *full* slices (considering all regions)
# unless internal shells are requested # unless internal shells are requested
my $upper_layer = $self->layers->[$i+1]; my $upper_layer = $i < $self->layer_count - 1 ? $self->get_layer($i+1) : undef;
my $lower_layer = $i > 0 ? $self->layers->[$i-1] : undef; my $lower_layer = $i > 0 ? $self->get_layer($i-1) : undef;
# find top surfaces (difference between current surfaces # find top surfaces (difference between current surfaces
# of current layer and upper one) # of current layer and upper one)
@ -750,7 +751,7 @@ sub clip_fill_surfaces {
my $overhangs = []; # arrayref of polygons my $overhangs = []; # arrayref of polygons
for my $layer_id (reverse 0..($self->layer_count - 1)) { for my $layer_id (reverse 0..($self->layer_count - 1)) {
my $layer = $self->layers->[$layer_id]; my $layer = $self->get_layer($layer_id);
my @layer_internal = (); # arrayref of Surface objects my @layer_internal = (); # arrayref of Surface objects
my @new_internal = (); # arrayref of Surface objects my @new_internal = (); # arrayref of Surface objects
@ -803,9 +804,9 @@ sub bridge_over_infill {
next if $fill_density == 100 || $fill_density == 0; next if $fill_density == 100 || $fill_density == 0;
for my $layer_id (1..($self->layer_count - 1)) { for my $layer_id (1..($self->layer_count - 1)) {
my $layer = $self->layers->[$layer_id]; my $layer = $self->get_layer($layer_id);
my $layerm = $layer->regions->[$region_id]; my $layerm = $layer->regions->[$region_id];
my $lower_layer = $self->layers->[$layer_id-1]; my $lower_layer = $self->get_layer($layer_id-1);
# compute the areas needing bridge math # compute the areas needing bridge math
my @internal_solid = @{$layerm->fill_surfaces->filter_by_type(S_TYPE_INTERNALSOLID)}; my @internal_solid = @{$layerm->fill_surfaces->filter_by_type(S_TYPE_INTERNALSOLID)};
@ -841,9 +842,9 @@ sub bridge_over_infill {
# Update: do not exclude any infill. Sparse infill is able to absorb the excess material. # Update: do not exclude any infill. Sparse infill is able to absorb the excess material.
if (0) { if (0) {
my $excess = $layerm->extruders->{infill}->bridge_flow->width - $layerm->height; my $excess = $layerm->extruders->{infill}->bridge_flow->width - $layerm->height;
for (my $i = $layer_id-1; $excess >= $self->layers->[$i]->height; $i--) { for (my $i = $layer_id-1; $excess >= $self->get_layer($i)->height; $i--) {
Slic3r::debugf " skipping infill below those areas at layer %d\n", $i; Slic3r::debugf " skipping infill below those areas at layer %d\n", $i;
foreach my $lower_layerm (@{$self->layers->[$i]->regions}) { foreach my $lower_layerm (@{$self->get_layer($i)->regions}) {
my @new_surfaces = (); my @new_surfaces = ();
# subtract the area from all types of surfaces # subtract the area from all types of surfaces
foreach my $group (@{$lower_layerm->fill_surfaces->group}) { foreach my $group (@{$lower_layerm->fill_surfaces->group}) {
@ -864,7 +865,7 @@ sub bridge_over_infill {
$lower_layerm->fill_surfaces->append(@new_surfaces); $lower_layerm->fill_surfaces->append(@new_surfaces);
} }
$excess -= $self->layers->[$i]->height; $excess -= $self->get_layer($i)->height;
} }
} }
} }
@ -875,9 +876,9 @@ sub process_external_surfaces {
my ($self) = @_; my ($self) = @_;
for my $region_id (0 .. ($self->print->regions_count-1)) { for my $region_id (0 .. ($self->print->regions_count-1)) {
$self->layers->[0]->regions->[$region_id]->process_external_surfaces(undef); $self->get_layer(0)->regions->[$region_id]->process_external_surfaces(undef);
for my $i (1 .. ($self->layer_count - 1)) { for my $i (1 .. ($self->layer_count - 1)) {
$self->layers->[$i]->regions->[$region_id]->process_external_surfaces($self->layers->[$i-1]); $self->get_layer($i)->regions->[$region_id]->process_external_surfaces($self->get_layer($i-1));
} }
} }
} }
@ -889,7 +890,7 @@ sub discover_horizontal_shells {
for my $region_id (0 .. ($self->print->regions_count-1)) { for my $region_id (0 .. ($self->print->regions_count-1)) {
for (my $i = 0; $i < $self->layer_count; $i++) { for (my $i = 0; $i < $self->layer_count; $i++) {
my $layerm = $self->layers->[$i]->regions->[$region_id]; my $layerm = $self->get_layer($i)->regions->[$region_id];
if ($layerm->config->solid_infill_every_layers && $layerm->config->fill_density > 0 if ($layerm->config->solid_infill_every_layers && $layerm->config->fill_density > 0
&& ($i % $layerm->config->solid_infill_every_layers) == 0) { && ($i % $layerm->config->solid_infill_every_layers) == 0) {
@ -923,7 +924,7 @@ sub discover_horizontal_shells {
next if $n < 0 || $n >= $self->layer_count; next if $n < 0 || $n >= $self->layer_count;
Slic3r::debugf " looking for neighbors on layer %d...\n", $n; Slic3r::debugf " looking for neighbors on layer %d...\n", $n;
my $neighbor_layerm = $self->layers->[$n]->regions->[$region_id]; my $neighbor_layerm = $self->get_layer($n)->regions->[$region_id];
my $neighbor_fill_surfaces = $neighbor_layerm->fill_surfaces; my $neighbor_fill_surfaces = $neighbor_layerm->fill_surfaces;
my @neighbor_fill_surfaces = map $_->clone, @$neighbor_fill_surfaces; # clone because we will use these surfaces even after clearing the collection my @neighbor_fill_surfaces = map $_->clone, @$neighbor_fill_surfaces; # clone because we will use these surfaces even after clearing the collection
@ -1049,7 +1050,7 @@ sub combine_infill {
{ {
my $current_height = my $layers = 0; my $current_height = my $layers = 0;
for my $layer_id (1 .. $#layer_heights) { for my $layer_id (1 .. $#layer_heights) {
my $height = $self->layers->[$layer_id]->height; my $height = $self->get_layer($layer_id)->height;
if ($current_height + $height >= $nozzle_diameter || $layers >= $every) { if ($current_height + $height >= $nozzle_diameter || $layers >= $every) {
$combine[$layer_id-1] = $layers; $combine[$layer_id-1] = $layers;
@ -1064,7 +1065,7 @@ sub combine_infill {
# skip bottom layer # skip bottom layer
for my $layer_id (1 .. $#combine) { for my $layer_id (1 .. $#combine) {
next unless ($combine[$layer_id] // 1) > 1; next unless ($combine[$layer_id] // 1) > 1;
my @layerms = map $self->layers->[$_]->regions->[$region_id], my @layerms = map $self->get_layer($_)->regions->[$region_id],
($layer_id - ($combine[$layer_id]-1) .. $layer_id); ($layer_id - ($combine[$layer_id]-1) .. $layer_id);
# only combine internal infill # only combine internal infill

4
lib/Slic3r/Print/SupportMaterial.pm
View File

@ -111,7 +111,7 @@ sub contact_area {
# the 'overhangs' of the first object layer # the 'overhangs' of the first object layer
last if $layer_id > 0; last if $layer_id > 0;
} }
my $layer = $object->layers->[$layer_id]; my $layer = $object->get_layer($layer_id);
# detect overhangs and contact areas needed to support them # detect overhangs and contact areas needed to support them
my (@overhang, @contact) = (); my (@overhang, @contact) = ();
@ -122,7 +122,7 @@ sub contact_area {
push @overhang, map $_->clone, map $_->contour, @{$layer->slices}; push @overhang, map $_->clone, map $_->contour, @{$layer->slices};
push @contact, @{offset(\@overhang, scale +MARGIN)}; push @contact, @{offset(\@overhang, scale +MARGIN)};
} else { } else {
my $lower_layer = $object->layers->[$layer_id-1]; my $lower_layer = $object->get_layer($layer_id-1);
foreach my $layerm (@{$layer->regions}) { foreach my $layerm (@{$layer->regions}) {
my $fw = $layerm->flow(FLOW_ROLE_EXTERNAL_PERIMETER)->scaled_width; my $fw = $layerm->flow(FLOW_ROLE_EXTERNAL_PERIMETER)->scaled_width;
my $diff; my $diff;

2
t/perimeters.t
View File

File diff suppressed because one or more lines are too long