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

Fix for rotation text object by draging angle input(in advance).

Browse source
This commit is contained in:
Filip Sykala - NTB T15p 2023-04-17 11:05:34 +02:00
parent fb6dd330c2
commit ed911260ee
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View file

@ -359,6 +359,16 @@ bool GLGizmoEmboss::init_create(ModelVolumeType volume_type)
return true; return true;
} }
namespace {
TransformationType get_transformation_type(const Selection &selection)
{
assert(selection.is_single_full_object() || selection.is_single_volume());
return selection.is_single_volume() ?
TransformationType::Local_Relative_Joint :
TransformationType::Instance_Relative_Joint; // object
}
} // namespace
bool GLGizmoEmboss::on_mouse_for_rotation(const wxMouseEvent &mouse_event) bool GLGizmoEmboss::on_mouse_for_rotation(const wxMouseEvent &mouse_event)
{ {
if (mouse_event.Moving()) return false; if (mouse_event.Moving()) return false;
@ -378,9 +388,8 @@ bool GLGizmoEmboss::on_mouse_for_rotation(const wxMouseEvent &mouse_event)
angle -= PI / 2; // Grabber is upward angle -= PI / 2; // Grabber is upward
// temporary rotation // temporary rotation
const TransformationType transformation_type = m_parent.get_selection().is_single_text() ? Selection& selection = m_parent.get_selection();
TransformationType::Local_Relative_Joint : TransformationType::World_Relative_Joint; selection.rotate(Vec3d(0., 0., angle), get_transformation_type(selection));
m_parent.get_selection().rotate(Vec3d(0., 0., angle), transformation_type);
angle += *m_rotate_start_angle; angle += *m_rotate_start_angle;
// move to range <-M_PI, M_PI> // move to range <-M_PI, M_PI>
@ -2880,8 +2889,7 @@ void GLGizmoEmboss::do_rotate(float relative_z_angle)
Selection &selection = m_parent.get_selection(); Selection &selection = m_parent.get_selection();
assert(!selection.is_empty()); assert(!selection.is_empty());
selection.setup_cache(); selection.setup_cache();
TransformationType transformation_type = TransformationType::Local_Relative_Joint; selection.rotate(Vec3d(0., 0., relative_z_angle), get_transformation_type(selection));
selection.rotate(Vec3d(0., 0., relative_z_angle), transformation_type);
std::string snapshot_name; // empty meand no store undo / redo std::string snapshot_name; // empty meand no store undo / redo
// NOTE: it use L instead of _L macro because prefix _ is appended // NOTE: it use L instead of _L macro because prefix _ is appended