3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPE-1744 - Fixed merge with mirrored objects

Browse Source
This commit is contained in:
enricoturri1966 2023-05-29 09:25:58 +02:00
parent 29282e206f
commit 32af0221f2
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -2306,38 +2306,18 @@ void ObjectList::merge(bool to_multipart_object)
for (int obj_idx : obj_idxs) { for (int obj_idx : obj_idxs) {
ModelObject* object = (*m_objects)[obj_idx]; ModelObject* object = (*m_objects)[obj_idx];
const Geometry::Transformation& transformation = object->instances[0]->get_transformation();
const Vec3d scale = transformation.get_scaling_factor();
const Vec3d mirror = transformation.get_mirror();
const Vec3d rotation = transformation.get_rotation();
if (object->id() == (*m_objects)[obj_idxs.front()]->id()) { if (object->id() == (*m_objects)[obj_idxs.front()]->id()) {
new_object->add_instance(); new_object->add_instance();
new_object->instances[0]->printable = false; new_object->instances[0]->printable = false;
} }
new_object->instances[0]->printable |= object->instances[0]->printable; new_object->instances[0]->printable |= object->instances[0]->printable;
const Transform3d& volume_offset_correction = transformation.get_matrix(); const Transform3d new_inst_trafo = new_object->instances[0]->get_matrix().inverse() * object->instances[0]->get_matrix();
// merge volumes // merge volumes
for (const ModelVolume* volume : object->volumes) { for (const ModelVolume* volume : object->volumes) {
ModelVolume* new_volume = new_object->add_volume(*volume); ModelVolume* new_volume = new_object->add_volume(*volume);
new_volume->set_transformation(new_inst_trafo * new_volume->get_matrix());
//set rotation
const Vec3d vol_rot = new_volume->get_rotation() + rotation;
new_volume->set_rotation(vol_rot);
// set scale
const Vec3d vol_sc_fact = new_volume->get_scaling_factor().cwiseProduct(scale);
new_volume->set_scaling_factor(vol_sc_fact);
// set mirror
const Vec3d vol_mirror = new_volume->get_mirror().cwiseProduct(mirror);
new_volume->set_mirror(vol_mirror);
// set offset
const Vec3d vol_offset = volume_offset_correction* new_volume->get_offset();
new_volume->set_offset(vol_offset);
} }
new_object->sort_volumes(wxGetApp().app_config->get_bool("order_volumes")); new_object->sort_volumes(wxGetApp().app_config->get_bool("order_volumes"));