3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Arrange is accounting for the wipe tower now

Browse source
This commit is contained in:
Lukas Matena 2019-04-29 14:32:02 +02:00
parent 5f226c5d7f
commit e9a53e49db
7 changed files with 114 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libslic3r/ModelArrange.hpp
View file

@ -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