GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-05-17 22:26:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Even more constants, less memory, more speed

Browse Source
This commit is contained in:
Alessandro Ranellucci 2012-05-19 16:04:33 +02:00
parent aa9563f00b
commit 882a022e3a
5 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Slic3r/ExtrusionPath.pm
View File

@ -7,7 +7,6 @@ our @EXPORT_OK = qw(EXTR_ROLE_PERIMETER EXTR_ROLE_SMALLPERIMETER EXTR_ROLE_FILL
EXTR_ROLE_BRIDGE EXTR_ROLE_SKIRT EXTR_ROLE_SUPPORTMATERIAL); EXTR_ROLE_BRIDGE EXTR_ROLE_SKIRT EXTR_ROLE_SUPPORTMATERIAL);
our %EXPORT_TAGS = (roles => \@EXPORT_OK); our %EXPORT_TAGS = (roles => \@EXPORT_OK);
use Slic3r::Geometry qw(PI X Y epsilon deg2rad rotate_points); use Slic3r::Geometry qw(PI X Y epsilon deg2rad rotate_points);
# the underlying Slic3r::Polyline objects holds the geometry # the underlying Slic3r::Polyline objects holds the geometry

9
lib/Slic3r/Fill.pm
View File

@ -14,6 +14,7 @@ use Slic3r::Fill::Rectilinear;
use Slic3r::ExtrusionPath ':roles'; use Slic3r::ExtrusionPath ':roles';
use Slic3r::Geometry qw(X Y scale shortest_path); use Slic3r::Geometry qw(X Y scale shortest_path);
use Slic3r::Geometry::Clipper qw(union_ex diff_ex); use Slic3r::Geometry::Clipper qw(union_ex diff_ex);
use Slic3r::Surface ':types';
has 'print' => (is => 'ro', required => 1); has 'print' => (is => 'ro', required => 1);
@ -137,17 +138,17 @@ sub make_fill {
my $filler = $Slic3r::fill_pattern; my $filler = $Slic3r::fill_pattern;
my $density = $Slic3r::fill_density; my $density = $Slic3r::fill_density;
my $flow_spacing = $Slic3r::flow_spacing; my $flow_spacing = $Slic3r::flow_spacing;
my $is_bridge = $layer->id > 0 && $surface->surface_type eq 'bottom'; my $is_bridge = $layer->id > 0 && $surface->surface_type == S_TYPE_BOTTOM;
my $is_solid = $surface->surface_type =~ /^(top|bottom|internal-solid)$/; my $is_solid = grep { $surface->surface_type == $_ } S_TYPE_TOP, S_TYPE_BOTTOM, S_TYPE_INTERNALSOLID;
# force 100% density and rectilinear fill for external surfaces # force 100% density and rectilinear fill for external surfaces
if ($surface->surface_type ne 'internal') { if ($surface->surface_type != S_TYPE_INTERNAL) {
$density = 1; $density = 1;
$filler = $Slic3r::solid_fill_pattern; $filler = $Slic3r::solid_fill_pattern;
if ($is_bridge) { if ($is_bridge) {
$filler = 'rectilinear'; $filler = 'rectilinear';
$flow_spacing = sqrt($Slic3r::bridge_flow_ratio * ($Slic3r::nozzle_diameter**2)); $flow_spacing = sqrt($Slic3r::bridge_flow_ratio * ($Slic3r::nozzle_diameter**2));
} elsif ($surface->surface_type eq 'internal-solid') { } elsif ($surface->surface_type == S_TYPE_INTERNALSOLID) {
$filler = 'rectilinear'; $filler = 'rectilinear';
} }
} else { } else {

27
lib/Slic3r/Layer.pm
View File

@ -5,6 +5,7 @@ use Math::Clipper ':all';
use Slic3r::ExtrusionPath ':roles'; use Slic3r::ExtrusionPath ':roles';
use Slic3r::Geometry qw(scale unscale collinear X Y A B PI rad2deg_dir bounding_box_center shortest_path); use Slic3r::Geometry qw(scale unscale collinear X Y A B PI rad2deg_dir bounding_box_center shortest_path);
use Slic3r::Geometry::Clipper qw(union_ex diff_ex intersection_ex xor_ex is_counter_clockwise); use Slic3r::Geometry::Clipper qw(union_ex diff_ex intersection_ex xor_ex is_counter_clockwise);
use Slic3r::Surface ':types';
# a sequential number of layer, starting at 0 # a sequential number of layer, starting at 0
has 'id' => ( has 'id' => (
@ -119,7 +120,7 @@ sub make_surfaces {
scalar(@$expolygons), scalar(map $_->holes, @$expolygons), scalar(@$loops); scalar(@$expolygons), scalar(map $_->holes, @$expolygons), scalar(@$loops);
push @{$self->slices}, push @{$self->slices},
map Slic3r::Surface->new(expolygon => $_, surface_type => 'internal'), map Slic3r::Surface->new(expolygon => $_, surface_type => S_TYPE_INTERNAL),
@$expolygons; @$expolygons;
} }
@ -130,7 +131,7 @@ sub make_surfaces {
@{$self->slices} = (); @{$self->slices} = ();
foreach my $surface (@surfaces) { foreach my $surface (@surfaces) {
push @{$self->slices}, map Slic3r::Surface->new push @{$self->slices}, map Slic3r::Surface->new
(expolygon => $_, surface_type => 'internal'), (expolygon => $_, surface_type => S_TYPE_INTERNAL),
$surface->expolygon->offset_ex(-$distance); $surface->expolygon->offset_ex(-$distance);
} }
@ -319,28 +320,28 @@ sub prepare_fill_surfaces {
my $min_area = ((7 * $Slic3r::flow_spacing / $Slic3r::scaling_factor)**2) * PI; my $min_area = ((7 * $Slic3r::flow_spacing / $Slic3r::scaling_factor)**2) * PI;
my $small_internal = [ my $small_internal = [
grep { $_->expolygon->contour->area <= $min_area } grep { $_->expolygon->contour->area <= $min_area }
grep { $_->surface_type eq 'internal' } grep { $_->surface_type == S_TYPE_INTERNAL }
@surfaces @surfaces
]; ];
foreach my $s (@$small_internal) { foreach my $s (@$small_internal) {
@surfaces = grep $_ ne $s, @surfaces; @surfaces = grep $_ ne $s, @surfaces;
} }
my $union = union_ex([ my $union = union_ex([
(map $_->p, grep $_->surface_type eq 'top', @surfaces), (map $_->p, grep $_->surface_type == S_TYPE_TOP, @surfaces),
(map @$_, map $_->expolygon->safety_offset, @$small_internal), (map @$_, map $_->expolygon->safety_offset, @$small_internal),
]); ]);
my @top = map Slic3r::Surface->new(expolygon => $_, surface_type => 'top'), @$union; my @top = map Slic3r::Surface->new(expolygon => $_, surface_type => S_TYPE_TOP), @$union;
@surfaces = (grep($_->surface_type ne 'top', @surfaces), @top); @surfaces = (grep($_->surface_type != S_TYPE_TOP, @surfaces), @top);
} }
# remove top/bottom surfaces # remove top/bottom surfaces
if ($Slic3r::solid_layers == 0) { if ($Slic3r::solid_layers == 0) {
@surfaces = grep $_->surface_type eq 'internal', @surfaces; @surfaces = grep $_->surface_type == S_TYPE_INTERNAL, @surfaces;
} }
# remove internal surfaces # remove internal surfaces
if ($Slic3r::fill_density == 0) { if ($Slic3r::fill_density == 0) {
@surfaces = grep $_->surface_type ne 'internal', @surfaces; @surfaces = grep $_->surface_type == S_TYPE_INTERNAL, @surfaces;
} }
$self->fill_surfaces([@surfaces]); $self->fill_surfaces([@surfaces]);
@ -379,7 +380,7 @@ sub remove_small_surfaces {
); );
push @{$self->fill_surfaces}, map Slic3r::Surface->new( push @{$self->fill_surfaces}, map Slic3r::Surface->new(
expolygon => $_, expolygon => $_,
surface_type => 'internal-solid'), @$diff; surface_type => S_TYPE_INTERNALSOLID), @$diff;
} }
} }
@ -407,14 +408,14 @@ sub process_bridges {
# reverse bridge processing # reverse bridge processing
my @solid_surfaces = grep { my @solid_surfaces = grep {
($_->surface_type eq 'bottom' && $self->id > 0) || $_->surface_type eq 'top' ($_->surface_type == S_TYPE_BOTTOM && $self->id > 0) || $_->surface_type == S_TYPE_TOP
} @{$self->fill_surfaces} or return; } @{$self->fill_surfaces} or return;
my @internal_surfaces = grep $_->surface_type =~ /internal/, @{$self->slices}; my @internal_surfaces = grep { $_->surface_type == S_TYPE_INTERNAL || $_->surface_type == S_TYPE_INTERNALSOLID } @{$self->slices};
SURFACE: foreach my $surface (@solid_surfaces) { SURFACE: foreach my $surface (@solid_surfaces) {
my $expolygon = $surface->expolygon->safety_offset; my $expolygon = $surface->expolygon->safety_offset;
my $description = $surface->surface_type eq 'bottom' ? 'bridge/overhang' : 'reverse bridge'; my $description = $surface->surface_type == S_TYPE_BOTTOM ? 'bridge/overhang' : 'reverse bridge';
# offset the contour and intersect it with the internal surfaces to discover # offset the contour and intersect it with the internal surfaces to discover
# which of them has contact with our bridge # which of them has contact with our bridge
@ -441,7 +442,7 @@ sub process_bridges {
next SURFACE unless @supporting_surfaces; next SURFACE unless @supporting_surfaces;
my $bridge_angle = undef; my $bridge_angle = undef;
if ($surface->surface_type eq 'bottom') { if ($surface->surface_type == S_TYPE_BOTTOM) {
# detect optimal bridge angle # detect optimal bridge angle
my $bridge_over_hole = 0; my $bridge_over_hole = 0;

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

@ -4,6 +4,7 @@ use Moo;
use Slic3r::ExtrusionPath ':roles'; use Slic3r::ExtrusionPath ':roles';
use Slic3r::Geometry qw(scale unscale); use Slic3r::Geometry qw(scale unscale);
use Slic3r::Geometry::Clipper qw(diff_ex intersection_ex union_ex); use Slic3r::Geometry::Clipper qw(diff_ex intersection_ex union_ex);
use Slic3r::Surface ':types';
has 'input_file' => (is => 'rw', required => 0); has 'input_file' => (is => 'rw', required => 0);
has 'mesh' => (is => 'rw', required => 0); has 'mesh' => (is => 'rw', required => 0);
@ -137,7 +138,7 @@ sub slice {
); );
@{$layer->slices} = map Slic3r::Surface->new @{$layer->slices} = map Slic3r::Surface->new
(expolygon => $_, surface_type => 'internal'), (expolygon => $_, surface_type => S_TYPE_INTERNAL),
@$diff; @$diff;
} }
@ -246,21 +247,21 @@ sub detect_surfaces_type {
# 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)
if ($upper_layer) { if ($upper_layer) {
@top = $surface_difference->($layer->slices, $upper_layer->slices, 'top'); @top = $surface_difference->($layer->slices, $upper_layer->slices, S_TYPE_TOP);
} else { } else {
# if no upper layer, all surfaces of this one are solid # if no upper layer, all surfaces of this one are solid
@top = @{$layer->slices}; @top = @{$layer->slices};
$_->surface_type('top') for @top; $_->surface_type(S_TYPE_TOP) for @top;
} }
# find bottom surfaces (difference between current surfaces # find bottom surfaces (difference between current surfaces
# of current layer and lower one) # of current layer and lower one)
if ($lower_layer) { if ($lower_layer) {
@bottom = $surface_difference->($layer->slices, $lower_layer->slices, 'bottom'); @bottom = $surface_difference->($layer->slices, $lower_layer->slices, S_TYPE_BOTTOM);
} else { } else {
# if no lower layer, all surfaces of this one are solid # if no lower layer, all surfaces of this one are solid
@bottom = @{$layer->slices}; @bottom = @{$layer->slices};
$_->surface_type('bottom') for @bottom; $_->surface_type(S_TYPE_BOTTOM) for @bottom;
} }
# now, if the object contained a thin membrane, we could have overlapping bottom # now, if the object contained a thin membrane, we could have overlapping bottom
@ -269,11 +270,11 @@ sub detect_surfaces_type {
if (@top && @bottom) { if (@top && @bottom) {
my $overlapping = intersection_ex([ map $_->p, @top ], [ map $_->p, @bottom ]); my $overlapping = intersection_ex([ map $_->p, @top ], [ map $_->p, @bottom ]);
Slic3r::debugf " layer %d contains %d membrane(s)\n", $layer->id, scalar(@$overlapping); Slic3r::debugf " layer %d contains %d membrane(s)\n", $layer->id, scalar(@$overlapping);
@top = $surface_difference->([@top], $overlapping, 'top'); @top = $surface_difference->([@top], $overlapping, S_TYPE_TOP);
} }
# find internal surfaces (difference between top/bottom surfaces and others) # find internal surfaces (difference between top/bottom surfaces and others)
@internal = $surface_difference->($layer->slices, [@top, @bottom], 'internal'); @internal = $surface_difference->($layer->slices, [@top, @bottom], S_TYPE_INTERNAL);
# save surfaces to layer # save surfaces to layer
@{$layer->slices} = (@bottom, @top, @internal); @{$layer->slices} = (@bottom, @top, @internal);
@ -309,11 +310,11 @@ sub discover_horizontal_shells {
for (my $i = 0; $i < $self->layer_count; $i++) { for (my $i = 0; $i < $self->layer_count; $i++) {
my $layer = $self->layers->[$i]; my $layer = $self->layers->[$i];
foreach my $type (qw(top bottom)) { foreach my $type (S_TYPE_TOP, S_TYPE_BOTTOM) {
# find surfaces of current type for current layer # find surfaces of current type for current layer
# and offset them to take perimeters into account # and offset them to take perimeters into account
my @surfaces = map $_->offset($Slic3r::perimeters * scale $Slic3r::flow_width), my @surfaces = map $_->offset($Slic3r::perimeters * scale $Slic3r::flow_width),
grep $_->surface_type eq $type, @{$layer->fill_surfaces} or next; grep $_->surface_type == $type, @{$layer->fill_surfaces} or next;
my $surfaces_p = [ map $_->p, @surfaces ]; my $surfaces_p = [ map $_->p, @surfaces ];
Slic3r::debugf "Layer %d has %d surfaces of type '%s'\n", Slic3r::debugf "Layer %d has %d surfaces of type '%s'\n",
$i, scalar(@surfaces), $type; $i, scalar(@surfaces), $type;
@ -332,7 +333,7 @@ sub discover_horizontal_shells {
# intersections have contours and holes # intersections have contours and holes
my $new_internal_solid = intersection_ex( my $new_internal_solid = intersection_ex(
$surfaces_p, $surfaces_p,
[ map $_->p, grep $_->surface_type =~ /internal/, @neighbor_surfaces ], [ map $_->p, grep { $_->surface_type == S_TYPE_INTERNAL || $_->surface_type == S_TYPE_INTERNALSOLID } @neighbor_surfaces ],
undef, 1, undef, 1,
); );
next if !@$new_internal_solid; next if !@$new_internal_solid;
@ -340,13 +341,13 @@ sub discover_horizontal_shells {
# internal-solid are the union of the existing internal-solid surfaces # internal-solid are the union of the existing internal-solid surfaces
# and new ones # and new ones
my $internal_solid = union_ex([ my $internal_solid = union_ex([
( map $_->p, grep $_->surface_type eq 'internal-solid', @neighbor_fill_surfaces ), ( map $_->p, grep $_->surface_type == S_TYPE_INTERNALSOLID, @neighbor_fill_surfaces ),
( map @$_, @$new_internal_solid ), ( map @$_, @$new_internal_solid ),
]); ]);
# subtract intersections from layer surfaces to get resulting inner surfaces # subtract intersections from layer surfaces to get resulting inner surfaces
my $internal = diff_ex( my $internal = diff_ex(
[ map $_->p, grep $_->surface_type eq 'internal', @neighbor_fill_surfaces ], [ map $_->p, grep $_->surface_type == S_TYPE_INTERNAL, @neighbor_fill_surfaces ],
[ map @$_, @$internal_solid ], [ map @$_, @$internal_solid ],
1, 1,
); );
@ -360,16 +361,16 @@ sub discover_horizontal_shells {
my $neighbor_fill_surfaces = $self->layers->[$n]->fill_surfaces; my $neighbor_fill_surfaces = $self->layers->[$n]->fill_surfaces;
@$neighbor_fill_surfaces = (); @$neighbor_fill_surfaces = ();
push @$neighbor_fill_surfaces, Slic3r::Surface->new push @$neighbor_fill_surfaces, Slic3r::Surface->new
(expolygon => $_, surface_type => 'internal') (expolygon => $_, surface_type => S_TYPE_INTERNAL)
for @$internal; for @$internal;
# assign new internal-solid surfaces to layer # assign new internal-solid surfaces to layer
push @$neighbor_fill_surfaces, Slic3r::Surface->new push @$neighbor_fill_surfaces, Slic3r::Surface->new
(expolygon => $_, surface_type => 'internal-solid') (expolygon => $_, surface_type => S_TYPE_INTERNALSOLID)
for @$internal_solid; for @$internal_solid;
# assign top and bottom surfaces to layer # assign top and bottom surfaces to layer
foreach my $s (Slic3r::Surface->group(grep $_->surface_type =~ /top|bottom/, @neighbor_fill_surfaces)) { foreach my $s (Slic3r::Surface->group(grep { $_->surface_type == S_TYPE_TOP || $_->surface_type == S_TYPE_BOTTOM } @neighbor_fill_surfaces)) {
my $solid_surfaces = diff_ex( my $solid_surfaces = diff_ex(
[ map $_->p, @$s ], [ map $_->p, @$s ],
[ map @$_, @$internal_solid, @$internal ], [ map @$_, @$internal_solid, @$internal ],
@ -398,7 +399,7 @@ sub infill_every_layers {
my $layer = $self->layer($i); my $layer = $self->layer($i);
# skip layer if no internal fill surfaces # skip layer if no internal fill surfaces
next if !grep $_->surface_type eq 'internal', @{$layer->fill_surfaces}; next if !grep $_->surface_type == S_TYPE_INTERNAL, @{$layer->fill_surfaces};
# for each possible depth, look for intersections with the lower layer # for each possible depth, look for intersections with the lower layer
# we do this from the greater depth to the smaller # we do this from the greater depth to the smaller
@ -407,14 +408,14 @@ sub infill_every_layers {
my $lower_layer = $self->layer($i - 1); my $lower_layer = $self->layer($i - 1);
# select surfaces of the lower layer having the depth we're looking for # select surfaces of the lower layer having the depth we're looking for
my @lower_surfaces = grep $_->depth_layers == $d && $_->surface_type eq 'internal', my @lower_surfaces = grep $_->depth_layers == $d && $_->surface_type == S_TYPE_INTERNAL,
@{$lower_layer->fill_surfaces}; @{$lower_layer->fill_surfaces};
next if !@lower_surfaces; next if !@lower_surfaces;
# calculate intersection between our surfaces and theirs # calculate intersection between our surfaces and theirs
my $intersection = intersection_ex( my $intersection = intersection_ex(
[ map $_->p, grep $_->depth_layers <= $d, @lower_surfaces ], [ map $_->p, grep $_->depth_layers <= $d, @lower_surfaces ],
[ map $_->p, grep $_->surface_type eq 'internal', @{$layer->fill_surfaces} ], [ map $_->p, grep $_->surface_type == S_TYPE_INTERNAL, @{$layer->fill_surfaces} ],
undef, 1, undef, 1,
); );
@ -428,19 +429,19 @@ sub infill_every_layers {
# - any internal surface not belonging to the intersection (with its original depth) # - any internal surface not belonging to the intersection (with its original depth)
{ {
my @new_surfaces = (); my @new_surfaces = ();
push @new_surfaces, grep $_->surface_type ne 'internal', @{$layer->fill_surfaces}; push @new_surfaces, grep $_->surface_type != S_TYPE_INTERNAL, @{$layer->fill_surfaces};
push @new_surfaces, map Slic3r::Surface->new push @new_surfaces, map Slic3r::Surface->new
(expolygon => $_, surface_type => 'internal', depth_layers => $d + 1), @$intersection; (expolygon => $_, surface_type => S_TYPE_INTERNAL, depth_layers => $d + 1), @$intersection;
foreach my $depth (reverse $d..$Slic3r::infill_every_layers) { foreach my $depth (reverse $d..$Slic3r::infill_every_layers) {
push @new_surfaces, map Slic3r::Surface->new push @new_surfaces, map Slic3r::Surface->new
(expolygon => $_, surface_type => 'internal', depth_layers => $depth), (expolygon => $_, surface_type => S_TYPE_INTERNAL, depth_layers => $depth),
# difference between our internal layers with depth == $depth # difference between our internal layers with depth == $depth
# and the intersection found # and the intersection found
@{diff_ex( @{diff_ex(
[ [
map $_->p, grep $_->surface_type eq 'internal' && $_->depth_layers == $depth, map $_->p, grep $_->surface_type == S_TYPE_INTERNAL && $_->depth_layers == $depth,
@{$layer->fill_surfaces}, @{$layer->fill_surfaces},
], ],
[ map @$_, @$intersection ], [ map @$_, @$intersection ],
@ -453,16 +454,16 @@ sub infill_every_layers {
# now we remove the intersections from lower layer # now we remove the intersections from lower layer
{ {
my @new_surfaces = (); my @new_surfaces = ();
push @new_surfaces, grep $_->surface_type ne 'internal', @{$lower_layer->fill_surfaces}; push @new_surfaces, grep $_->surface_type != S_TYPE_INTERNAL, @{$lower_layer->fill_surfaces};
foreach my $depth (1..$Slic3r::infill_every_layers) { foreach my $depth (1..$Slic3r::infill_every_layers) {
push @new_surfaces, map Slic3r::Surface->new push @new_surfaces, map Slic3r::Surface->new
(expolygon => $_, surface_type => 'internal', depth_layers => $depth), (expolygon => $_, surface_type => S_TYPE_INTERNAL, depth_layers => $depth),
# difference between internal layers with depth == $depth # difference between internal layers with depth == $depth
# and the intersection found # and the intersection found
@{diff_ex( @{diff_ex(
[ [
map $_->p, grep $_->surface_type eq 'internal' && $_->depth_layers == $depth, map $_->p, grep $_->surface_type == S_TYPE_INTERNAL && $_->depth_layers == $depth,
@{$lower_layer->fill_surfaces}, @{$lower_layer->fill_surfaces},
], ],
[ map @$_, @$intersection ], [ map @$_, @$intersection ],
@ -506,12 +507,12 @@ sub generate_support_material {
# better build support material for bridges too rather than ignoring # better build support material for bridges too rather than ignoring
# those parts. a visibility check algorithm is needed. # those parts. a visibility check algorithm is needed.
# @a = @{diff_ex( # @a = @{diff_ex(
# [ map $_->p, grep $_->surface_type eq 'bottom', @{$layer->slices} ], # [ map $_->p, grep $_->surface_type == S_TYPE_BOTTOM, @{$layer->slices} ],
# [ map @$_, map $_->expolygon->offset_ex(scale $Slic3r::flow_spacing * $Slic3r::perimeters), # [ map @$_, map $_->expolygon->offset_ex(scale $Slic3r::flow_spacing * $Slic3r::perimeters),
# grep $_->surface_type eq 'bottom' && defined $_->bridge_angle, # grep $_->surface_type == S_TYPE_BOTTOM && defined $_->bridge_angle,
# @{$layer->fill_surfaces} ], # @{$layer->fill_surfaces} ],
# )}; # )};
@a = map $_->expolygon->clone, grep $_->surface_type eq 'bottom', @{$layer->slices}; @a = map $_->expolygon->clone, grep $_->surface_type == S_TYPE_BOTTOM, @{$layer->slices};
$_->simplify(scale $Slic3r::flow_spacing * 3) for @a; $_->simplify(scale $Slic3r::flow_spacing * 3) for @a;
push @unsupported_expolygons, @a; push @unsupported_expolygons, @a;

14
lib/Slic3r/Surface.pm
View File

@ -2,12 +2,22 @@ package Slic3r::Surface;
use strict; use strict;
use warnings; use warnings;
require Exporter;
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(S_TYPE_TOP S_TYPE_BOTTOM S_TYPE_INTERNAL S_TYPE_INTERNALSOLID);
our %EXPORT_TAGS = (types => \@EXPORT_OK);
use constant S_EXPOLYGON => 0; use constant S_EXPOLYGON => 0;
use constant S_SURFACE_TYPE => 1; use constant S_SURFACE_TYPE => 1;
use constant S_DEPTH_LAYERS => 2; use constant S_DEPTH_LAYERS => 2;
use constant S_BRIDGE_ANGLE => 3; use constant S_BRIDGE_ANGLE => 3;
use constant S_ADDITIONAL_INNER_PERIMETERS => 4; use constant S_ADDITIONAL_INNER_PERIMETERS => 4;
use constant S_TYPE_TOP => 0;
use constant S_TYPE_BOTTOM => 1;
use constant S_TYPE_INTERNAL => 2;
use constant S_TYPE_INTERNALSOLID => 3;
sub new { sub new {
my $class = shift; my $class = shift;
my %args = @_; my %args = @_;
@ -22,7 +32,7 @@ sub new {
} }
sub expolygon { $_[0][S_EXPOLYGON] } sub expolygon { $_[0][S_EXPOLYGON] }
sub surface_type { $_[0][S_SURFACE_TYPE] = $_[1] if $_[1]; $_[0][S_SURFACE_TYPE] } sub surface_type { $_[0][S_SURFACE_TYPE] = $_[1] if defined $_[1]; $_[0][S_SURFACE_TYPE] }
sub depth_layers { $_[0][S_DEPTH_LAYERS] } # this integer represents the thickness of the surface expressed in layers sub depth_layers { $_[0][S_DEPTH_LAYERS] } # this integer represents the thickness of the surface expressed in layers
sub bridge_angle { $_[0][S_BRIDGE_ANGLE] } sub bridge_angle { $_[0][S_BRIDGE_ANGLE] }
sub additional_inner_perimeters { $_[0][S_ADDITIONAL_INNER_PERIMETERS] = $_[1] if $_[1]; $_[0][S_ADDITIONAL_INNER_PERIMETERS] } sub additional_inner_perimeters { $_[0][S_ADDITIONAL_INNER_PERIMETERS] = $_[1] if $_[1]; $_[0][S_ADDITIONAL_INNER_PERIMETERS] }
@ -41,7 +51,7 @@ sub group {
my %unique_types = (); my %unique_types = ();
foreach my $surface (@surfaces) { foreach my $surface (@surfaces) {
my $type = ($params->{merge_solid} && $surface->surface_type =~ /top|bottom|solid/) my $type = ($params->{merge_solid} && grep { $surface->surface_type == $_ } S_TYPE_TOP, S_TYPE_BOTTOM, S_TYPE_INTERNALSOLID)
? 'solid' ? 'solid'
: $surface->surface_type; : $surface->surface_type;
$type .= "_" . ($surface->bridge_angle // ''); #/ $type .= "_" . ($surface->bridge_angle // ''); #/