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

ENABLE_3DCONNEXION_DEVICES -> Another small refactoring of Mouse3DController

Browse source
This commit is contained in:
Enrico Turri 2019-10-04 07:58:01 +02:00
parent 243cb5d524
commit 1d463fc23f
2 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/slic3r/GUI/Mouse3DController.cpp
View file

@ -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() 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 // Read data from device
enum EDataType enum EDataType
{ {
@ -328,19 +326,19 @@ void Mouse3DController::collect_input()
{ {
case Translation: case Translation:
{ {
Vec3d translation(-convert_input((int)retrieved_data[1], retrieved_data[2]), Vec3d translation(-convert_input(retrieved_data[1], retrieved_data[2]),
convert_input((int)retrieved_data[3], retrieved_data[4]), convert_input(retrieved_data[3], retrieved_data[4]),
convert_input((int)retrieved_data[5], retrieved_data[6])); convert_input(retrieved_data[5], retrieved_data[6]));
if (!translation.isApprox(Vec3d::Zero())) if (!translation.isApprox(Vec3d::Zero()))
m_state.set_translation(translation); m_state.set_translation(translation);
break; break;
} }
case Rotation: case Rotation:
{ {
Vec3f rotation(-(float)convert_input((int)retrieved_data[1], retrieved_data[2]), Vec3f rotation(-(float)convert_input(retrieved_data[1], retrieved_data[2]),
(float)convert_input((int)retrieved_data[3], retrieved_data[4]), (float)convert_input(retrieved_data[3], retrieved_data[4]),
-(float)convert_input((int)retrieved_data[5], retrieved_data[6])); -(float)convert_input(retrieved_data[5], retrieved_data[6]));
if (!rotation.isApprox(Vec3f::Zero())) if (!rotation.isApprox(Vec3f::Zero()))
m_state.set_rotation(rotation); m_state.set_rotation(rotation);

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

@ -39,10 +39,6 @@ class Mouse3DController
void set_button(unsigned int id) { m_buttons.push_back(id); } void set_button(unsigned int id) { m_buttons.push_back(id); }
void reset_buttons() { return m_buttons.clear(); } 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_translation() const { return !m_translation.isApprox(Vec3d::Zero()); }
bool has_rotation() const { return !m_rotation.isApprox(Vec3f::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()); } bool has_translation_or_rotation() const { return !m_translation.isApprox(Vec3d::Zero()) && !m_rotation.isApprox(Vec3f::Zero()); }