3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP 3Dconnexion refactoring: Fixing compilation on OSX

Browse Source
This commit is contained in:
bubnikv 2020-03-04 12:18:59 +01:00
parent c9df6e5cf8
commit cbe9216d79
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/Mouse3DController.cpp
View File

@ -389,10 +389,10 @@ void Mouse3DController::disconnected()
m_connected = false; m_connected = false;
} }
bool Mouse3DController::handle_input(const DataPacketAxis& packet, const Params &params, State &state_in_out) bool Mouse3DController::handle_input(const DataPacketAxis& packet)
{ {
if (! wxGetApp().IsActive()) if (! wxGetApp().IsActive())
return; return false;
{ {
// Synchronize parameters between the UI thread and the background thread. // Synchronize parameters between the UI thread and the background thread.
@ -405,34 +405,30 @@ bool Mouse3DController::handle_input(const DataPacketAxis& packet, const Params
} }
bool updated = false; bool updated = false;
//translation // translation
double deadzone = params.translation.deadzone; double deadzone = m_params.translation.deadzone;
Vec3d translation(std::abs(packet[0]) > deadzone ? -packet[0] : 0.0, Vec3d translation(std::abs(packet[0]) > deadzone ? -packet[0] : 0.0,
std::abs(packet[1]) > deadzone ? packet[1] : 0.0, std::abs(packet[1]) > deadzone ? packet[1] : 0.0,
std::abs(packet[2]) > deadzone ? packet[2] : 0.0); std::abs(packet[2]) > deadzone ? packet[2] : 0.0);
if (!translation.isApprox(Vec3d::Zero())) if (! translation.isApprox(Vec3d::Zero())) {
{ m_state.append_translation(translation, m_params.input_queue_max_size);
state_in_out.append_translation(translation, params.input_queue_max_size);
updated = true; updated = true;
} }
//rotation // rotation
deadzone = params.rotation.deadzone; deadzone = m_params.rotation.deadzone;
Vec3f rotation(std::abs(packet[3]) > deadzone ? (float)packet[3] : 0.0, Vec3f rotation(std::abs(packet[3]) > deadzone ? (float)packet[3] : 0.0,
std::abs(packet[4]) > deadzone ? (float)packet[4] : 0.0, std::abs(packet[4]) > deadzone ? (float)packet[4] : 0.0,
std::abs(packet[5]) > deadzone ? (float)packet[5] : 0.0); std::abs(packet[5]) > deadzone ? (float)packet[5] : 0.0);
if (!rotation.isApprox(Vec3f::Zero())) if (! rotation.isApprox(Vec3f::Zero())) {
{ m_state.append_rotation(rotation, m_params.input_queue_max_size);
state_in_out.append_rotation(rotation, params.input_queue_max_size);
updated = true; updated = true;
} }
#if 1
if (updated) { if (updated) {
wxGetApp().plater()->set_current_canvas_as_dirty(); wxGetApp().plater()->set_current_canvas_as_dirty();
// ask for an idle event to update 3D scene // ask for an idle event to update 3D scene
wxWakeUpIdle(); wxWakeUpIdle();
} }
#endif
return updated; return updated;
} }

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

@ -2,7 +2,7 @@
#define slic3r_Mouse3DController_hpp_ #define slic3r_Mouse3DController_hpp_
// Enabled debug output to console and extended imgui dialog // Enabled debug output to console and extended imgui dialog
#define ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT 1 #define ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT 0
#include "libslic3r/Point.hpp" #include "libslic3r/Point.hpp"
@ -180,7 +180,7 @@ public:
void disconnected(); void disconnected();
typedef std::array<double, 6> DataPacketAxis; typedef std::array<double, 6> DataPacketAxis;
// Unpack a 3DConnexion packet provided by the 3DConnexion driver into m_state. Called by Mouse3DHandlerMac.mm // Unpack a 3DConnexion packet provided by the 3DConnexion driver into m_state. Called by Mouse3DHandlerMac.mm
static bool handle_input(const DataPacketAxis& packet, const Params &params, State &state_in_out); bool handle_input(const DataPacketAxis& packet);
#endif // __APPLE__ #endif // __APPLE__
#ifdef WIN32 #ifdef WIN32