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

Tech ENABLE_WORLD_COORDINATE - Fixes in Gizmo Move behavior

Browse Source
This commit is contained in:
enricoturri1966 2021-10-13 09:03:35 +02:00
parent b350a1d942
commit d9b3386d08
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
View File

@ -73,14 +73,21 @@ void GLGizmoMove3D::on_start_dragging()
{ {
if (m_hover_id != -1) { if (m_hover_id != -1) {
m_displacement = Vec3d::Zero(); m_displacement = Vec3d::Zero();
const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box();
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
const Vec3d center = box.center(); const BoundingBoxf3 box = get_selection_box();
Vec3d center;
if (wxGetApp().obj_manipul()->get_world_coordinates())
center = box.center();
else {
const Selection& selection = m_parent.get_selection();
center = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix() * box.center();
}
m_starting_drag_position = center + m_grabbers[m_hover_id].center; m_starting_drag_position = center + m_grabbers[m_hover_id].center;
m_starting_box_center = center; m_starting_box_center = center;
m_starting_box_bottom_center = center; m_starting_box_bottom_center = center;
m_starting_box_bottom_center.z() = box.min.z(); m_starting_box_bottom_center.z() = box.min.z();
#else #else
const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box();
m_starting_drag_position = m_grabbers[m_hover_id].center; m_starting_drag_position = m_grabbers[m_hover_id].center;
m_starting_box_center = box.center(); m_starting_box_center = box.center();
m_starting_box_bottom_center = box.center(); m_starting_box_bottom_center = box.center();
@ -109,22 +116,12 @@ void GLGizmoMove3D::on_render()
glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));
const Selection& selection = m_parent.get_selection();
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
BoundingBoxf3 box;
if (wxGetApp().obj_manipul()->get_world_coordinates())
box = selection.get_bounding_box();
else {
const Selection::IndicesList& ids = selection.get_volume_idxs();
for (unsigned int id : ids) {
const GLVolume* v = selection.get_volume(id);
box.merge(v->transformed_convex_hull_bounding_box(v->get_volume_transformation().get_matrix()));
}
}
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
transform_to_local(selection); transform_to_local(m_parent.get_selection());
const Vec3d zero = Vec3d::Zero(); const Vec3d zero = Vec3d::Zero();
BoundingBoxf3 box = get_selection_box();
const Vec3d half_box_size = 0.5 * box.size(); const Vec3d half_box_size = 0.5 * box.size();
// x axis // x axis
@ -139,6 +136,7 @@ void GLGizmoMove3D::on_render()
m_grabbers[2].center = { 0.0, 0.0, half_box_size.z() + Offset }; m_grabbers[2].center = { 0.0, 0.0, half_box_size.z() + Offset };
m_grabbers[2].color = AXES_COLOR[2]; m_grabbers[2].color = AXES_COLOR[2];
#else #else
const Selection& selection = m_parent.get_selection();
const BoundingBoxf3& box = selection.get_bounding_box(); const BoundingBoxf3& box = selection.get_bounding_box();
const Vec3d& center = box.center(); const Vec3d& center = box.center();
@ -215,10 +213,9 @@ void GLGizmoMove3D::on_render_for_picking()
glsafe(::glDisable(GL_DEPTH_TEST)); glsafe(::glDisable(GL_DEPTH_TEST));
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
const Selection& selection = m_parent.get_selection();
const BoundingBoxf3& box = selection.get_bounding_box();
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
transform_to_local(selection); transform_to_local(m_parent.get_selection());
const BoundingBoxf3 box = get_selection_box();
#else #else
const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box(); const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box();
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
@ -310,6 +307,22 @@ void GLGizmoMove3D::transform_to_local(const Selection& selection) const
glsafe(::glMultMatrixd(orient_matrix.data())); glsafe(::glMultMatrixd(orient_matrix.data()));
} }
} }
BoundingBoxf3 GLGizmoMove3D::get_selection_box()
{
const Selection& selection = m_parent.get_selection();
BoundingBoxf3 box;
if (wxGetApp().obj_manipul()->get_world_coordinates())
box = selection.get_bounding_box();
else {
const Selection::IndicesList& ids = selection.get_volume_idxs();
for (unsigned int id : ids) {
const GLVolume* v = selection.get_volume(id);
box.merge(v->transformed_convex_hull_bounding_box(v->get_volume_transformation().get_matrix()));
}
}
return box;
}
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE

1
src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
View File

@ -44,6 +44,7 @@ private:
void render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const; void render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const;
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
void transform_to_local(const Selection& selection) const; void transform_to_local(const Selection& selection) const;
BoundingBoxf3 get_selection_box();
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
}; };