3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-22 16:21:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed one more case where only_retract_when_crossing_perimeters didn't apply. #2498

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-01-06 11:29:34 +01:00
parent 0f7933c4f9
commit 7e82159620
6 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -94,6 +94,7 @@ class Layer {
void make_slices();
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_internal_region_fill_surface_contains(const T &item) const;
protected:

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

@ -80,6 +80,17 @@ SurfaceCollection::any_internal_contains(const T &item) const
template bool SurfaceCollection::any_internal_contains<Line>(const Line &item) const;
template bool SurfaceCollection::any_internal_contains<Polyline>(const Polyline &item) const;
template <class T>
bool
SurfaceCollection::any_bottom_contains(const T &item) const
{
for (Surfaces::const_iterator surface = this->surfaces.begin(); surface != this->surfaces.end(); ++surface) {
if (surface->is_bottom() && surface->expolygon.contains(item)) return true;
}
return false;
}
template bool SurfaceCollection::any_bottom_contains<Line>(const Line &item) const;
SurfacesPtr
SurfaceCollection::filter_by_type(SurfaceType type)
{

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

@ -16,6 +16,7 @@ class SurfaceCollection
void simplify(double tolerance);
void group(std::vector<SurfacesPtr> *retval);
template <class T> bool any_internal_contains(const T &item) const;
template <class T> bool any_bottom_contains(const T &item) const;
SurfacesPtr filter_by_type(SurfaceType type);
void filter_by_type(SurfaceType type, Polygons* polygons);
};