Make tests happy

This commit is contained in:
Alessandro Ranellucci 2013-03-07 16:24:25 +01:00
parent 97e864699e
commit 2f192bddca
5 changed files with 11 additions and 8 deletions

View file

@ -52,10 +52,17 @@ sub make_fill {
Slic3r::debugf "Filling layer %d:\n", $layerm->id;
my @surfaces = ();
# if hollow object is requested, remove internal surfaces
# (this needs to be done after internal-solid shells are created)
if ($Slic3r::Config->fill_density == 0) {
@surfaces = grep $_->surface_type != S_TYPE_INTERNAL, @surfaces;
}
# merge adjacent surfaces
# in case of bridge surfaces, the ones with defined angle will be attached to the ones
# without any angle (shouldn't this logic be moved to process_external_surfaces()?)
my @surfaces = ();
{
my @surfaces_with_bridge_angle = grep defined $_->bridge_angle, @{$layerm->fill_surfaces};

View file

@ -40,7 +40,7 @@ has 'speeds' => (
default => sub {+{
map { $_ => 60 * $Slic3r::Config->get_value("${_}_speed") }
qw(travel perimeter small_perimeter external_perimeter infill
solid_infill top_solid_infill support_material bridge gap_fill),
solid_infill top_solid_infill support_material bridge gap_fill retract),
}},
);

View file

@ -437,11 +437,6 @@ sub _add_perimeter {
sub prepare_fill_surfaces {
my $self = shift;
# if hollow object is requested, remove internal surfaces
if ($Slic3r::Config->fill_density == 0) {
@{$self->fill_surfaces} = grep $_->surface_type != S_TYPE_INTERNAL, @{$self->fill_surfaces};
}
# if no solid layers are requested, turn top/bottom surfaces to internal
if ($Slic3r::Config->top_solid_layers == 0) {
$_->surface_type(S_TYPE_INTERNAL) for grep $_->surface_type == S_TYPE_TOP, @{$self->fill_surfaces};