Commit Graph

517 Commits

Author SHA1 Message Date
952bbf4259 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
a5018c94b8 GLCanvas3D: Fix an assert in _set_current() 2019-04-09 15:16:10 +02:00
0fb218d6ce Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
e2d6ce9bc5 Finished SLA print / material correction visualization. 2019-04-08 18:09:31 +02:00
1d1c26da1c Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
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
11c0507c8d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
e2e6853e7c Disabled layer editing mode for SLA 2019-04-05 09:51:58 +02:00
e78603125b Fixed conflicts after merge with master 2019-04-03 08:38:32 +02:00
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
79440f42a7 imgui: Fix font size and scaling on Windows 2019-04-02 15:28:14 +02:00
8f1d9b7703 Fixed conflicts after merge with master 2019-04-02 15:13:26 +02:00
5cd1012dab Fixed rendering of sla cap slices after deleting object 2019-04-02 14:43:38 +02:00
53ccd309c9 Fixed conflicts after cherry-picking 5c89135 2019-04-02 14:32:12 +02:00
6881112f3b Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-02 13:54:46 +02:00
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
e7f991d27b imgui: More refactoring, cut gizmo window positioning 2019-04-02 10:36:24 +02:00
98bf41f335 imgui: Refactor font size, font initialization 2019-04-01 14:28:39 +02:00
b440d60d91 Fixed conflicts after merge with master 2019-04-01 14:21:55 +02:00
ab972a0251 Merge branch 'tm_reuse_unified' 2019-04-01 12:24:50 +02:00
a374de367f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 11:40:08 +02:00
a26faa56cf Fix of No preview of position in variable layer editing UI at retina resolution #2050 2019-04-01 11:08:26 +02:00
0f657b772b 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
e4832bad3f 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
4e27e57750 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 09:30:23 +01:00
fd9fd3ec0c Layers editing initialized only for 3D view and not for g-code preview 2019-03-28 09:12:32 +01:00
5b53dd164d Selection enabled only for 3D view and not for g-code preview 2019-03-28 08:44:46 +01:00
0cb2196767 Fixed conflicts after merge with master 2019-03-27 14:57:05 +01:00
910605864a Added glsafe() around OpenGL calls where missing 2019-03-27 14:42:09 +01:00
846837e02f 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
6c5fb6430d Integrating new step, removing old and unused steps. 2019-03-27 10:59:29 +01:00
00e19f6bd7 Fixed selection lost when Place on Face gizmo is active and user click on another object 2019-03-27 09:06:53 +01:00
0426ff1122 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 08:33:48 +01:00
fccf1692d8 Fixing broken statistics. 2019-03-26 16:45:04 +01:00
9fd9572691 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
871c365cc7 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
0119df2dfc Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 14:08:46 +01:00
ae402c1010 Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
e3fa7b15be Code cleanup 2019-03-26 12:39:40 +01:00
a6a344a014 Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00
b1a331e43a Merging with master, solving conflicts. 2019-03-26 11:13:28 +01:00
d2c0d2641c Further refactor and simplification of slice index and print data. 2019-03-26 10:57:45 +01:00
4d1f8d0d46 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-26 10:39:08 +01:00
df51a16ffe 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
48f4831ffc Code cleanup 2019-03-26 09:10:35 +01:00
0337ac0839 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
811c781852 Refactoring and commenting slice index solution. 2019-03-25 19:02:05 +01:00
1429a24af3 Fix of sla gizmo (it sometimes showed supports for hidden objects) 2019-03-24 13:35:09 +01:00
83c1e83181 Fixed the SLA layer preview. 2019-03-22 21:26:58 +01:00
65a1eb7d3f Merge branch 'master' into tm_slice_index 2019-03-22 15:31:58 +01:00