3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 18:27:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

One more retraction optimization

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-12-25 11:37:54 +01:00
parent 70f454c693
commit 5a0f4eac8d
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/Slic3r/GCode.pm
View file

@ -341,14 +341,17 @@ sub travel_to {
# Skip retraction at all in the following cases: # Skip retraction at all in the following cases:
# - travel length is shorter than the configured threshold # - travel length is shorter than the configured threshold
# - user has enabled "Only retract when crossing perimeters" and the travel move is # - user has enabled "Only retract when crossing perimeters" and the travel move is
# contained in a single island of the current layer *and* a single island in the # contained in a single internal fill_surface (this includes the bottom layer when
# upper layer (so that ooze will not be visible) # bottom_solid_layers == 0) or in a single internal slice (this would exclude such
# bottom layer but preserve perimeter-to-infill moves in all the other layers)
# - the path that will be extruded after this travel move is a support material # - the path that will be extruded after this travel move is a support material
# extrusion and the travel move is contained in a single support material island # extrusion and the travel move is contained in a single support material island
if ($travel->length < scale $self->config->get_at('retract_before_travel', $self->writer->extruder->id) if ($travel->length < scale $self->config->get_at('retract_before_travel', $self->writer->extruder->id)
|| ($self->config->only_retract_when_crossing_perimeters || ($self->config->only_retract_when_crossing_perimeters
&& $self->config->fill_density > 0 && $self->config->fill_density > 0
&& defined($self->layer) && $self->layer->any_internal_region_fill_surface_contains_line($travel)) && defined($self->layer)
&& ($self->layer->any_internal_region_slice_contains_line($travel)
|| $self->layer->any_internal_region_fill_surface_contains_line($travel)))
|| (defined $role && $role == EXTR_ROLE_SUPPORTMATERIAL && $self->layer->support_islands->contains_line($travel)) || (defined $role && $role == EXTR_ROLE_SUPPORTMATERIAL && $self->layer->support_islands->contains_line($travel))
) { ) {
# Just perform a straight travel move without any retraction. # Just perform a straight travel move without any retraction.

11
xs/src/libslic3r/Layer.cpp
View file

@ -120,6 +120,17 @@ Layer::make_slices()
} }
} }
template <class T>
bool
Layer::any_internal_region_slice_contains(const T &item) const
{
FOREACH_LAYERREGION(this, layerm) {
if ((*layerm)->slices.any_internal_contains(item)) return true;
}
return false;
}
template bool Layer::any_internal_region_slice_contains<Line>(const Line &item) const;
template <class T> template <class T>
bool bool
Layer::any_internal_region_fill_surface_contains(const T &item) const Layer::any_internal_region_fill_surface_contains(const T &item) const

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

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

4
xs/xsp/Layer.xsp
View file

@ -69,6 +69,8 @@
%code%{ RETVAL = (int)(intptr_t)THIS; %}; %code%{ RETVAL = (int)(intptr_t)THIS; %};
void make_slices(); void make_slices();
bool any_internal_region_slice_contains_line(Line* line)
%code%{ RETVAL = THIS->any_internal_region_slice_contains(*line); %};
bool any_internal_region_fill_surface_contains_line(Line* line) bool any_internal_region_fill_surface_contains_line(Line* line)
%code%{ RETVAL = THIS->any_internal_region_fill_surface_contains(*line); %}; %code%{ RETVAL = THIS->any_internal_region_fill_surface_contains(*line); %};
bool any_internal_region_fill_surface_contains_polyline(Polyline* polyline) bool any_internal_region_fill_surface_contains_polyline(Polyline* polyline)
@ -119,6 +121,8 @@
Ref<ExPolygonCollection> slices() Ref<ExPolygonCollection> slices()
%code%{ RETVAL = &THIS->slices; %}; %code%{ RETVAL = &THIS->slices; %};
bool any_internal_region_slice_contains_line(Line* line)
%code%{ RETVAL = THIS->any_internal_region_slice_contains(*line); %};
bool any_internal_region_fill_surface_contains_line(Line* line) bool any_internal_region_fill_surface_contains_line(Line* line)
%code%{ RETVAL = THIS->any_internal_region_fill_surface_contains(*line); %}; %code%{ RETVAL = THIS->any_internal_region_fill_surface_contains(*line); %};
bool any_internal_region_fill_surface_contains_polyline(Polyline* polyline) bool any_internal_region_fill_surface_contains_polyline(Polyline* polyline)