Commit Graph

548 Commits

Author SHA1 Message Date
Enrico Turri
71b6855c0d 1st installment of selection rectangle in 3D scene 2019-04-18 10:05:18 +02:00
Enrico Turri
13faee58ca Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-17 14:48:52 +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
ce4dda0ac8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-16 13:56:03 +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
Enrico Turri
aeb1e84248 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-16 10:11:40 +02:00
Enrico Turri
6d201cc62e Added debug imgui dialog for render statistics 2019-04-16 10:11:17 +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
Lukas Matena
5019395992 First steps on SLA clipping plane 2019-04-08 10:31:04 +02:00
Enrico Turri
1d1c26da1c Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
Enrico Turri
51eb727691 CTRL-click replace SHIFT-click for addind/removing objects to the current selection from the 3D scene 2019-04-08 08:30:28 +02:00
Enrico Turri
11c0507c8d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
Lukas Matena
e2e6853e7c Disabled layer editing mode for SLA 2019-04-05 09:51:58 +02:00
Enrico Turri
e78603125b Fixed conflicts after merge with master 2019-04-03 08:38:32 +02:00
bubnikv
c86433271e Fixed update of the SLAPrint back end after mirroring in a specific
case of mirroring around the X axis.
Fixed some asserts on visual studio due to access to empty std::vector
2019-04-02 18:04:23 +02:00
Vojtech Kral
79440f42a7 imgui: Fix font size and scaling on Windows 2019-04-02 15:28:14 +02:00
Enrico Turri
8f1d9b7703 Fixed conflicts after merge with master 2019-04-02 15:13:26 +02:00
Enrico Turri
5cd1012dab Fixed rendering of sla cap slices after deleting object 2019-04-02 14:43:38 +02:00
Enrico Turri
53ccd309c9 Fixed conflicts after cherry-picking 5c89135 2019-04-02 14:32:12 +02:00
bubnikv
6881112f3b Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-02 13:54:46 +02:00
bubnikv
99f0207578 Handling of left hand oriented coordinate systems:
is_left_handed() method on transformations and volumes
rendering of GLVolumes in left handed coordinate systems by glFrontFace(GL_CW);
SLA slicing on left hand oriented instances by flipping the mesh for SLAPrintObject in X.
rendering of the SLA cutting plane in left handed systems
resetting the SLA clipping planes on 3D preview invalidation
2019-04-02 13:47:49 +02:00
Vojtech Kral
e7f991d27b imgui: More refactoring, cut gizmo window positioning 2019-04-02 10:36:24 +02:00
Vojtech Kral
98bf41f335 imgui: Refactor font size, font initialization 2019-04-01 14:28:39 +02:00
Enrico Turri
b440d60d91 Fixed conflicts after merge with master 2019-04-01 14:21:55 +02:00