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

Follow-up dc0275f70d - Cut: Next performance fix.

Browse Source 
Refactor a code to avoid redundant recalculation of an object bounding box and transformed bounding box.
This commit is contained in:
YuSanka 2023-02-21 12:43:55 +01:00
parent 8f31cf6e3d
commit a41dd8eeed
2 changed files with 39 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,15 +453,9 @@ void GLGizmoCut3D::update_clipper()
update_raycasters_for_picking_transform(); update_raycasters_for_picking_transform();
} }
void GLGizmoCut3D::update_clipper_on_render() void GLGizmoCut3D::set_center(const Vec3d& center, bool update_tbb /*=false*/)
{ {
update_clipper(); set_center_pos(center, update_tbb);
force_update_clipper_on_render = false;
}
void GLGizmoCut3D::set_center(const Vec3d& center)
{
set_center_pos(center);
update_clipper(); update_clipper();
} }
@ -584,7 +578,7 @@ void GLGizmoCut3D::render_move_center_input(int axis)
if (in_val != val) { if (in_val != val) {
move[axis] = val; move[axis] = val;
set_center(move); set_center(move, true);
} }
} }
@ -888,21 +882,17 @@ bool GLGizmoCut3D::on_init()
void GLGizmoCut3D::on_load(cereal::BinaryInputArchive& ar) void GLGizmoCut3D::on_load(cereal::BinaryInputArchive& ar)
{ {
ar( m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_hide_cut_plane, m_mode, m_connectors_editing,//m_selected, ar( m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_hide_cut_plane, m_mode, m_connectors_editing,
// m_connector_depth_ratio, m_connector_size, m_connector_mode, m_connector_type, m_connector_style, m_connector_shape_id,
m_ar_plane_center, m_rotation_m); m_ar_plane_center, m_rotation_m);
set_center_pos(m_ar_plane_center, true); set_center_pos(m_ar_plane_center, true);
force_update_clipper_on_render = true;
m_parent.request_extra_frame(); m_parent.request_extra_frame();
} }
void GLGizmoCut3D::on_save(cereal::BinaryOutputArchive& ar) const void GLGizmoCut3D::on_save(cereal::BinaryOutputArchive& ar) const
{ {
ar( m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_hide_cut_plane, m_mode, m_connectors_editing,//m_selected, ar( m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_hide_cut_plane, m_mode, m_connectors_editing,
// m_connector_depth_ratio, m_connector_size, m_connector_mode, m_connector_type, m_connector_style, m_connector_shape_id,
m_ar_plane_center, m_start_dragging_m); m_ar_plane_center, m_start_dragging_m);
} }
@ -923,6 +913,7 @@ void GLGizmoCut3D::on_set_state()
// initiate archived values // initiate archived values
m_ar_plane_center = m_plane_center; m_ar_plane_center = m_plane_center;
m_start_dragging_m = m_rotation_m; m_start_dragging_m = m_rotation_m;
m_transformed_bounding_box = transformed_bounding_box(m_plane_center);
m_parent.request_extra_frame(); m_parent.request_extra_frame();
} }
@ -934,7 +925,6 @@ void GLGizmoCut3D::on_set_state()
m_selected.clear(); m_selected.clear();
m_parent.set_use_color_clip_plane(false); m_parent.set_use_color_clip_plane(false);
} }
force_update_clipper_on_render = m_state == On;
} }
void GLGizmoCut3D::on_register_raycasters_for_picking() void GLGizmoCut3D::on_register_raycasters_for_picking()
@ -1146,7 +1136,7 @@ void GLGizmoCut3D::dragging_grabber_z(const GLGizmoBase::UpdateData &data)
const Vec3d shift = starting_vec * projection; const Vec3d shift = starting_vec * projection;
// move cut plane center // move cut plane center
set_center(m_plane_center + shift); set_center(m_plane_center + shift, true);
m_was_cut_plane_dragged = true; m_was_cut_plane_dragged = true;
} }
@ -1247,16 +1237,19 @@ void GLGizmoCut3D::on_stop_dragging()
} }
} }
void GLGizmoCut3D::set_center_pos(const Vec3d& center_pos, bool force/* = false*/) void GLGizmoCut3D::set_center_pos(const Vec3d& center_pos, bool update_tbb /*=false*/)
{ {
if (m_plane_center == center_pos) BoundingBoxf3 tbb = m_transformed_bounding_box;
return; if (update_tbb) {
Vec3d normal = m_rotation_m.inverse() * Vec3d(m_plane_center - center_pos);
tbb.translate(normal.z() * Vec3d::UnitZ());
}
const Vec3d& instance_offset = m_parent.get_selection().get_first_volume()->get_instance_offset();
const Vec3d trans_center_pos = (m_rotation_m.inverse() * (center_pos - instance_offset)) + tbb.center();
bool can_set_center_pos = force; bool can_set_center_pos = tbb.contains(trans_center_pos);
BoundingBoxf3 tbb;
if (!can_set_center_pos) { if (!can_set_center_pos) {
tbb = transformed_bounding_box(center_pos); if (tbb.max.z() > -.5 && tbb.min.z() < .5)
if (tbb.max.z() > -1. && tbb.min.z() < 1.)
can_set_center_pos = true; can_set_center_pos = true;
else { else {
const double old_dist = (m_bb_center - m_plane_center).norm(); const double old_dist = (m_bb_center - m_plane_center).norm();
@ -1290,55 +1283,31 @@ BoundingBoxf3 GLGizmoCut3D::bounding_box() const
BoundingBoxf3 GLGizmoCut3D::transformed_bounding_box(const Vec3d& plane_center) const BoundingBoxf3 GLGizmoCut3D::transformed_bounding_box(const Vec3d& plane_center) const
{ {
// #ysFIXME !!!
BoundingBoxf3 ret;
const CommonGizmosDataObjects::SelectionInfo* sel_info = m_c->selection_info();
if (!sel_info)
return ret;
const ModelObject* mo = sel_info->model_object();
if (!mo)
return ret;
const int instance_idx = sel_info->get_active_instance();
if (instance_idx < 0 || mo->instances.empty())
return ret;
const ModelInstance* mi = mo->instances[instance_idx];
const Vec3d& instance_offset = mi->get_offset();
Vec3d cut_center_offset = plane_center - instance_offset;
cut_center_offset[Z] -= sel_info->get_sla_shift();
const auto cut_matrix = Transform3d::Identity() * m_rotation_m.inverse() * translation_transform(-cut_center_offset);
const Selection& selection = m_parent.get_selection(); const Selection& selection = m_parent.get_selection();
const Vec3d& instance_offset = selection.get_first_volume()->get_instance_offset();
const auto cut_matrix = Transform3d::Identity() * m_rotation_m.inverse() * translation_transform(instance_offset - plane_center);
const Selection::IndicesList& idxs = selection.get_volume_idxs(); const Selection::IndicesList& idxs = selection.get_volume_idxs();
BoundingBoxf3 ret;
for (unsigned int i : idxs) { for (unsigned int i : idxs) {
const GLVolume* volume = selection.get_volume(i); const GLVolume* volume = selection.get_volume(i);
// respect just to the solid parts for FFF and ignore pad and supports for SLA // respect just to the solid parts for FFF and ignore pad and supports for SLA
if (!volume->is_modifier && !volume->is_sla_pad() && !volume->is_sla_support()) { if (!volume->is_modifier && !volume->is_sla_pad() && !volume->is_sla_support()) {
#if ENABLE_WORLD_COORDINATE
const auto instance_matrix = volume->get_instance_transformation().get_matrix_no_offset(); const auto instance_matrix = volume->get_instance_transformation().get_matrix_no_offset();
#else
const auto instance_matrix = assemble_transform(
Vec3d::Zero(), // don't apply offset
volume->get_instance_rotation().cwiseProduct(Vec3d(1.0, 1.0, 1.0)),
volume->get_instance_scaling_factor(),
volume->get_instance_mirror()
);
#endif // ENABLE_WORLD_COORDINATE
auto volume_trafo = instance_matrix * volume->get_volume_transformation().get_matrix(); auto volume_trafo = instance_matrix * volume->get_volume_transformation().get_matrix();
ret.merge(volume->transformed_convex_hull_bounding_box(cut_matrix * volume_trafo)); ret.merge(volume->transformed_convex_hull_bounding_box(cut_matrix * volume_trafo));
} }
} }
return ret; return ret;
} }
bool GLGizmoCut3D::update_bb() void GLGizmoCut3D::update_bb()
{ {
const BoundingBoxf3 box = bounding_box(); const BoundingBoxf3 box = bounding_box();
if (!box.defined)
return;
if (m_max_pos != box.max || m_min_pos != box.min) { if (m_max_pos != box.max || m_min_pos != box.min) {
m_bounding_box = box; m_bounding_box = box;
@ -1348,10 +1317,11 @@ bool GLGizmoCut3D::update_bb()
m_max_pos = box.max; m_max_pos = box.max;
m_min_pos = box.min; m_min_pos = box.min;
m_bb_center = box.center(); m_bb_center = box.center();
m_transformed_bounding_box = transformed_bounding_box(m_bb_center);
if (box.contains(m_center_offset)) if (box.contains(m_center_offset))
set_center_pos(m_bb_center + m_center_offset, true); set_center_pos(m_bb_center + m_center_offset);
else else
set_center_pos(m_bb_center, true); set_center_pos(m_bb_center);
m_radius = box.radius(); m_radius = box.radius();
m_grabber_connection_len = 0.5 * m_radius;// std::min<double>(0.75 * m_radius, 35.0); m_grabber_connection_len = 0.5 * m_radius;// std::min<double>(0.75 * m_radius, 35.0);
@ -1376,10 +1346,7 @@ bool GLGizmoCut3D::update_bb()
clear_selection(); clear_selection();
if (CommonGizmosDataObjects::SelectionInfo* selection = m_c->selection_info()) if (CommonGizmosDataObjects::SelectionInfo* selection = m_c->selection_info())
m_selected.resize(selection->model_object()->cut_connectors.size(), false); m_selected.resize(selection->model_object()->cut_connectors.size(), false);
return true;
} }
return false;
} }
void GLGizmoCut3D::init_picking_models() void GLGizmoCut3D::init_picking_models()
@ -1435,11 +1402,6 @@ void GLGizmoCut3D::render_clipper_cut()
void GLGizmoCut3D::on_render() void GLGizmoCut3D::on_render()
{ {
if (update_bb() || force_update_clipper_on_render) {
update_clipper_on_render();
m_c->object_clipper()->set_behavior(m_connectors_editing, m_connectors_editing, 0.4);
}
else
update_clipper(); update_clipper();
init_picking_models(); init_picking_models();
@ -1653,10 +1615,10 @@ void GLGizmoCut3D::render_build_size()
void GLGizmoCut3D::reset_cut_plane() void GLGizmoCut3D::reset_cut_plane()
{ {
set_center(m_bb_center);
m_rotation_m = Transform3d::Identity(); m_rotation_m = Transform3d::Identity();
m_angle_arc.reset(); m_angle_arc.reset();
update_clipper(); m_transformed_bounding_box = transformed_bounding_box(m_bb_center);
set_center(m_bb_center);
} }
void GLGizmoCut3D::invalidate_cut_plane() void GLGizmoCut3D::invalidate_cut_plane()
@ -1671,6 +1633,9 @@ void GLGizmoCut3D::invalidate_cut_plane()
void GLGizmoCut3D::set_connectors_editing(bool connectors_editing) void GLGizmoCut3D::set_connectors_editing(bool connectors_editing)
{ {
if (m_connectors_editing == connectors_editing)
return;
m_connectors_editing = connectors_editing; m_connectors_editing = connectors_editing;
update_raycasters_for_picking(); update_raycasters_for_picking();
@ -2340,7 +2305,7 @@ bool GLGizmoCut3D::process_cut_line(SLAGizmoEventType action, const Vec2d& mouse
m_rotation_m = m; m_rotation_m = m;
m_angle_arc.reset(); m_angle_arc.reset();
set_center(m_plane_center + cross_dir * (cross_dir.dot(pt - m_plane_center))); set_center(m_plane_center + cross_dir * (cross_dir.dot(pt - m_plane_center)), true);
discard_cut_line_processing(); discard_cut_line_processing();
} }
@ -2542,6 +2507,7 @@ CommonGizmosDataID GLGizmoCut3D::on_get_requirements() const {
void GLGizmoCut3D::data_changed() void GLGizmoCut3D::data_changed()
{ {
update_bb();
if (auto oc = m_c->object_clipper()) if (auto oc = m_c->object_clipper())
oc->set_behavior(m_connectors_editing, m_connectors_editing, double(m_contour_width)); oc->set_behavior(m_connectors_editing, m_connectors_editing, double(m_contour_width));
} }

8
src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
View File

@ -121,7 +121,6 @@ class GLGizmoCut3D : public GLGizmoBase
float m_label_width{ 150.0 }; float m_label_width{ 150.0 };
float m_control_width{ 200.0 }; float m_control_width{ 200.0 };
bool m_imperial_units{ false }; bool m_imperial_units{ false };
bool force_update_clipper_on_render{false};
float m_contour_width{ 0.4f }; float m_contour_width{ 0.4f };
float m_cut_plane_radius_koef{ 1.5f }; float m_cut_plane_radius_koef{ 1.5f };
@ -192,7 +191,6 @@ public:
void rotate_vec3d_around_plane_center(Vec3d&vec); void rotate_vec3d_around_plane_center(Vec3d&vec);
void put_connectors_on_cut_plane(const Vec3d& cp_normal, double cp_offset); void put_connectors_on_cut_plane(const Vec3d& cp_normal, double cp_offset);
void update_clipper(); void update_clipper();
void update_clipper_on_render();
void invalidate_cut_plane(); void invalidate_cut_plane();
BoundingBoxf3 bounding_box() const; BoundingBoxf3 bounding_box() const;
@ -258,7 +256,7 @@ protected:
void data_changed() override; void data_changed() override;
private: private:
void set_center(const Vec3d& center); void set_center(const Vec3d& center, bool update_tbb = false);
bool render_combo(const std::string& label, const std::vector<std::string>& lines, size_t& selection_idx); bool render_combo(const std::string& label, const std::vector<std::string>& lines, size_t& selection_idx);
bool render_double_input(const std::string& label, double& value_in); bool render_double_input(const std::string& label, double& value_in);
bool render_slider_double_input(const std::string& label, float& value_in, float& tolerance_in); bool render_slider_double_input(const std::string& label, float& value_in, float& tolerance_in);
@ -284,8 +282,8 @@ private:
void render_cut_plane_grabbers(); void render_cut_plane_grabbers();
void render_cut_line(); void render_cut_line();
void perform_cut(const Selection&selection); void perform_cut(const Selection&selection);
void set_center_pos(const Vec3d&center_pos, bool force = false); void set_center_pos(const Vec3d&center_pos, bool update_tbb = false);
bool update_bb(); void update_bb();
void init_picking_models(); void init_picking_models();
void init_rendering_items(); void init_rendering_items();
void render_clipper_cut(); void render_clipper_cut();