amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed print object below bed, fixed associated unit tests.

Browse source
This commit is contained in:
bubnikv 2018-11-01 14:25:37 +01:00
parent da37094a09
commit 66c2f28dcb
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libslic3r/Print.cpp
View file

@ -410,8 +410,17 @@ void Print::add_model_object(ModelObject* model_object, int idx)
this->invalidate_all_steps(); this->invalidate_all_steps();
// Set the transformation matrix without translation from the first instance. // Set the transformation matrix without translation from the first instance.
if (! model_object->instances.empty()) if (! model_object->instances.empty()) {
object->set_trafo(model_object->instances.front()->world_matrix(true)); // Trafo and bounding box, both in world coordinate system.
Transform3d trafo = model_object->instances.front()->world_matrix();
BoundingBoxf3 bbox = model_object->instance_bounding_box(0);
// Now shift the object up to align it with the print bed.
trafo.data()[14] -= bbox.min(2);
// and reset the XY translation.
trafo.data()[12] = 0;
trafo.data()[13] = 0;
object->set_trafo(trafo);
}
size_t volume_id = 0; size_t volume_id = 0;
for (const ModelVolume *volume : model_object->volumes) { for (const ModelVolume *volume : model_object->volumes) {
@ -688,9 +697,9 @@ static std::vector<PrintInstances> print_objects_from_model_object(const ModelOb
if (model_instance->is_printable()) { if (model_instance->is_printable()) {
trafo.trafo = model_instance->world_matrix(); trafo.trafo = model_instance->world_matrix();
// Set the Z axis of the transformation. // Set the Z axis of the transformation.
trafo.copies.front() = Point::new_scale(trafo.trafo.data()[3], trafo.trafo.data()[7]); trafo.copies.front() = Point::new_scale(trafo.trafo.data()[12], trafo.trafo.data()[13]);
trafo.trafo.data()[3] = 0; trafo.trafo.data()[12] = 0;
trafo.trafo.data()[7] = 0; trafo.trafo.data()[13] = 0;
auto it = trafos.find(trafo); auto it = trafos.find(trafo);
if (it == trafos.end()) if (it == trafos.end())
trafos.emplace(trafo); trafos.emplace(trafo);