From 1d463fc23f9bcd2d24a26a00f845ca42c3aa3a6c Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Fri, 4 Oct 2019 07:58:01 +0200
Subject: [PATCH] ENABLE_3DCONNEXION_DEVICES -> Another small refactoring of
Mouse3DController
---
src/slic3r/GUI/Mouse3DController.cpp | 44 +++++++++++++---------------
src/slic3r/GUI/Mouse3DController.hpp | 4 ---
2 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp
index f4e57b372..660d8d809 100644
--- a/src/slic3r/GUI/Mouse3DController.cpp
+++ b/src/slic3r/GUI/Mouse3DController.cpp
@@ -285,24 +285,22 @@ void Mouse3DController::run()
}
}
-double convert_input(int first, unsigned char val)
-{
- int ret = 0;
-
- switch (val)
- {
- case 0: { ret = first; break; }
- case 1: { ret = first + 255; break; }
- case 254: { ret = -511 + first; break; }
- case 255: { ret = -255 + first; break; }
- default: { break; }
- }
-
- return (double)ret / 349.0;
-}
-
void Mouse3DController::collect_input()
{
+ auto convert_input = [](unsigned char first, unsigned char second)-> double
+ {
+ int ret = 0;
+ switch (second)
+ {
+ case 0: { ret = (int)first; break; }
+ case 1: { ret = (int)first + 255; break; }
+ case 254: { ret = -511 + (int)first; break; }
+ case 255: { ret = -255 + (int)first; break; }
+ default: { break; }
+ }
+ return (double)ret / 349.0;
+ };
+
// Read data from device
enum EDataType
{
@@ -328,19 +326,19 @@ void Mouse3DController::collect_input()
{
case Translation:
{
- Vec3d translation(-convert_input((int)retrieved_data[1], retrieved_data[2]),
- convert_input((int)retrieved_data[3], retrieved_data[4]),
- convert_input((int)retrieved_data[5], retrieved_data[6]));
- if (!translation.isApprox(Vec3d::Zero()))
+ Vec3d translation(-convert_input(retrieved_data[1], retrieved_data[2]),
+ convert_input(retrieved_data[3], retrieved_data[4]),
+ convert_input(retrieved_data[5], retrieved_data[6]));
+ if (!translation.isApprox(Vec3d::Zero()))
m_state.set_translation(translation);
break;
}
case Rotation:
{
- Vec3f rotation(-(float)convert_input((int)retrieved_data[1], retrieved_data[2]),
- (float)convert_input((int)retrieved_data[3], retrieved_data[4]),
- -(float)convert_input((int)retrieved_data[5], retrieved_data[6]));
+ Vec3f rotation(-(float)convert_input(retrieved_data[1], retrieved_data[2]),
+ (float)convert_input(retrieved_data[3], retrieved_data[4]),
+ -(float)convert_input(retrieved_data[5], retrieved_data[6]));
if (!rotation.isApprox(Vec3f::Zero()))
m_state.set_rotation(rotation);
diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp
index 8abc4299c..bb15d4351 100644
--- a/src/slic3r/GUI/Mouse3DController.hpp
+++ b/src/slic3r/GUI/Mouse3DController.hpp
@@ -39,10 +39,6 @@ class Mouse3DController
void set_button(unsigned int id) { m_buttons.push_back(id); }
void reset_buttons() { return m_buttons.clear(); }
- const Vec3d& get_translation() const { return m_translation; }
- const Vec3f& get_rotation() const { return m_rotation; }
- const std::vector<unsigned int>& get_buttons() const { return m_buttons; }
-
bool has_translation() const { return !m_translation.isApprox(Vec3d::Zero()); }
bool has_rotation() const { return !m_rotation.isApprox(Vec3f::Zero()); }
bool has_translation_or_rotation() const { return !m_translation.isApprox(Vec3d::Zero()) && !m_rotation.isApprox(Vec3f::Zero()); }