GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-21 17:24:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed position for adding text on torus with no surface point suggested(without mouse)

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-01-12 13:34:51 +01:00
parent af3984b356
commit 095ba5fbe8
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -264,23 +264,20 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type)
// soo create transfomation on border of object // soo create transfomation on border of object
// there is no point on surface so no use of surface will be applied // there is no point on surface so no use of surface will be applied
if (emboss_data.text_configuration.style.prop.use_surface) FontProp &prop = emboss_data.text_configuration.style.prop;
emboss_data.text_configuration.style.prop.use_surface = false; if (prop.use_surface)
prop.use_surface = false;
// Transformation is inspired add generic volumes in ObjectList::load_generic_subobject // Transformation is inspired add generic volumes in ObjectList::load_generic_subobject
const ModelObject *obj = objects[vol->object_idx()]; const ModelObject *obj = objects[vol->object_idx()];
BoundingBoxf3 instance_bb = obj->instance_bounding_box(vol->instance_idx()); BoundingBoxf3 instance_bb = obj->instance_bounding_box(vol->instance_idx());
// Translate the new modifier to be pickable: move to the left front corner of the instance's bounding box, lift to print bed. // Translate the new modifier to be pickable: move to the left front corner of the instance's bounding box, lift to print bed.
Vec3d offset(instance_bb.max.x(), instance_bb.min.y(), instance_bb.min.z());
// offset += 0.5 * mesh_bb.size(); // No size of text volume at this position
offset -= vol->get_instance_offset();
#if ENABLE_WORLD_COORDINATE
Transform3d tr = vol->get_instance_transformation().get_matrix_no_offset().inverse(); Transform3d tr = vol->get_instance_transformation().get_matrix_no_offset().inverse();
#else Vec3d offset_tr(0, // center of instance - Can't suggest width of text before it will be created
Transform3d tr = vol->get_instance_transformation().get_matrix(true).inverse(); - instance_bb.size().y() / 2 - prop.size_in_mm / 2, // under
#endif // ENABLE_WORLD_COORDINATE prop.emboss / 2 - instance_bb.size().z() / 2 // lay on bed
Vec3d offset_tr = tr * offset; );
Transform3d volume_trmat = tr.translate(offset_tr); Transform3d volume_trmat = tr * Eigen::Translation3d(offset_tr);
priv::start_create_volume_job(obj, volume_trmat, emboss_data, volume_type); priv::start_create_volume_job(obj, volume_trmat, emboss_data, volume_type);
} }
} }