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

FIX: the text shape is affected by instance transformation

Browse source 
Change-Id: If2222a24056bbc1636b5da586e6cc1950d8cdb5a
(cherry picked from commit 996d013c2e7f1bdbdc4afbac540f99a20b063cca)
This commit is contained in:
zhimin.zeng 2022-08-18 16:00:03 +08:00 • committed by Lane.Wei
parent d73142c2f9
commit 54012ba11b
2 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -1962,28 +1962,7 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode
wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_object((size_t)obj_idx); wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_object((size_t)obj_idx);
// apply the instance transform to all volumes and reset instance transform except the offset // apply the instance transform to all volumes and reset instance transform except the offset
{ apply_object_instance_transfrom_to_all_volumes(&model_object);
const Geometry::Transformation &instance_transformation = model_object.instances[0]->get_transformation();
Vec3d original_instance_center = instance_transformation.get_offset();
const Transform3d &transformation_matrix = instance_transformation.get_matrix();
for (ModelVolume *volume : model_object.volumes) {
const Transform3d &volume_matrix = volume->get_matrix();
Transform3d new_matrix = transformation_matrix * volume_matrix;
volume->set_transformation(new_matrix);
}
model_object.instances[0]->set_transformation(Geometry::Transformation());
model_object.ensure_on_bed();
// keep new instance center the same as the original center
model_object.translate(-original_instance_center);
model_object.origin_translation += original_instance_center;
model_object.translate_instances(model_object.origin_translation);
model_object.origin_translation = Vec3d::Zero();
// update the cache data in selection to keep the data of ModelVolume and GLVolume are consistent
wxGetApp().plater()->update();
}
selection_changed(); selection_changed();
@ -2086,6 +2065,10 @@ void ObjectList::load_mesh_part(const TriangleMesh& mesh, const wxString& name,
take_snapshot("Load Mesh Part"); take_snapshot("Load Mesh Part");
ModelObject* mo = (*m_objects)[obj_idx]; ModelObject* mo = (*m_objects)[obj_idx];
// apply the instance transform to all volumes and reset instance transform except the offset
apply_object_instance_transfrom_to_all_volumes(mo);
ModelVolume* mv = mo->add_volume(mesh); ModelVolume* mv = mo->add_volume(mesh);
mv->name = name.ToStdString(); mv->name = name.ToStdString();
@ -5045,5 +5028,28 @@ bool ObjectList::has_paint_on_segmentation()
return m_objects_model->HasInfoItem(InfoItemType::MmuSegmentation); return m_objects_model->HasInfoItem(InfoItemType::MmuSegmentation);
} }
void ObjectList::apply_object_instance_transfrom_to_all_volumes(ModelObject *model_object) {
const Geometry::Transformation &instance_transformation = model_object->instances[0]->get_transformation();
Vec3d original_instance_center = instance_transformation.get_offset();
const Transform3d &transformation_matrix = instance_transformation.get_matrix();
for (ModelVolume *volume : model_object->volumes) {
const Transform3d &volume_matrix = volume->get_matrix();
Transform3d new_matrix = transformation_matrix * volume_matrix;
volume->set_transformation(new_matrix);
}
model_object->instances[0]->set_transformation(Geometry::Transformation());
model_object->ensure_on_bed();
// keep new instance center the same as the original center
model_object->translate(-original_instance_center);
model_object->origin_translation += original_instance_center;
model_object->translate_instances(model_object->origin_translation);
model_object->origin_translation = Vec3d::Zero();
// update the cache data in selection to keep the data of ModelVolume and GLVolume are consistent
wxGetApp().plater()->update();
}
} //namespace GUI } //namespace GUI
} //namespace Slic3r } //namespace Slic3r

3
src/slic3r/GUI/GUI_ObjectList.hpp
View file

@ -452,6 +452,9 @@ private:
void OnEditingStarted(wxDataViewEvent &event); void OnEditingStarted(wxDataViewEvent &event);
void OnEditingDone(wxDataViewEvent &event); void OnEditingDone(wxDataViewEvent &event);
// apply the instance transform to all volumes and reset instance transform except the offset
void apply_object_instance_transfrom_to_all_volumes(ModelObject *model_object);
std::vector<int> m_columns_width; std::vector<int> m_columns_width;
}; };