diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2019-04-29 15:32:02 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2019-05-06 09:14:45 +0300 |
| commit | e9a53e49dba0c10aebad555cedb86d9be405ffd3 (patch) | |
| tree | 4bf9ec9e2b609a6af23785d900bfb254094fac91 /src/libslic3r/ModelArrange.hpp | |
| parent | 5f226c5d7fcb7c019604dde1da1e792986515e96 (diff) | |
Arrange is accounting for the wipe tower now
Diffstat (limited to 'src/libslic3r/ModelArrange.hpp')
| -rw-r--r-- | src/libslic3r/ModelArrange.hpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/libslic3r/ModelArrange.hpp b/src/libslic3r/ModelArrange.hpp index d76769081..b61443da0 100644 --- a/src/libslic3r/ModelArrange.hpp +++ b/src/libslic3r/ModelArrange.hpp @@ -40,6 +40,13 @@ struct BedShapeHint { BedShapeHint bedShape(const Polyline& bed); +struct WipeTowerInfo { + bool is_wipe_tower = false; + Vec2d pos; + Vec2d bb_size; + double rotation; +}; + /** * \brief Arranges the model objects on the screen. * @@ -66,7 +73,9 @@ BedShapeHint bedShape(const Polyline& bed); * packed. The unsigned argument is the number of items remaining to pack. * \param stopcondition A predicate returning true if abort is needed. */ -bool arrange(Model &model, coord_t min_obj_distance, +bool arrange(Model &model, + WipeTowerInfo& wipe_tower_info, + coord_t min_obj_distance, const Slic3r::Polyline& bed, BedShapeHint bedhint, bool first_bin_only, @@ -78,7 +87,8 @@ bool arrange(Model &model, coord_t min_obj_distance, void find_new_position(const Model& model, ModelInstancePtrs instances_to_add, coord_t min_obj_distance, - const Slic3r::Polyline& bed); + const Slic3r::Polyline& bed, + WipeTowerInfo& wti); } // arr } // Slic3r |