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

ENABLE_3DCONNEXION_DEVICES - Added imgui dialog to edit 3Dconnexion device parameters

Browse source
This commit is contained in:
Enrico Turri 2019-10-02 15:55:26 +02:00
parent 644cc8c6b4
commit 36d3f90fad
5 changed files with 125 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1636,6 +1636,10 @@ void GLCanvas3D::render()
m_camera.debug_render();
#endif // ENABLE_CAMERA_STATISTICS
#if ENABLE_3DCONNEXION_DEVICES
wxGetApp().plater()->get_mouse3d_controller().render_settings_dialog();
#endif // ENABLE_3DCONNEXION_DEVICES
wxGetApp().imgui()->render();
m_canvas->SwapBuffers();
@ -2374,6 +2378,21 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
#endif /* __APPLE__ */
post_event(SimpleEvent(EVT_GLTOOLBAR_COPY));
break;
#if ENABLE_3DCONNEXION_DEVICES
#ifdef __APPLE__
case 'm':
case 'M':
#else /* __APPLE__ */
case WXK_CONTROL_M:
#endif /* __APPLE__ */
{
Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller();
controller.show_settings_dialog(!controller.is_settings_dialog_shown());
break;
}
#endif // ENABLE_3DCONNEXION_DEVICES
#ifdef __APPLE__
case 'v':
case 'V':