bubnikv
4a210aeecf
Vojtech's improvements in the SLA preview cutting dialog.
2019-04-11 15:44:32 +02:00
Lukas Matena
678c513cb9
Merge branch 'master' into lm_sla_gizmo_clipping_plane
2019-04-10 13:43:02 +02:00
Lukas Matena
e6439ad010
SLA gizmo fix: recalculation of the mesh was sometimes skipped
2019-04-10 13:33:58 +02:00
Lukas Matena
f71e14a4d9
SLA gizmo now uses ctrl to add to selection and alt to remove from selection
2019-04-08 15:34:42 +02:00
Lukas Matena
837bc43c9f
SLA gizmo on_set_state code is now called through CallAfter to prevent repeated wxMessageDialog appearances (seen on OSX)
2019-04-08 11:56:13 +02:00
Lukas Matena
eadf7daa37
Merge branch 'master' into lm_sla_gizmo_clipping_plane
2019-04-08 10:50:10 +02:00
Lukas Matena
09cf1b9b00
Allowed general object transformation and SLA z-shift (clipping plane)
2019-04-08 10:31:53 +02:00
Lukas Matena
7531f2d5e7
Selection rectangle now respects the clipping plane position
2019-04-08 10:31:22 +02:00
Lukas Matena
bbda1896f9
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
9b7857aaab
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
273fcf68a1
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
bc9164e40c
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
fd1f9d65fb
First steps on SLA clipping plane
2019-04-08 10:31:04 +02:00
Enrico Turri
6d9180ba92
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-04-04 09:03:25 +02:00
Lukas Matena
69027b53fd
SLA gizmo now allows to deselect a point
2019-04-03 14:44:24 +02:00
Lukas Matena
2269e1b183
Deliberately setting the SLA dialog a bit too large
...
It is not possible to precisely calculate actual window size before the rendering, so I added a safety margin.
It would be nicer to let the window autoscale and only use the inflated dimension for possible moving the window upward to prevent collision with the bottom panel, but...
ImGui autoscaling does not work properly for some reason (the window size autoscales only after a mouse move), so this is a workaround.
2019-04-03 10:41:45 +02:00
Enrico Turri
89a0c84c83
Fixed conflicts after merge with master
2019-04-02 15:13:26 +02:00
Vojtech Kral
9d5eb2cd48
Fix build
2019-04-02 10:56:30 +02:00
Lukas Matena
e20ffbfd85
SLA gizmo uses CallAfter to trigger SLA supports calculation to prevent recursive rendering calls
2019-04-02 09:36:16 +02:00
Lukas Matena
5f66a2d181
SLA gizmo dialog now respects system font settings
2019-04-01 14:51:18 +02:00
Enrico Turri
d87b478d60
Camera refactoring
...
1) All camera related OpenGL calls moved into class
2) The Camera class now stores the view matrix, the projection matrix and the viewport
3) The Camera class now exposes methods to get the camera orientation vectors, the camera position, the view matrix, the projection matrix and the viewport
4) All the code operating on the camera or requiring camera data has been modified to use the new methods
2019-04-01 10:00:10 +02:00
Enrico Turri
1ce3bb690c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-04-01 08:28:38 +02:00
Lukas Matena
32ed064797
SLA gizmo fix: occasional crashes after deleting objects
2019-03-29 13:38:33 +01:00
Enrico Turri
8459410e3c
Fixed conflicts after merge with master
2019-03-27 14:57:05 +01:00
Enrico Turri
d795f07e7b
Added glsafe() around OpenGL calls where missing
2019-03-27 14:42:09 +01:00
Lukas Matena
490074a2dd
SLA gizmo now turns off in case someone adds an object/instance (to prevent rendering points in thin air, etc.)
...
Also, a bug appering when adding an object larger than the bed and scaling it down was fixed (sla gizmo did not work correctly in that case)
2019-03-27 14:19:12 +01:00
Enrico Turri
3818bfa19a
1st installment of gizmos refactoring
...
1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager
2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)
2019-03-26 09:01:04 +01:00
Lukas Matena
3f7f8f978e
Fix of sla gizmo (it sometimes showed supports for hidden objects)
2019-03-24 13:35:09 +01:00
Lukas Matena
0848617fd3
SLA gizmo fix: adding points to selection by Shift+click should now work again (was broken by 8466c55
)
2019-03-22 10:56:51 +01:00
Enrico Turri
3a923b7121
Fixed conflicts after merge with master
2019-03-20 16:09:14 +01:00
Lukas Matena
8b73608e9f
SLA gizmo can be activated if the supports are outside the bed
...
Otherwise there is a possibility that the object gets out of bed when the gizmo is active (supports are generated with object close to the edge), which the gizmo does not expect
2019-03-20 15:37:13 +01:00
Lukas Matena
8466c55b78
SLA gizmo - points are added on leftdown event, not leftup as before
2019-03-20 14:04:59 +01:00
Enrico Turri
d23824af97
GLCanvas3D::Gizmos as a standalone class (GLGizmosManager)
2019-03-20 13:51:25 +01:00
Lukas Matena
2728e45646
Renamed function mouse_event to gizmo_event
2019-03-20 13:44:34 +01:00
Lukas Matena
4ceba39d99
Decreased number of polygons on the SLA support point marks for faster rendering
2019-03-20 10:13:16 +01:00
Enrico Turri
80c1a8d8e4
GLCanvas3D::Selection as a standalone class
2019-03-19 13:30:21 +01:00
Lukas Matena
e813a562a1
Removed technology ENABLE_IMGUI
2019-03-18 11:45:15 +01:00
Lukas Matena
d3c8e3166e
Separated gizmos into individual files
2019-03-18 11:45:15 +01:00