3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Camera rotate around current plate center if plate is empty (#8912)

Browse source 
* Camera rotate around current plate center if plate is empty (SoftFever/OrcaSlicer#8856)

* Don't expand plate bounding box when camera rotating
This commit is contained in:
Noisyfox 2025-04-05 23:23:26 +08:00 • committed by GitHub
parent ecd91bcf01
commit 1fd21371b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1550,13 +1550,16 @@ BoundingBoxf3 GLCanvas3D::volumes_bounding_box(bool current_plate_only) const
BoundingBoxf3 expand_part_plate_list_box; BoundingBoxf3 expand_part_plate_list_box;
bool is_limit = m_canvas_type != ECanvasType::CanvasAssembleView; bool is_limit = m_canvas_type != ECanvasType::CanvasAssembleView;
if (is_limit) { if (is_limit) {
auto plate_list_box = current_plate_only ? wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_bounding_box() : if (current_plate_only) {
wxGetApp().plater()->get_partplate_list().get_bounding_box(); expand_part_plate_list_box = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_bounding_box();
} else {
auto plate_list_box = wxGetApp().plater()->get_partplate_list().get_bounding_box();
auto horizontal_radius = 0.5 * sqrt(std::pow(plate_list_box.min[0] - plate_list_box.max[0], 2) + std::pow(plate_list_box.min[1] - plate_list_box.max[1], 2)); auto horizontal_radius = 0.5 * sqrt(std::pow(plate_list_box.min[0] - plate_list_box.max[0], 2) + std::pow(plate_list_box.min[1] - plate_list_box.max[1], 2));
const float scale = 2; const float scale = 2;
expand_part_plate_list_box.merge(plate_list_box.min - scale * Vec3d(horizontal_radius, horizontal_radius, 0)); expand_part_plate_list_box.merge(plate_list_box.min - scale * Vec3d(horizontal_radius, horizontal_radius, 0));
expand_part_plate_list_box.merge(plate_list_box.max + scale * Vec3d(horizontal_radius, horizontal_radius, 0)); expand_part_plate_list_box.merge(plate_list_box.max + scale * Vec3d(horizontal_radius, horizontal_radius, 0));
} }
}
for (const GLVolume *volume : m_volumes.volumes) { for (const GLVolume *volume : m_volumes.volumes) {
if (!m_apply_zoom_to_volumes_filter || ((volume != nullptr) && volume->zoom_to_volumes)) { if (!m_apply_zoom_to_volumes_filter || ((volume != nullptr) && volume->zoom_to_volumes)) {
const auto v_bb = volume->transformed_bounding_box(); const auto v_bb = volume->transformed_bounding_box();
@ -4358,8 +4361,15 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
else { else {
if (!m_selection.is_empty()) if (!m_selection.is_empty())
rotate_target = m_selection.get_bounding_box().center(); rotate_target = m_selection.get_bounding_box().center();
else else {
rotate_target = volumes_bounding_box(true).center(); // Rotate around the center of objects on current plate
auto bbox = volumes_bounding_box(true);
if (!bbox.defined) {
// Rotate around current plate center if current plate is empty
bbox = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_bounding_box();
}
rotate_target = bbox.center();
}
} }
if (!rotate_target.isZero()) if (!rotate_target.isZero())