amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

ENH: zooming at mouse position

Browse source 
https://github.com/bambulab/BambuStudio/issues/1321

Change-Id: Ifa5c2b2931a5d80c3e5e5cc05eda76263a5ac570
This commit is contained in:
liz.li 2023-03-10 11:55:00 +08:00 committed by Lane.Wei
parent 01bb20e4e1
commit 3f2ee4062b
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/Camera.cpp
View file

@ -20,6 +20,7 @@ double Camera::FrustrumMinZRange = 50.0;
double Camera::FrustrumMinNearZ = 100.0; double Camera::FrustrumMinNearZ = 100.0;
double Camera::FrustrumZMargin = 10.0; double Camera::FrustrumZMargin = 10.0;
double Camera::MaxFovDeg = 60.0; double Camera::MaxFovDeg = 60.0;
double Camera::ZoomUnit = 0.1;
std::string Camera::get_type_as_string() const std::string Camera::get_type_as_string() const
{ {
@ -52,6 +53,12 @@ void Camera::select_next_type()
set_type((EType)next); set_type((EType)next);
} }
void Camera::translate(const Vec3d& displacement) {
if (!displacement.isApprox(Vec3d::Zero())) {
m_view_matrix.translate(-displacement);
}
}
void Camera::set_target(const Vec3d& target) void Camera::set_target(const Vec3d& target)
{ {
//BBS do not check validation //BBS do not check validation

4
src/slic3r/GUI/Camera.hpp
View file

@ -22,6 +22,7 @@ struct Camera
static double FrustrumMinNearZ; static double FrustrumMinNearZ;
static double FrustrumZMargin; static double FrustrumZMargin;
static double MaxFovDeg; static double MaxFovDeg;
static double ZoomUnit;
enum class EType : unsigned char enum class EType : unsigned char
{ {
@ -67,6 +68,7 @@ public:
void enable_update_config_on_type_change(bool enable) { m_update_config_on_type_change_enabled = enable; } void enable_update_config_on_type_change(bool enable) { m_update_config_on_type_change_enabled = enable; }
void translate(const Vec3d& displacement);
const Vec3d& get_target() const { return m_target; } const Vec3d& get_target() const { return m_target; }
void set_target(const Vec3d& target); void set_target(const Vec3d& target);
@ -76,7 +78,7 @@ public:
double get_zoom() const { return m_zoom; } double get_zoom() const { return m_zoom; }
double get_inv_zoom() const { assert(m_zoom != 0.0); return 1.0 / m_zoom; } double get_inv_zoom() const { assert(m_zoom != 0.0); return 1.0 / m_zoom; }
void update_zoom(double delta_zoom) { set_zoom(m_zoom / (1.0 - std::max(std::min(delta_zoom, 4.0), -4.0) * 0.1)); } void update_zoom(double delta_zoom) { set_zoom(m_zoom / (1.0 - std::max(std::min(delta_zoom, 4.0), -4.0) * ZoomUnit)); }
void set_zoom(double zoom); void set_zoom(double zoom);
const BoundingBoxf3& get_scene_box() const { return m_scene_box; } const BoundingBoxf3& get_scene_box() const { return m_scene_box; }

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

@ -3585,7 +3585,21 @@ void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt)
#else #else
double direction_factor = 1.0; double direction_factor = 1.0;
#endif #endif
_update_camera_zoom(direction_factor * (double)evt.GetWheelRotation() / (double)evt.GetWheelDelta()); auto delta = direction_factor * (double)evt.GetWheelRotation() / (double)evt.GetWheelDelta();
if (evt.CmdDown()) {
_update_camera_zoom(delta);
}
else {
auto cnv_size = get_canvas_size();
auto screen_center_3d_pos = _mouse_to_3d({ cnv_size.get_width() * 0.5, cnv_size.get_height() * 0.5 });
auto mouse_3d_pos = _mouse_to_3d({evt.GetX(), evt.GetY()});
Vec3d displacement = mouse_3d_pos - screen_center_3d_pos;
wxGetApp().plater()->get_camera().translate(displacement);
auto origin_zoom = wxGetApp().plater()->get_camera().get_zoom();
_update_camera_zoom(delta);
auto new_zoom = wxGetApp().plater()->get_camera().get_zoom();
wxGetApp().plater()->get_camera().translate((-displacement) / (new_zoom / origin_zoom));
}
} }
void GLCanvas3D::on_timer(wxTimerEvent& evt) void GLCanvas3D::on_timer(wxTimerEvent& evt)