juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-01 17:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the travel/retract/avoid_crossing_perimeters logic. Several edge cases are now handled correctly. #2498

Browse Source
This commit is contained in:
Alessandro Ranellucci
2015-01-06 14:47:53 +01:00
parent 7e82159620
commit 2562070232
6 changed files with 98 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,7 @@ Layer::any_internal_region_slice_contains(const T &item) const
}
return false;
}
template bool Layer::any_internal_region_slice_contains<Line>(const Line &item) const;
template bool Layer::any_internal_region_slice_contains<Polyline>(const Polyline &item) const;
template <class T>
bool
@@ -140,20 +140,7 @@ Layer::any_bottom_region_slice_contains(const T &item) const
}
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
{
FOREACH_LAYERREGION(this, layerm) {
if ((*layerm)->fill_surfaces.any_internal_contains(item)) return true;
}
return false;
}
template bool Layer::any_internal_region_fill_surface_contains<Line>(const Line &item) const;
template bool Layer::any_internal_region_fill_surface_contains<Polyline>(const Polyline &item) const;
template bool Layer::any_bottom_region_slice_contains<Polyline>(const Polyline &item) const;
#ifdef SLIC3RXS
REGISTER_CLASS(Layer, "Layer");

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

@@ -95,8 +95,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:
int _id; // sequential number of layer, 0-based
PrintObject *_object;

3
xs/src/libslic3r/SurfaceCollection.cpp
View File

@@ -77,7 +77,6 @@ SurfaceCollection::any_internal_contains(const T &item) const
}
return false;
}
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>
@@ -89,7 +88,7 @@ SurfaceCollection::any_bottom_contains(const T &item) const
}
return false;
}
template bool SurfaceCollection::any_bottom_contains<Line>(const Line &item) const;
template bool SurfaceCollection::any_bottom_contains<Polyline>(const Polyline &item) const;
SurfacesPtr
SurfaceCollection::filter_by_type(SurfaceType type)