3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed unresponsive 3Dconnexion device when switching to preview

Browse source
This commit is contained in:
Enrico Turri 2020-01-03 11:41:29 +01:00
parent 3fb9fd4e30
commit a4ad0a0925
6 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ class Mouse3DController
// Mouse3DController::collect_input() through the call to the append_rotation() method
// GLCanvas3D::on_mouse_wheel() through the call to the process_mouse_wheel() method
// GLCanvas3D::on_idle() through the call to the apply() method
unsigned int m_mouse_wheel_counter;
std::atomic<unsigned int> m_mouse_wheel_counter;
#if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT
size_t m_translation_queue_max_size;
@ -128,7 +128,6 @@ class Mouse3DController
bool m_initialized;
mutable State m_state;
std::mutex m_mutex;
std::thread m_thread;
hid_device* m_device;
std::string m_device_str;
@ -151,7 +150,7 @@ public:
bool is_device_connected() const { return m_device != nullptr; }
bool is_running() const { return m_running; }
bool process_mouse_wheel() { std::lock_guard<std::mutex> lock(m_mutex); return m_state.process_mouse_wheel(); }
bool process_mouse_wheel() { return m_state.process_mouse_wheel(); }
bool apply(Camera& camera);