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

Cut WIP: Fixed crash on second "Perform cut"

Browse Source 
+ some code cleaning
This commit is contained in:
YuSanka 2022-08-12 17:59:36 +02:00
parent df8f7e1069
commit 7912613dc8
4 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Model.cpp
View File

@ -1545,7 +1545,7 @@ ModelObjectPtrs ModelObject::cut(size_t instance, const Vec3d& cut_center, const
// for lower part change type of connector from NEGATIVE_VOLUME to MODEL_PART if this connector is a plug
vol->set_type(ModelVolumeType::MODEL_PART);
}
if (volume->cut_info.connector_type == CutConnectorType::Dowel) {
if (dowels && volume->cut_info.connector_type == CutConnectorType::Dowel) {
// add one more solid part same as connector if this connector is a dowel
ModelVolume* vol = dowels->add_volume(*volume);
vol->set_type(ModelVolumeType::MODEL_PART);

1
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -3469,6 +3469,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
if (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports &&
m_gizmos.get_current_type() != GLGizmosManager::FdmSupports &&
m_gizmos.get_current_type() != GLGizmosManager::Seam &&
m_gizmos.get_current_type() != GLGizmosManager::Cut &&
m_gizmos.get_current_type() != GLGizmosManager::MmuSegmentation) {
m_rectangle_selection.start_dragging(m_mouse.position, evt.ShiftDown() ? GLSelectionRectangle::EState::Select : GLSelectionRectangle::EState::Deselect);
m_dirty = true;

40
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@ -163,8 +163,6 @@ static void init_from_angle_arc(GLModel& model, double angle, double radius)
//! --
#define use_grabber_extension 1
GLGizmoCut3D::GLGizmoCut3D(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
: GLGizmoBase(parent, icon_filename, sprite_id)
, m_connector_type (CutConnectorType::Plug)
@ -1030,12 +1028,9 @@ void GLGizmoCut3D::on_dragging(const UpdateData& data)
CutConnectors& connectors = m_c->selection_info()->model_object()->cut_connectors;
if (m_hover_id == Z) {
#if use_grabber_extension
Vec3d starting_box_center = m_plane_center - Vec3d::UnitZ();// some Margin
rotate_vec3d_around_center(starting_box_center, Geometry::Transformation(m_rotation_m).get_rotation(), m_plane_center);
#else
const Vec3d& starting_box_center = m_plane_center;
#endif
const Vec3d& starting_drag_position = m_plane_center;
double projection = 0.0;
@ -1184,14 +1179,10 @@ BoundingBoxf3 GLGizmoCut3D::transformed_bounding_box(bool revert_move /*= false*
Vec3d cut_center_offset = m_plane_center - instance_offset;
cut_center_offset[Z] -= m_c->selection_info()->get_sla_shift();
const Vec3d rotation = Geometry::Transformation(m_rotation_m).get_rotation();
const auto move = Geometry::assemble_transform(-cut_center_offset);
const auto rot_z = Geometry::assemble_transform(Vec3d::Zero(), Vec3d(0, 0, -rotation.z()));
const auto rot_y = Geometry::assemble_transform(Vec3d::Zero(), Vec3d(0, -rotation.y(), 0));
const auto rot_x = Geometry::assemble_transform(Vec3d::Zero(), Vec3d(-rotation.x(), 0, 0));
const auto move2 = Geometry::assemble_transform(m_plane_center);
const auto move2 = Geometry::assemble_transform(m_plane_center);
const auto cut_matrix = (revert_move ? move2 : Transform3d::Identity()) * rot_x * rot_y * rot_z * move;
const auto cut_matrix = (revert_move ? move2 : Transform3d::Identity()) * m_rotation_m.inverse() * move;
const Selection& selection = m_parent.get_selection();
const Selection::IndicesList& idxs = selection.get_volume_idxs();
@ -1207,7 +1198,10 @@ BoundingBoxf3 GLGizmoCut3D::transformed_bounding_box(bool revert_move /*= false*
volume->get_instance_mirror()
);
ret.merge(volume->transformed_convex_hull_bounding_box(cut_matrix * instance_matrix * volume->get_volume_transformation().get_matrix()));
auto volume_travo = instance_matrix * volume->get_volume_transformation().get_matrix();
auto volume_offset = Geometry::Transformation(volume_travo).get_offset();
ret.merge(volume->transformed_convex_hull_bounding_box(cut_matrix * volume_travo));
}
}
return ret;
@ -1223,7 +1217,7 @@ bool GLGizmoCut3D::update_bb()
set_center_pos(m_bb_center + m_center_offset, true);
m_radius = box.radius();
m_grabber_connection_len = std::min<double>(0.75 * m_radius, 35.0);
m_grabber_connection_len = 0.75 * m_radius;// std::min<double>(0.75 * m_radius, 35.0);
m_grabber_radius = m_grabber_connection_len * 0.85;
m_snap_coarse_in_radius = m_grabber_radius / 3.0f;
@ -1265,8 +1259,11 @@ void GLGizmoCut3D::init_picking_models()
void GLGizmoCut3D::on_render()
{
if (update_bb())
if (update_bb() || force_update_clipper_on_render) {
update_clipper_on_render();
if (force_update_clipper_on_render)
m_c->object_clipper()->set_behavior(m_connectors_editing, m_connectors_editing, 0.4f);
}
init_picking_models();
@ -1285,11 +1282,6 @@ void GLGizmoCut3D::on_render()
if (!m_angle_arc.is_initialized() || m_angle != 0.0)
init_from_angle_arc(m_angle_arc, m_angle, m_grabber_connection_len);
if (force_update_clipper_on_render) {
update_clipper_on_render();
m_c->object_clipper()->set_behavior(m_connectors_editing, m_connectors_editing, 0.4f);
}
render_connectors();
if (! m_connectors_editing)
@ -1725,6 +1717,8 @@ void GLGizmoCut3D::perform_cut(const Selection& selection)
{
// update connectors pos as offset of its center before cut performing
if (has_connectors && m_connector_mode == CutConnectorMode::Manual) {
m_selected.clear();
Plater::TakeSnapshot snapshot(plater, _L("Cut by Plane"));
for (CutConnector& connector : mo->cut_connectors) {
connector.rotation = rotation;
@ -1736,13 +1730,9 @@ void GLGizmoCut3D::perform_cut(const Selection& selection)
}
else {
// culculate shift of the connector center regarding to the position on the cut plane
#if use_grabber_extension
Vec3d shifted_center = m_plane_center + Vec3d::UnitZ();
rotate_vec3d_around_center(shifted_center, rotation, m_plane_center);
Vec3d norm = (shifted_center - m_plane_center).normalized();
#else
Vec3d norm = (m_grabbers[0].center - m_plane_center).normalize();
#endif
connector.pos += norm * (0.5 * connector.height);
}
}
@ -1758,7 +1748,6 @@ void GLGizmoCut3D::perform_cut(const Selection& selection)
only_if(m_rotate_upper, ModelObjectCutAttribute::FlipUpper) |
only_if(m_rotate_lower, ModelObjectCutAttribute::FlipLower) |
only_if(create_dowels_as_separate_object, ModelObjectCutAttribute::CreateDowels));
m_selected.clear();
}
else {
// the object is SLA-elevated and the plane is under it.
@ -1871,7 +1860,6 @@ bool GLGizmoCut3D::process_cut_line(SLAGizmoEventType action, const Vec2d& mouse
m_line_beg = pt;
m_line_end = pt;
return true;
// volumes_trafos[i] = model_object->volumes[i]->get_matrix();
}
if (cut_line_processing()) {

11
src/slic3r/GUI/Plater.cpp
View File

@ -5949,18 +5949,17 @@ void Slic3r::GUI::Plater::cut(size_t obj_idx, size_t instance_idx, const Vec3d&
// suppress to call selection update for Object List to avoid call of early Gizmos on/off update
p->load_model_objects(new_objects, false, false);
Selection& selection = p->get_selection();
size_t last_id = p->model.objects.size() - 1;
for (size_t i = 0; i < new_objects.size(); ++i)
selection.add_object((unsigned int)(last_id - i), i == 0);
this->allow_snapshots();
// now process all updates of the 3d scene
update();
// Update InfoItems in ObjectList after update() to use of a correct value of the GLCanvas3D::is_sinking(),
// which is updated after a view3D->reload_scene(false, flags & (unsigned int)UpdateParams::FORCE_FULL_SCREEN_REFRESH) call
for (size_t idx = 0; idx < p->model.objects.size(); idx++)
wxGetApp().obj_list()->update_info_items(idx);
Selection& selection = p->get_selection();
size_t last_id = p->model.objects.size() - 1;
for (size_t i = 0; i < new_objects.size(); ++i)
selection.add_object((unsigned int)(last_id - i), i == 0);
}
void Plater::export_gcode(bool prefer_removable)