MMU segmentation refactoring: Most of the MMU segmentation code
was extracted to its own file.
This commit is contained in:
parent
bf1fc7d436
commit
4f950343c8
5 changed files with 1520 additions and 1490 deletions
|
@ -128,6 +128,8 @@ add_library(libslic3r STATIC
|
||||||
Model.hpp
|
Model.hpp
|
||||||
ModelArrange.hpp
|
ModelArrange.hpp
|
||||||
ModelArrange.cpp
|
ModelArrange.cpp
|
||||||
|
MultiMaterialSegmentation.cpp
|
||||||
|
MultiMaterialSegmentation.hpp
|
||||||
CustomGCode.cpp
|
CustomGCode.cpp
|
||||||
CustomGCode.hpp
|
CustomGCode.hpp
|
||||||
Arrange.hpp
|
Arrange.hpp
|
||||||
|
|
1498
src/libslic3r/MultiMaterialSegmentation.cpp
Normal file
1498
src/libslic3r/MultiMaterialSegmentation.cpp
Normal file
File diff suppressed because it is too large
Load diff
18
src/libslic3r/MultiMaterialSegmentation.hpp
Normal file
18
src/libslic3r/MultiMaterialSegmentation.hpp
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
#ifndef slic3r_MultiMaterialSegmentation_hpp_
|
||||||
|
#define slic3r_MultiMaterialSegmentation_hpp_
|
||||||
|
|
||||||
|
#include <utility>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace Slic3r {
|
||||||
|
|
||||||
|
|
||||||
|
class PrintObject;
|
||||||
|
class ExPolygon;
|
||||||
|
|
||||||
|
// Returns MMU segmentation based on painting in MMU segmentation gizmo
|
||||||
|
std::vector<std::vector<std::pair<ExPolygon, size_t>>> multi_material_segmentation_by_painting(const PrintObject &print_object);
|
||||||
|
|
||||||
|
} // namespace Slic3r
|
||||||
|
|
||||||
|
#endif // slic3r_MultiMaterialSegmentation_hpp_
|
|
@ -240,11 +240,6 @@ public:
|
||||||
// Helpers to project custom facets on slices
|
// Helpers to project custom facets on slices
|
||||||
void project_and_append_custom_facets(bool seam, EnforcerBlockerType type, std::vector<ExPolygons>& expolys) const;
|
void project_and_append_custom_facets(bool seam, EnforcerBlockerType type, std::vector<ExPolygons>& expolys) const;
|
||||||
|
|
||||||
// Returns MMU segmentation based on painting in MMU segmentation gizmo
|
|
||||||
std::vector<std::vector<std::pair<ExPolygon, size_t>>> mmu_segmentation_by_painting();
|
|
||||||
// Returns MMU segmentation of top and bottom layers based on painting in MMU segmentation gizmo
|
|
||||||
std::vector<std::vector<ExPolygons>> mmu_segmentation_top_and_bottom_layers();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// to be called from Print only.
|
// to be called from Print only.
|
||||||
friend class Print;
|
friend class Print;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue