3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 19:57:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

3DConnexion devices -> Tweak of sensitivity parameters and dependency of translation from zoom factor

Browse source
This commit is contained in:
Enrico Turri 2020-01-17 09:36:34 +01:00
parent 34aac7e292
commit 02aa629449
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,13 +143,14 @@ void Camera::update_zoom(double delta_zoom)
void Camera::set_zoom(double zoom)
{
// Don't allow to zoom too far outside the scene.
double zoom_min = calc_zoom_to_bounding_box_factor(m_scene_box, (int)m_viewport[2], (int)m_viewport[3]);
double zoom_min = min_zoom();
if (zoom_min > 0.0)
zoom = std::max(zoom, zoom_min * 0.7);
zoom = std::max(zoom, zoom_min);
// Don't allow to zoom too close to the scene.
m_zoom = std::min(zoom, 100.0);
m_zoom = std::min(zoom, max_zoom());
}
#if ENABLE_6DOF_CAMERA
void Camera::select_view(const std::string& direction)
{
@ -457,9 +458,9 @@ void Camera::rotate_local_around_pivot(const Vec3d& rotation_rad, const Vec3d& p
translate_world(center);
}
bool Camera::is_looking_downward() const
double Camera::min_zoom() const
{
return get_dir_forward().dot(Vec3d::UnitZ()) < 0.0;
return 0.7 * calc_zoom_to_bounding_box_factor(m_scene_box, (int)m_viewport[2], (int)m_viewport[3]);
}
#endif // ENABLE_6DOF_CAMERA