Commit Graph

564 Commits

Author SHA1 Message Date
Enrico Turri
276d5384c0 Rectangle selection -> Removed cursor change 2019-04-29 08:26:08 +02:00
Enrico Turri
ee96cb5f98 Rectangle selection in 3D scene -> Fixed selection cleared when mouse left-up follows shift-up 2019-04-26 14:07:46 +02:00
Enrico Turri
f772e37a40 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 13:38:34 +02:00
Enrico Turri
5c0679bfbb Rectangle selection in 3D scene -> tweaks to hovering detection and selection update logic 2019-04-26 13:37:34 +02:00
YuSanka
3b503cfa9a Fixed default font for legends in respect to the OS 2019-04-26 13:08:25 +02:00
Enrico Turri
ae35aea425 Small optimization 2019-04-25 15:08:14 +02:00
Enrico Turri
c9988ada28 Small refactoring 2019-04-25 13:41:00 +02:00
Enrico Turri
0b351692d7 Attempt to fix build on Linux 2019-04-25 13:35:24 +02:00
Enrico Turri
d248f129c1 Rectangle selection in 3D scene -> selection update 2019-04-25 12:31:55 +02:00
Enrico Turri
c0a6b66b49 Rectangle selection in 3D scene -> tweaks to the hovering detection logic 2019-04-25 11:50:30 +02:00
Enrico Turri
625a3d93b0 Added imgui debug dialog for render statistics 2019-04-25 11:10:01 +02:00
Enrico Turri
8163b5d238 Rectangle selection in 3D scene -> refactored GLVolume member varialbe for hovering 2019-04-25 10:21:24 +02:00
Enrico Turri
c0b3cf452a Rectangle selection in 3D scene -> hovering detection 2019-04-25 09:46:26 +02:00
Enrico Turri
cb278c5828 Rectangle selection in 3D scene -> rendering 2019-04-25 09:10:03 +02:00
Enrico Turri
87bfd95bba Fixed conflicts after merge with master 2019-04-25 08:12:48 +02:00
YuSanka
0da12d08fd Big Refactoring: - deleted/renamed all _Prusa_ prefixes,
- cleaned code from commented parts
 - rescale() -> msw_rescale()
2019-04-25 01:45:00 +02:00
Enrico Turri
adac77ca39 GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection 2019-04-24 15:43:52 +02:00
Enrico Turri
d31610c5b7 int GLCanvas3D::m_hover_volume_id replaced with std::vector<int> GLCanvas3D::m_hover_volume_idxs 2019-04-24 15:07:28 +02:00
YuSanka
22a6293f31 Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-18 15:33:50 +02:00
YuSanka
6f3fbe34bb Merge remote-tracking branch 'origin/ys_bug_fixing' into ys_msw_dpi 2019-04-18 15:24:50 +02:00
Lukas Matena
0cd5bb0338 SLA clipping plane can now be controlled by Ctrl + mouse wheel rotation 2019-04-17 14:27:20 +02:00
Enrico Turri
cfabd6ceab Ctrl+C and Ctrl+V for Copy and Paste refactored in the same way as Ctrl+A for Select All 2019-04-16 13:47:37 +02:00
YuSanka
8c62f0ee51 Application Scaling for MSW:
+ Experiments with toolBars scaling
+ Rescaled warning and printing legends
2019-04-16 12:13:45 +02:00
Enrico Turri
d3fb58d4e8 Switch to regular shading when manipulating an object with gizmos while layers editing is active 2019-04-16 08:50:46 +02:00
Enrico Turri
e013d34109 Fixed glitches in rendering when activating layers editing 2019-04-15 14:19:18 +02:00
Enrico Turri
42a1f617c9 Fixed selection when right-clicking in the 3D scene to show the context menu 2019-04-15 10:27:40 +02:00
bubnikv
d8a22aa2d9 Fix of "Variable layer height feature breaks after rotating part #2073"
There was an approximate bounding box used at the GUI, while a snug
bounding box was used at the back end, causing invalidation
of the variable layer height editing profile on rotated objects.

A snug bounding box around the first instance is now cached.
2019-04-13 14:15:54 +02:00
bubnikv
dd67715ea1 Fixed SLA clippling plane & picking. 2019-04-12 16:08:40 +02:00
Enrico Turri
6b84f44bd1 Offset used to place newly added volumes and instances proportional to the bed max size 2019-04-12 15:31:33 +02:00
Enrico Turri
d062297e4d Copy and paste -> Fixed tooltips for copy and paste toolbar items on Mac 2019-04-12 08:57:53 +02:00
Enrico Turri
1f6d671abb Fixed conflicts after merge with master 2019-04-12 08:41:59 +02:00
bubnikv
0bcbdcdc5c Merge branch 'lm_sla_gizmo_clipping_plane' 2019-04-11 15:45:49 +02:00
bubnikv
8ad52f0461 Vojtech's improvements in the SLA preview cutting dialog. 2019-04-11 15:44:32 +02:00
Enrico Turri
61ef36805f Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri
9a5176b4cf Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 14:03:57 +02:00
Enrico Turri
82d9ee4392 Fixed crash when typing on keyboard during the app start-up 2019-04-10 13:52:18 +02:00
Lukas Matena
ba1bfa9e66 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
Enrico Turri
db18c6b2b2 Do not show as hovered the entire instance when hovering on modifiers 2019-04-10 12:20:07 +02:00
Enrico Turri
44b450633f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 11:20:28 +02:00
Enrico Turri
fccab8e195 Render picking pass renders volumes in the same order as the regular render pass 2019-04-10 11:20:09 +02:00
bubnikv
27c9c15222 Fixed Cmd-A selection in the SLA gizmo. 2019-04-10 10:16:04 +02:00
Enrico Turri
952bbf4259 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
Vojtech Kral
a5018c94b8 GLCanvas3D: Fix an assert in _set_current() 2019-04-09 15:16:10 +02:00
Enrico Turri
0fb218d6ce Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
bubnikv
e2d6ce9bc5 Finished SLA print / material correction visualization. 2019-04-08 18:09:31 +02:00
Lukas Matena
0a963c1768 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-08 10:50:10 +02:00
Lukas Matena
579b44c479 The gizmo is now able to triangulate and show the cut, the triangulated cut is cached 2019-04-08 10:31:19 +02:00
Lukas Matena
6bd7749192 SLA gizmo clipping plane logic moved to fragment shader
This means the clipping now works again with both legacy and modern OpenGL
2019-04-08 10:31:16 +02:00
Lukas Matena
c3f4f85b4a SLA gizmo now uses glClipPlane instead of touching projection matrix
Messing with the projection matrix invalidates the z-buffer
This currently only works in OpenGL legacy mode
2019-04-08 10:31:13 +02:00
Lukas Matena
d5dc3a031f SLA gizmo now respects the clipping plane when rendering points and raycasting mouse onto mesh 2019-04-08 10:31:10 +02:00