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

Tech ENABLE_WORLD_COORDINATE - Fixed constrained scaling of instances in local coordinates

Browse Source
This commit is contained in:
enricoturri1966 2021-10-26 11:39:29 +02:00
parent b7568f6fef
commit 9ddf2ba41c
4 changed files with 72 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -765,11 +765,15 @@ void ObjectManipulation::update_reset_buttons_visibility()
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
double min_z = 0.0; double min_z = 0.0;
#if ENABLE_WORLD_COORDINATE //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
if (selection.is_single_full_instance() && m_world_coordinates) { //#if ENABLE_WORLD_COORDINATE
#else // if (selection.is_single_full_instance() && m_world_coordinates) {
//#else
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
if (selection.is_single_full_instance()) { if (selection.is_single_full_instance()) {
#endif // ENABLE_WORLD_COORDINATE //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
//#endif // ENABLE_WORLD_COORDINATE
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
rotation = volume->get_instance_rotation(); rotation = volume->get_instance_rotation();
scale = volume->get_instance_scaling_factor(); scale = volume->get_instance_scaling_factor();
min_z = selection.get_scaled_instance_bounding_box().min.z(); min_z = selection.get_scaled_instance_bounding_box().min.z();

86
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
View File

@ -91,17 +91,7 @@ void GLGizmoScale3D::on_start_dragging()
m_starting.drag_position = m_grabbers_transform * m_grabbers[m_hover_id].center; m_starting.drag_position = m_grabbers_transform * m_grabbers[m_hover_id].center;
m_starting.box = m_box; m_starting.box = m_box;
m_starting.center = m_center; m_starting.center = m_center;
m_starting.transform = wxGetApp().obj_manipul()->get_world_coordinates() ? Transform3d::Identity() : m_transform;
if (m_starting.ctrl_down) {
const Vec3d center = m_starting.box.center();
const Transform3d trafo = wxGetApp().obj_manipul()->get_world_coordinates() ? Transform3d::Identity() : m_transform;
m_starting.pivots[0] = trafo * Vec3d(m_starting.box.max.x(), center.y(), center.z());
m_starting.pivots[1] = trafo * Vec3d(m_starting.box.min.x(), center.y(), center.z());
m_starting.pivots[2] = trafo * Vec3d(center.x(), m_starting.box.max.y(), center.z());
m_starting.pivots[3] = trafo * Vec3d(center.x(), m_starting.box.min.y(), center.z());
m_starting.pivots[4] = trafo * Vec3d(center.x(), center.y(), m_starting.box.max.z());
m_starting.pivots[5] = trafo * Vec3d(center.x(), center.y(), m_starting.box.min.z());
}
#else #else
m_starting.drag_position = m_grabbers[m_hover_id].center; m_starting.drag_position = m_grabbers[m_hover_id].center;
m_starting.box = (m_starting.ctrl_down && m_hover_id < 6) ? m_box : m_parent.get_selection().get_bounding_box(); m_starting.box = (m_starting.ctrl_down && m_hover_id < 6) ? m_box : m_parent.get_selection().get_bounding_box();
@ -140,8 +130,8 @@ void GLGizmoScale3D::on_render()
m_transform = Transform3d::Identity(); m_transform = Transform3d::Identity();
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
m_grabbers_transform = Transform3d::Identity(); m_grabbers_transform = Transform3d::Identity();
bool world_coordinates = wxGetApp().obj_manipul()->get_world_coordinates();
if (selection.is_single_full_instance() && !wxGetApp().obj_manipul()->get_world_coordinates()) { if (selection.is_single_full_instance() && !world_coordinates) {
#else #else
// Transforms grabbers' offsets to world refefence system // Transforms grabbers' offsets to world refefence system
Transform3d offsets_transform = Transform3d::Identity(); Transform3d offsets_transform = Transform3d::Identity();
@ -149,25 +139,31 @@ void GLGizmoScale3D::on_render()
Vec3d angles = Vec3d::Zero(); Vec3d angles = Vec3d::Zero();
if (selection.is_single_full_instance()) { if (selection.is_single_full_instance()) {
#endif // !ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
// calculate bounding box in instance local reference system // calculate bounding box in instance local reference system
const Selection::IndicesList& idxs = selection.get_volume_idxs(); const Selection::IndicesList& idxs = selection.get_volume_idxs();
for (unsigned int idx : idxs) { for (unsigned int idx : idxs) {
const GLVolume* v = selection.get_volume(idx); const GLVolume* v = selection.get_volume(idx);
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
m_box.merge(v->transformed_convex_hull_bounding_box(v->get_instance_transformation().get_matrix(true, true, false, true) * v->get_volume_transformation().get_matrix())); m_box.merge(v->transformed_convex_hull_bounding_box(v->get_volume_transformation().get_matrix()));
#else #else
m_box.merge(v->transformed_convex_hull_bounding_box(v->get_volume_transformation().get_matrix())); m_box.merge(v->transformed_convex_hull_bounding_box(v->get_volume_transformation().get_matrix()));
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
} }
#if ENABLE_WORLD_COORDINATE
m_box = m_box.transformed(selection.get_volume(*idxs.begin())->get_instance_transformation().get_matrix(true, true, false, true));
#endif // ENABLE_WORLD_COORDINATE
// gets transform from first selected volume // gets transform from first selected volume
const GLVolume* v = selection.get_volume(*idxs.begin()); const GLVolume* v = selection.get_volume(*idxs.begin());
m_transform = v->get_instance_transformation().get_matrix();
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
m_grabbers_transform = v->get_instance_transformation().get_matrix(true, true, false, true); m_transform = v->get_instance_transformation().get_matrix(false, false, true);
m_grabbers_transform = v->get_instance_transformation().get_matrix(false, false, true) * Geometry::assemble_transform(m_box.center());
m_center = v->get_instance_offset();
#else #else
m_transform = v->get_instance_transformation().get_matrix();
// gets angles from first selected volume // gets angles from first selected volume
angles = v->get_instance_rotation(); angles = v->get_instance_rotation();
// consider rotation+mirror only components of the transform for offsets // consider rotation+mirror only components of the transform for offsets
@ -176,7 +172,7 @@ void GLGizmoScale3D::on_render()
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
} }
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
else if ((selection.is_single_modifier() || selection.is_single_volume()) && !wxGetApp().obj_manipul()->get_world_coordinates()) { else if ((selection.is_single_modifier() || selection.is_single_volume()) && !world_coordinates) {
#else #else
else if (selection.is_single_modifier() || selection.is_single_volume()) { else if (selection.is_single_modifier() || selection.is_single_volume()) {
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
@ -210,14 +206,14 @@ void GLGizmoScale3D::on_render()
Vec3d offset_x = offsets_transform * (Offset * Vec3d::UnitX()); Vec3d offset_x = offsets_transform * (Offset * Vec3d::UnitX());
Vec3d offset_y = offsets_transform * (Offset * Vec3d::UnitY()); Vec3d offset_y = offsets_transform * (Offset * Vec3d::UnitY());
Vec3d offset_z = offsets_transform * (Offset * Vec3d::UnitZ()); Vec3d offset_z = offsets_transform * (Offset * Vec3d::UnitZ());
#endif // ENABLE_WORLD_COORDINATE
bool ctrl_down = m_dragging && m_starting.ctrl_down || !m_dragging && wxGetKeyState(WXK_CONTROL); bool ctrl_down = m_dragging && m_starting.ctrl_down || !m_dragging && wxGetKeyState(WXK_CONTROL);
#endif // ENABLE_WORLD_COORDINATE
// x axis // x axis
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
const Vec3d box_half_size = 0.5 * m_box.size(); const Vec3d box_half_size = 0.5 * m_box.size();
bool use_constrain = ctrl_down && (selection.is_single_full_instance() || selection.is_single_volume() || selection.is_single_modifier()); bool use_constrain = wxGetKeyState(WXK_CONTROL) && (selection.is_single_full_instance() || selection.is_single_volume() || selection.is_single_modifier());
m_grabbers[0].center = { -(box_half_size.x() + Offset), 0.0, 0.0 }; m_grabbers[0].center = { -(box_half_size.x() + Offset), 0.0, 0.0 };
m_grabbers[0].color = (use_constrain && m_hover_id == 1) ? CONSTRAINED_COLOR : AXES_COLOR[0]; m_grabbers[0].color = (use_constrain && m_hover_id == 1) ? CONSTRAINED_COLOR : AXES_COLOR[0];
@ -452,10 +448,7 @@ void GLGizmoScale3D::do_scale_along_axis(Axis axis, const UpdateData& data)
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
if (m_starting.ctrl_down) { if (m_starting.ctrl_down) {
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
const double len_starting_vec = std::abs(m_starting.box.center()(axis) - m_starting.pivots[m_hover_id](axis)); double local_offset = 0.5 * (ratio - 1.0) * m_starting.box.size()(axis);
const double len_center_vec = std::abs(m_starting.center(axis) - m_starting.pivots[m_hover_id](axis));
const double inner_ratio = len_center_vec / len_starting_vec;
double local_offset = inner_ratio * 0.5 * (ratio - 1.0) * m_starting.box.size()(axis);
#else #else
double local_offset = 0.5 * (m_scale(axis) - m_starting.scale(axis)) * m_starting.box.size()(axis); double local_offset = 0.5 * (m_scale(axis) - m_starting.scale(axis)) * m_starting.box.size()(axis);
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
@ -463,6 +456,23 @@ void GLGizmoScale3D::do_scale_along_axis(Axis axis, const UpdateData& data)
if (m_hover_id == 2 * axis) if (m_hover_id == 2 * axis)
local_offset *= -1.0; local_offset *= -1.0;
#if ENABLE_WORLD_COORDINATE
Vec3d center_offset = m_starting.center - m_starting.transform * m_starting.box.center();
if (selection.is_single_full_instance() && !world_coordinates) {
const Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_rotation()).inverse();
center_offset = m * center_offset;
}
local_offset += (ratio - 1.0) * center_offset(axis);
switch (axis)
{
case X: { m_offset = local_offset * Vec3d::UnitX(); break; }
case Y: { m_offset = local_offset * Vec3d::UnitY(); break; }
case Z: { m_offset = local_offset * Vec3d::UnitZ(); break; }
default: { m_offset = Vec3d::Zero(); break; }
}
#else
Vec3d local_offset_vec; Vec3d local_offset_vec;
switch (axis) switch (axis)
{ {
@ -472,9 +482,6 @@ void GLGizmoScale3D::do_scale_along_axis(Axis axis, const UpdateData& data)
default: break; default: break;
} }
#if ENABLE_WORLD_COORDINATE
m_offset = local_offset_vec;
#else
m_offset = m_offsets_transform * local_offset_vec; m_offset = m_offsets_transform * local_offset_vec;
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
} }
@ -497,24 +504,33 @@ void GLGizmoScale3D::do_scale_uniform(const UpdateData& data)
if (m_hover_id == 6 || m_hover_id == 7) if (m_hover_id == 6 || m_hover_id == 7)
m_offset.y() *= -1.0; m_offset.y() *= -1.0;
m_offset += (ratio - 1.0) * (m_starting.center - m_starting.box.center()); const Selection& selection = m_parent.get_selection();
const bool world_coordinates = wxGetApp().obj_manipul()->get_world_coordinates();
Vec3d center_offset = m_starting.center - m_starting.transform * m_starting.box.center();
if (selection.is_single_full_instance() && !world_coordinates) {
const Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_rotation()).inverse();
center_offset = m * center_offset;
}
m_offset += (ratio - 1.0) * center_offset;
} }
else { else
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
m_offset = Vec3d::Zero(); m_offset = Vec3d::Zero();
#if ENABLE_WORLD_COORDINATE }
}
#endif // ENABLE_WORLD_COORDINATE
}
} }
double GLGizmoScale3D::calc_ratio(const UpdateData& data) const double GLGizmoScale3D::calc_ratio(const UpdateData& data) const
{ {
double ratio = 0.0; double ratio = 0.0;
#if ENABLE_WORLD_COORDINATE
const Vec3d starting_vec = m_starting.drag_position - m_starting.center;
#else
const Vec3d pivot = (m_starting.ctrl_down && m_hover_id < 6) ? m_starting.pivots[m_hover_id] : m_starting.box.center(); const Vec3d pivot = (m_starting.ctrl_down && m_hover_id < 6) ? m_starting.pivots[m_hover_id] : m_starting.box.center();
const Vec3d starting_vec = m_starting.drag_position - pivot; const Vec3d starting_vec = m_starting.drag_position - pivot;
#endif // ENABLE_WORLD_COORDINATE
const double len_starting_vec = starting_vec.norm(); const double len_starting_vec = starting_vec.norm();
if (len_starting_vec != 0.0) { if (len_starting_vec != 0.0) {

3
src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
View File

@ -19,9 +19,12 @@ class GLGizmoScale3D : public GLGizmoBase
Vec3d drag_position{ Vec3d::Zero() }; Vec3d drag_position{ Vec3d::Zero() };
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
Vec3d center{ Vec3d::Zero() }; Vec3d center{ Vec3d::Zero() };
Transform3d transform;
#endif // ENABLE_WORLD_COORDINATE #endif // ENABLE_WORLD_COORDINATE
BoundingBoxf3 box; BoundingBoxf3 box;
#if !ENABLE_WORLD_COORDINATE
std::array<Vec3d, 6> pivots{ Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero() }; std::array<Vec3d, 6> pivots{ Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero() };
#endif // !ENABLE_WORLD_COORDINATE
}; };
BoundingBoxf3 m_box; BoundingBoxf3 m_box;

12
src/slic3r/GUI/Selection.cpp
View File

@ -606,8 +606,16 @@ bool Selection::requires_uniform_scale() const
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
if (is_single_modifier() || is_single_volume()) if (is_single_modifier() || is_single_volume())
return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation()); return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation());
else if (is_single_full_instance() && wxGetApp().obj_manipul()->get_world_coordinates()) //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
return !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation()); else if (is_single_full_instance()) {
if (wxGetApp().obj_manipul()->get_world_coordinates())
return !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation());
else
return false;
}
// else if (is_single_full_instance() && wxGetApp().obj_manipul()->get_world_coordinates())
// return !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation());
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
return true; return true;
#else #else