Commit Graph

921 Commits

Author SHA1 Message Date
a13b2b1de3 Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
4904359399 Finished SLA print / material correction visualization. 2019-04-08 18:09:31 +02:00
eadf7daa37 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-08 10:50:10 +02:00
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
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
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
bc9164e40c SLA gizmo now respects the clipping plane when rendering points and raycasting mouse onto mesh 2019-04-08 10:31:10 +02:00
fd1f9d65fb First steps on SLA clipping plane 2019-04-08 10:31:04 +02:00
a688493d91 Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
8cdc461d34 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
6ca49c05df Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
177f5b02fa Disabled layer editing mode for SLA 2019-04-05 09:51:58 +02:00
48da4d4756 Fixed conflicts after merge with master 2019-04-03 08:38:32 +02:00
eeae1c0495 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
1979baf619 imgui: Fix font size and scaling on Windows 2019-04-02 15:28:14 +02:00
89a0c84c83 Fixed conflicts after merge with master 2019-04-02 15:13:26 +02:00
ba4f0445c3 Fixed rendering of sla cap slices after deleting object 2019-04-02 14:43:38 +02:00
f147da1e5d Fixed conflicts after cherry-picking 5c89135 2019-04-02 14:32:12 +02:00
dc64b4d971 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-02 13:54:46 +02:00
086f11df98 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
c542413962 imgui: More refactoring, cut gizmo window positioning 2019-04-02 10:36:24 +02:00
88cc93cdc9 imgui: Refactor font size, font initialization 2019-04-01 14:28:39 +02:00
83aaa471cf Fixed conflicts after merge with master 2019-04-01 14:21:55 +02:00
50942e9382 Merge branch 'tm_reuse_unified' 2019-04-01 12:24:50 +02:00
7cfcf8fb9a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 11:40:08 +02:00
62539bc35b Fix of No preview of position in variable layer editing UI at retina resolution #2050 2019-04-01 11:08:26 +02:00
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
725f115756 Merging with master for having minz png compression.
Much greater performance boost from better compression algorithm than that from the merged polygons.
2019-03-29 15:21:46 +01:00
af3a32b8a0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 09:30:23 +01:00
98a848d239 Layers editing initialized only for 3D view and not for g-code preview 2019-03-28 09:12:32 +01:00
a4f404a6a4 Selection enabled only for 3D view and not for g-code preview 2019-03-28 08:44:46 +01:00
8459410e3c Fixed conflicts after merge with master 2019-03-27 14:57:05 +01:00
d795f07e7b Added glsafe() around OpenGL calls where missing 2019-03-27 14:42:09 +01:00
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
bc74761513 Integrating new step, removing old and unused steps. 2019-03-27 10:59:29 +01:00
3cd6db2278 Fixed selection lost when Place on Face gizmo is active and user click on another object 2019-03-27 09:06:53 +01:00
000542f48d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 08:33:48 +01:00
4d8800bc8a Fixing broken statistics. 2019-03-26 16:45:04 +01:00
fee0a6b6b5 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
47c39f51e5 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
52f11a6f0d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 14:08:46 +01:00
d18208458b Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
c1d74d2943 Code cleanup 2019-03-26 12:39:40 +01:00
eafdcb04ba Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00
a49643ebdb Merging with master, solving conflicts. 2019-03-26 11:13:28 +01:00
57e28b53f2 Further refactor and simplification of slice index and print data. 2019-03-26 10:57:45 +01:00
82321c7aee Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-26 10:39:08 +01:00
e0e1e2b682 Improved SLA layer view: Low layer shall be rendered from the slice above,
triangulated slices are shifted slightly away from the clipping planes.

FDM: Ported a "(bridged)" G-code comment from upstream.
2019-03-26 10:38:50 +01:00
a09197879d Code cleanup 2019-03-26 09:10:35 +01:00
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