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

Ported Layer::merge_slices() to XS

Browse Source
This commit is contained in:
Alessandro Ranellucci 2015-04-16 20:44:55 +02:00
parent 1f8ef2a63c
commit be2f46ca68
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Slic3r/Layer.pm
View File

@ -32,11 +32,6 @@ sub regions {
return [ map $self->get_region($_), 0..($self->region_count-1) ]; return [ map $self->get_region($_), 0..($self->region_count-1) ];
} }
sub merge_slices {
my ($self) = @_;
$_->merge_slices for @{$self->regions};
}
sub make_perimeters { sub make_perimeters {
my $self = shift; my $self = shift;
Slic3r::debugf "Making perimeters for layer %d\n", $self->id; Slic3r::debugf "Making perimeters for layer %d\n", $self->id;

8
xs/src/libslic3r/Layer.cpp
View File

@ -126,6 +126,14 @@ Layer::make_slices()
} }
} }
void
Layer::merge_slices()
{
FOREACH_LAYERREGION(this, layerm) {
(*layerm)->merge_slices();
}
}
template <class T> template <class T>
bool bool
Layer::any_internal_region_slice_contains(const T &item) const Layer::any_internal_region_slice_contains(const T &item) const

1
xs/src/libslic3r/Layer.hpp
View File

@ -95,6 +95,7 @@ class Layer {
LayerRegion* add_region(PrintRegion* print_region); LayerRegion* add_region(PrintRegion* print_region);
void make_slices(); void make_slices();
void merge_slices();
template <class T> bool any_internal_region_slice_contains(const T &item) const; template <class T> bool any_internal_region_slice_contains(const T &item) const;
template <class T> bool any_bottom_region_slice_contains(const T &item) const; template <class T> bool any_bottom_region_slice_contains(const T &item) const;

1
xs/xsp/Layer.xsp
View File

@ -71,6 +71,7 @@
%code%{ RETVAL = (int)(intptr_t)THIS; %}; %code%{ RETVAL = (int)(intptr_t)THIS; %};
void make_slices(); void make_slices();
void merge_slices();
bool any_internal_region_slice_contains_polyline(Polyline* polyline) bool any_internal_region_slice_contains_polyline(Polyline* polyline)
%code%{ RETVAL = THIS->any_internal_region_slice_contains(*polyline); %}; %code%{ RETVAL = THIS->any_internal_region_slice_contains(*polyline); %};
bool any_bottom_region_slice_contains_polyline(Polyline* polyline) bool any_bottom_region_slice_contains_polyline(Polyline* polyline)