Commit Graph

369 Commits

Author SHA1 Message Date
Lukas Matena
2759c87e5b WarningTexture class in GLCanvas3D modified so it can be used more universally
Added a warning to notify that some objects are not rendered with SLA gizmo active
2019-02-20 12:09:45 +01:00
Lukas Matena
4558910a84 SLA gizmo can be deselected by clicking in canvas area (unless in editing mode) 2019-02-20 09:59:59 +01:00
Lukas Matena
1bb0af1588 SLA gizmo asks about saving changes, right button click removes points 2019-02-19 13:47:28 +01:00
Lukas Matena
023b788777 Merge branch 'master' into lm_sla_supports_auto2 2019-02-19 10:15:16 +01:00
Enrico Turri
644794233f Code cleanup 2019-02-18 15:41:12 +01:00
Enrico Turri
8635756b02 Added debug output to investigate further #1788 2019-02-18 15:41:04 +01:00
Enrico Turri
362f6a069c 2nd attempt to fix #1788 2019-02-18 15:40:58 +01:00
Enrico Turri
022b573bae 1st attempt to fix #1788 2019-02-18 15:40:51 +01:00
Lukas Matena
5966dcb78e SLA gizmo - fixed support points rendering (depth is now correctly accounted for) 2019-02-18 11:59:47 +01:00
bubnikv
09cce95181 Merge branch 'lm_sla_supports_auto2' of https://github.com/prusa3d/Slic3r into lm_sla_supports_auto2 2019-02-17 13:09:16 +01:00
Lukas Matena
ac8f9ab3dc SLA gizmo improvements
- point can be selected
- selection can be deleted, head diameter changed
- dragging of objects is not allowed with the gizmo being on
- added a modal dialog when automatic support generator is triggered
2019-02-11 16:29:03 +01:00
Lukas Matena
0453caf266 SLA gizmo - shift-up and ctrl+a event passing 2019-02-11 08:21:37 +01:00
Lukas Matena
fd4054be7e First steps on the rectangular selection for the SLA gizmo 2019-02-09 07:19:01 +01:00
YuSanka
f0cee79170 Fix of #1768 2019-02-08 17:36:38 +01:00
Enrico Turri
7662fa9a5b Temporary disable transparent bed and higher resolution bed textures 2019-02-08 16:45:03 +01:00
Enrico Turri
29137d1b3c Fixed z offset of printbed models 2019-02-08 10:19:07 +01:00
bubnikv
d0553ece0e Extended tesselation wrapper for other 3d and 2d point types. 2019-02-08 09:26:48 +01:00
Lukas Matena
4357c80793 SLA gizmo - fixed hiding of objects and instances 2019-02-06 17:27:02 +01:00
Lukas Matena
9fc75d7b34 SLA support points (better backend->frontend synchronization and more)
- backend to frontend data synchronization to inform the gizmo that new points have been generated
- fixed the inadvertent cancellation of background processing caused by the SLA gizmo touching frontend data during the process
- inactive instances of the object are hidden when the SLA gizmo is active
- fix of imgui combobox rendering
2019-02-06 15:16:25 +01:00
Enrico Turri
a2478b7faa Fixed print bed UV mapping 2019-02-06 15:11:58 +01:00
Enrico Turri
8100f562da Selection of bed texture resolution in dependence of graphic card capabilities 2019-02-06 14:55:36 +01:00
bubnikv
d31cb98fe9 Merge remote-tracking branch 'remotes/origin/master' into lm_sla_supports_auto2 2019-02-06 11:11:51 +01:00
bubnikv
6ef9c23d19 Merge branch 'master' into lm_sla_supports_auto2 2019-02-06 11:10:18 +01:00
bubnikv
72d85261fb Fix of mouse wheel scrolling over the variable layer height bar
with OSX Retina rendering.
2019-02-06 08:44:06 +01:00
bubnikv
3dc6e266ed Updated GLCanvas3D to use the tesselator through libslic3r 2019-02-05 19:45:52 +01:00
Enrico Turri
ee64ad8d1f Fixed OpenGL assert on MESA OpenGL driver due to anisotropic texture filtering not supported 2019-02-05 14:02:48 +01:00
Enrico Turri
a35b1a1850 Fix of #1772 2019-02-05 10:18:40 +01:00
bubnikv
5207d31df1 WIP: HiDPI support - 3D scene on Windows / Linux
HiDPI support on Windows - enabled in manifest.
2019-02-04 21:41:10 +01:00
Enrico Turri
b3c3881282 Calls to GLCanvas3D::_set_current() made only after the canvas has been initialized 2019-02-04 16:05:54 +01:00
bubnikv
b8d6c6bbb2 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-02-04 15:46:20 +01:00
bubnikv
ac007d4173 Platform independent delete menus 2019-02-04 15:46:12 +01:00
Enrico Turri
e43e89d495 Code cleanup 2019-02-04 15:25:22 +01:00
bubnikv
f42ce8c84a Ctrl+A is handled differently on OSX than on Windows / Linux by wxWidgets 2019-02-04 15:12:24 +01:00
Lukas Matena
9dff44a8ad SLA support gizmo does not use Grabber class anymore 2019-02-04 12:33:59 +01:00
Enrico Turri
5136ffa94b 2nd attempt to fix SPE-807 2019-02-04 12:27:44 +01:00
Enrico Turri
c31a648bf7 1st attempt to fix SPE-807 2019-02-04 10:06:15 +01:00
Enrico Turri
fe7806c7f0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes 2019-02-04 09:55:48 +01:00
bubnikv
7c5d94e0b1 Don't capture Cmd+A on OSX in Canvas, it works throug the menu accelerators. 2019-02-04 09:37:49 +01:00
Lukas Matena
d32d0a7636 Merge branch 'master' into lm_sla_supports_auto2 2019-02-04 08:41:00 +01:00
Lukas Matena
d154e75ad7 Merge branch 'master' into lm_sla_supports_auto2 2019-02-04 08:40:20 +01:00
Enrico Turri
9b9d35d90d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes 2019-02-04 08:36:28 +01:00
bubnikv
d0b1b3b3de Trying to convince OSX that we want the Control key to behave as Command
key when accessing OSX machine over VNC from a PC.
2019-02-03 17:57:55 +01:00
bubnikv
14a623f50e Removed GLCanvas3D::on_key_down() handler, as it is replaced
by the on_char() handler.
2019-02-03 14:11:09 +01:00
bubnikv
0c1f750cba The accelerators Ctrl+A, Ctrl+Del and Del were incorrectly captured
globally by being defined in the Edit menu.
These accelerators are now suppressed in the menu (shown on Windows
but inactive, not shown on OSX / Linux),
and they are now captured by the 3D scene widget instead.

Fix of ctrl-A doesn't work well #1753
2019-02-03 14:06:13 +01:00
bubnikv
5deb8fcc65 Suppressed the "Split to volumes" button in simple mode. 2019-02-03 11:15:26 +01:00
bubnikv
f050d91239 OSX specific: The Command short keys over the 3D scene toolbars
are now shown with the OSX "Command" symbols, not as "Ctrl+"
2019-02-03 11:10:25 +01:00
Lukas Matena
f568f93f08 More SLA support points improvements
- unselected objects are hidden when SLA gizmo is active
- support volumes are hidden when editing mode is active
- 3mf support points format versioning
2019-02-01 23:09:02 +01:00
Enrico Turri
e00fb7ba43 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes 2019-02-01 15:14:19 +01:00
Enrico Turri
016507f4ef Merge branch 'sidebar_fixes' of https://github.com/prusa3d/Slic3r 2019-02-01 14:32:21 +01:00
Enrico Turri
8f87ae5ca9 Added other debug output to investigate SPE-807 2019-02-01 13:15:24 +01:00