Commit Graph

372 Commits

Author SHA1 Message Date
ebd11c3f7c Merge remote-tracking branch 'origin/ys_hdpi' 2019-02-20 16:20:30 +01:00
e17d655218 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
6af7bcf329 SLA gizmo can be deselected by clicking in canvas area (unless in editing mode) 2019-02-20 09:59:59 +01:00
e7bddf8649 SLA gizmo asks about saving changes, right button click removes points 2019-02-19 13:47:28 +01:00
f25c10e02e Merge branch 'master' into lm_sla_supports_auto2 2019-02-19 10:15:16 +01:00
7b6321e5e8 Code cleanup 2019-02-18 15:41:12 +01:00
d205abe9ed Added debug output to investigate further #1788 2019-02-18 15:41:04 +01:00
d5ca1b4930 2nd attempt to fix #1788 2019-02-18 15:40:58 +01:00
c0427aa3b8 1st attempt to fix #1788 2019-02-18 15:40:51 +01:00
d22d545e88 SLA gizmo - fixed support points rendering (depth is now correctly accounted for) 2019-02-18 11:59:47 +01:00
f097d24c56 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
f37cacb0c7 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
5af4b2319e SLA gizmo - shift-up and ctrl+a event passing 2019-02-11 08:21:37 +01:00
79067a6d6d First steps on the rectangular selection for the SLA gizmo 2019-02-09 07:19:01 +01:00
cab3dff066 Fix of #1768 2019-02-08 17:36:38 +01:00
213174e342 Temporary disable transparent bed and higher resolution bed textures 2019-02-08 16:45:03 +01:00
dc281b63ed Fixed z offset of printbed models 2019-02-08 10:19:07 +01:00
469d12f9cf Extended tesselation wrapper for other 3d and 2d point types. 2019-02-08 09:26:48 +01:00
e768ab3613 SLA gizmo - fixed hiding of objects and instances 2019-02-06 17:27:02 +01:00
f0bfcd1862 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
a56ab614d1 Fixed print bed UV mapping 2019-02-06 15:11:58 +01:00
6713f28a1a Selection of bed texture resolution in dependence of graphic card capabilities 2019-02-06 14:55:36 +01:00
464f0ef65f Merge remote-tracking branch 'origin/master' into ys_hdpi 2019-02-06 11:12:44 +01:00
4c22950d5f Merge remote-tracking branch 'remotes/origin/master' into lm_sla_supports_auto2 2019-02-06 11:11:51 +01:00
2e18fd3f74 Merge branch 'master' into lm_sla_supports_auto2 2019-02-06 11:10:18 +01:00
4d0a06d5ad Fixed a scale for the LegendTexture in a Preview 2019-02-06 10:55:11 +01:00
8d9cc5ec19 Fix of mouse wheel scrolling over the variable layer height bar
with OSX Retina rendering.
2019-02-06 08:44:06 +01:00
d74c4a0fb6 Updated GLCanvas3D to use the tesselator through libslic3r 2019-02-05 19:45:52 +01:00
f38cfd6fd5 Fixed OpenGL assert on MESA OpenGL driver due to anisotropic texture filtering not supported 2019-02-05 14:02:48 +01:00
134dd8aee2 Fix of #1772 2019-02-05 10:18:40 +01:00
c3340d7bcc WIP: HiDPI support - 3D scene on Windows / Linux
HiDPI support on Windows - enabled in manifest.
2019-02-04 21:41:10 +01:00
aad50fb56a Calls to GLCanvas3D::_set_current() made only after the canvas has been initialized 2019-02-04 16:05:54 +01:00
b6620bfe87 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-02-04 15:46:20 +01:00
cccc66dd40 Platform independent delete menus 2019-02-04 15:46:12 +01:00
1a078ee7b9 Code cleanup 2019-02-04 15:25:22 +01:00
96504b77e7 Ctrl+A is handled differently on OSX than on Windows / Linux by wxWidgets 2019-02-04 15:12:24 +01:00
1e3a23a846 SLA support gizmo does not use Grabber class anymore 2019-02-04 12:33:59 +01:00
12a17ecba4 2nd attempt to fix SPE-807 2019-02-04 12:27:44 +01:00
4d06283fc8 1st attempt to fix SPE-807 2019-02-04 10:06:15 +01:00
bb96446503 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes 2019-02-04 09:55:48 +01:00
38576c4d10 Don't capture Cmd+A on OSX in Canvas, it works throug the menu accelerators. 2019-02-04 09:37:49 +01:00
fe15fed998 Merge branch 'master' into lm_sla_supports_auto2 2019-02-04 08:41:00 +01:00
30354e62b0 Merge branch 'master' into lm_sla_supports_auto2 2019-02-04 08:40:20 +01:00
edd4694699 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes 2019-02-04 08:36:28 +01:00
8baf51c654 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
3e34d4ccf5 Removed GLCanvas3D::on_key_down() handler, as it is replaced
by the on_char() handler.
2019-02-03 14:11:09 +01:00
23849e17b2 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
d927980161 Suppressed the "Split to volumes" button in simple mode. 2019-02-03 11:15:26 +01:00
f3cbf783bb 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
5f3f6e8fe6 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