Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2020-03-10 15:43:49 +0300
committerEnrico Turri <enricoturri@seznam.cz>2020-03-10 15:43:49 +0300
commit1d337b0e242e9034bcc6a5dd4bd1e4d7da3209e7 (patch)
tree6056e261d0e9a2fabd9acfffc2e7390472a46411 /src/slic3r/GUI/Mouse3DController.cpp
parenta6a9ab9dc7efda2dce6745778f6198d34ed800e8 (diff)
#3791 - Linear zoom for 3DConnexion devices
Diffstat (limited to 'src/slic3r/GUI/Mouse3DController.cpp')
-rw-r--r--src/slic3r/GUI/Mouse3DController.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp
index 5ff817c59..178c52f1c 100644
--- a/src/slic3r/GUI/Mouse3DController.cpp
+++ b/src/slic3r/GUI/Mouse3DController.cpp
@@ -134,9 +134,9 @@ bool Mouse3DController::State::apply(const Mouse3DController::Params &params, Ca
const Vec3d& translation = input_queue_item.vector;
double zoom_factor = camera.min_zoom() / camera.get_zoom();
camera.set_target(camera.get_target() + zoom_factor * params.translation.scale * (translation.x() * camera.get_dir_right() + translation.z() * camera.get_dir_up()));
- if (translation.y() != 0.0)
- camera.update_zoom(params.zoom.scale * translation.y() / std::abs(translation.y()));
- } else if (input_queue_item.is_rotation()) {
+ if (translation.y() != 0.0)
+ camera.update_zoom(params.zoom.scale * translation.y());
+ } else if (input_queue_item.is_rotation()) {
Vec3d rot = params.rotation.scale * input_queue_item.vector * (PI / 180.);
camera.rotate_local_around_target(Vec3d(rot.x(), - rot.z(), rot.y()));
break;