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

Fix drag and drop rotation gizmo for embossed SVG to approximate rotation

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-09-14 20:07:10 +02:00
parent 6c106212cb
commit e87b416ebc
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
View File

@ -247,36 +247,22 @@ bool GLGizmoSVG::on_mouse_for_rotation(const wxMouseEvent &mouse_event)
double angle = m_rotate_gizmo.get_angle(); double angle = m_rotate_gizmo.get_angle();
angle -= PI / 2; // Grabber is upward angle -= PI / 2; // Grabber is upward
// temporary rotation double new_angle = angle + *m_rotate_start_angle;
// move to range <-M_PI, M_PI>
Geometry::to_range_pi_pi(new_angle);
double z_rotation = m_volume->emboss_shape->fix_3mf_tr.has_value()?
(new_angle - m_angle.value_or(0.f)) : // relative angle
angle; // relativity is keep by selection cache
Selection &selection = m_parent.get_selection(); Selection &selection = m_parent.get_selection();
auto selection_rotate_fnc = [&angle, &selection](){ auto selection_rotate_fnc = [z_rotation, &selection]() {
selection.rotate(Vec3d(0., 0., angle), get_transformation_type(selection)); selection.rotate(Vec3d(0., 0., z_rotation), get_transformation_type(selection));
}; };
selection_transform(selection, selection_rotate_fnc, m_volume); selection_transform(selection, selection_rotate_fnc, m_volume);
angle += *m_rotate_start_angle;
// move to range <-M_PI, M_PI>
Geometry::to_range_pi_pi(angle);
//{ // Slow alternative to valid rotation
// Selection &selection = m_parent.get_selection();
// selection.setup_cache();
// double diff_angle = angle - m_angle.value_or(0.f);
// auto selection_rotate_fnc = [&selection, &diff_angle]() {
// TransformationType transformation_type = selection.is_single_volume() ?
// TransformationType::Local_Relative_Joint :
// TransformationType::Instance_Relative_Joint;
// selection.rotate(Vec3d(0., 0., diff_angle), transformation_type);
// };
// selection_transform(selection, selection_rotate_fnc, m_volume);
// std::string snapshot_name; // empty meand no store undo / redo
// m_parent.do_rotate(snapshot_name);
//}
// propagate angle into property // propagate angle into property
m_angle = static_cast<float>(angle); m_angle = static_cast<float>(new_angle);
// do not store zero // do not store zero
if (is_approx(*m_angle, 0.f)) if (is_approx(*m_angle, 0.f))

2
src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp
View File

@ -22,8 +22,6 @@
#include <GL/glew.h> #include <GL/glew.h>
namespace Slic3r{ namespace Slic3r{
//class AppConfig;
class GLVolume;
class ModelVolume; class ModelVolume;
enum class ModelVolumeType : int; enum class ModelVolumeType : int;
} }