Commit Graph

10033 Commits

Author SHA1 Message Date
f53a865fab Merge remote-tracking branch 'remotes/origin/master' into tm_relative_correction 2019-04-08 14:00:27 +02:00
09c8a09fab Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-08 13:35:22 +02:00
9ab83d31bc Fixed rotation of SLA instances in case a rotation in X or Y was applied
to the instances.
2019-04-08 13:35:03 +02:00
2cf6509918 Set "cog" ison for sla_print preset 2019-04-08 12:29:08 +02:00
601bbe4242 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
989aaf086c Implement per-screen DPI on Windows, DPI change event, wxDialog & wxFrame mixin base classes 2019-04-08 11:34:46 +02:00
2e64e559ea Fixed crash under oSX after selection with SHIFT from 3DScene 2019-04-08 11:10:57 +02:00
8dc3dc3d4b Icon updating for all application 2019-04-08 11:10:57 +02:00
0a963c1768 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-08 10:50:10 +02:00
13cdbe8743 Allowed general object transformation and SLA z-shift (clipping plane) 2019-04-08 10:31:53 +02:00
ad270a6d46 Selection rectangle now respects the clipping plane position 2019-04-08 10:31:22 +02:00
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
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
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
d5dc3a031f SLA gizmo now respects the clipping plane when rendering points and raycasting mouse onto mesh 2019-04-08 10:31:10 +02:00
5019395992 First steps on SLA clipping plane 2019-04-08 10:31:04 +02:00
6212300fc5 Follow-up of a7318dbe19 -> Do not disable other instances when an instance is selected 2019-04-08 09:49:21 +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
a56c2d1ade Fixed Typo for the last commit 2019-04-05 12:18:58 +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
c2e97e6cfc Export to stl of instances 2019-04-05 11:30:49 +02:00
e51ebadb09 Merge remote-tracking branch 'origin/ys_selection' 2019-04-05 11:25:29 +02:00
e3632e735c Some improvements for a loading of icons 2019-04-05 11:18:59 +02:00
85a6ac60de Follow-up of 763a91e2ca -> take in account of ModelObject::origin_translation when saving parts and modifiers to stl 2019-04-05 10:08:34 +02:00
e2e6853e7c Disabled layer editing mode for SLA 2019-04-05 09:51:58 +02:00
9ab855a6bf Added missed code for my last commit 2019-04-05 09:04:52 +02:00
009dc80af8 Implemented new logic for Instances splitting 2019-04-04 18:03:40 +02:00
40c5bbc0aa Improved Selection from ObjectList side 2019-04-04 18:03:40 +02:00
b62ee0d714 Fix for leaving the object outside bed after "optimize orientation" 2019-04-04 16:03:23 +02:00
812cf8405e Export to stl of parts and modifiers 2019-04-04 15:13:43 +02:00
a825788c59 Merge remote-tracking branch 'origin/master' into ys_selection 2019-04-04 15:09:37 +02:00
f925aa3dbf Fixed non-consistency of the selection 2019-04-04 15:07:54 +02:00
f1ff568fb1 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 14:00:48 +02:00
3ecd0dd48d Use current selection to determine proposed filename when exporting to stl files 2019-04-04 14:00:31 +02:00
c8cca95e25 SLA export: Finalize filename when exporting & uploading,
set correct project name when uploading
2019-04-04 13:10:11 +02:00
7665c74da8 GLGizmoCut: Scale input field 2019-04-04 12:31:13 +02:00
70c144347e Ask user to switch to expert mode when loading a 3mf or an amf file containing instances or modifiers from simple mode 2019-04-04 12:02:13 +02:00
d7d664727d Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 11:31:44 +02:00
f1284ed8ec Removed 'Export print config' checkbox from save dialog for 3mf and amf files 2019-04-04 11:31:26 +02:00
9204324109 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 09:41:23 +02:00
2054073d00 Select newly added parts/volumes from current selected instance when adding from 3D scene's context menu 2019-04-04 09:35:13 +02:00
29dfd914f9 Code to load SVG icons into the BitmapCache class. 2019-04-04 09:20:11 +02:00
d2a4fba1cd Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-04 09:03:25 +02:00
af4c7a1d45 Keeps non selected instances as disabled for any combination of current instance's volumes selection 2019-04-04 09:01:47 +02:00
e3171322d3 Scaling correction parameters in material and print conf.
Scaling is applied in sla_trafo but no effect unless set before model import.
2019-04-03 17:34:46 +02:00
1c762dcd78 imgui: Fix scaling 2019-04-03 16:39:28 +02:00
53e40cc049 imgui: Yet another font size fix 2019-04-03 16:31:49 +02:00
6e5506f259 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-03 15:28:27 +02:00
d226efefe2 Keep instance mode selection when at least one instance is already selected 2019-04-03 15:28:09 +02:00