3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,282 Commits 1 Branch 1 Tag 249 MiB
47f27d20f1
Commit Graph

1680 Commits

Author SHA1 Message Date
Enrico Turri
4718c839f6 Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri
bd2ac8f1f8 Copy and paste -> Added offset to pasted objects/volumes 2019-04-11 11:27:15 +02:00
Enrico Turri
99993170eb Copy and paste -> Fixed copy of multiple instances and volumes insertion into objects list 2019-04-11 11:09:32 +02:00
Enrico Turri
4987e5a7d5 Render selected objects first 2019-04-11 08:36:00 +02:00
Enrico Turri
b98659a749 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 15:55:52 +02:00
Enrico Turri
8b9568797a Copy and paste -> prototype of copy and paste for objects 2019-04-10 15:55:32 +02:00
Lukas Matena
096d23f971 SLA gizmo fix: Discarding manual edits on autogenerated points removed all the points from the gizmo cache 2019-04-10 15:27:44 +02:00
Enrico Turri
1b6bf30e76 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 14:03:57 +02:00
Enrico Turri
7a1fab09d4 Copy and paste -> Clipboard refactored to accept more than one object 2019-04-10 14:03:40 +02:00
Enrico Turri
2dc88ab0be Fixed crash when typing on keyboard during the app start-up 2019-04-10 13:52:18 +02:00
Lukas Matena
678c513cb9 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
bubnikv
9fd8461592 Changed the scene update on RELOAD_SLA_SUPPORT_POINTS 
to delay the loading if some transformation gizmo is in action.
 2019-04-10 13:36:15 +02:00
Lukas Matena
e6439ad010 SLA gizmo fix: recalculation of the mesh was sometimes skipped 2019-04-10 13:33:58 +02:00
Enrico Turri
a80978f84a Do not show as hovered the entire instance when hovering on modifiers 2019-04-10 12:20:07 +02:00
Enrico Turri
43b51c338e Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 12:17:13 +02:00
Enrico Turri
356637a627 Do not activate Delete command when the wipe tower is selected 2019-04-10 12:16:17 +02:00
Enrico Turri
6043dbd07d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 11:20:28 +02:00
Enrico Turri
e61be7d260 Render picking pass renders volumes in the same order as the regular render pass 2019-04-10 11:20:09 +02:00
bubnikv
f4c8f91519 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-10 10:16:12 +02:00
bubnikv
7b8b8b97ef Fixed Cmd-A selection in the SLA gizmo. 2019-04-10 10:16:04 +02:00
YuSanka
a74c608c7a Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-10 10:01:20 +02:00
YuSanka
82573390c7 First scaling experiments 2019-04-10 09:57:33 +02:00
Enrico Turri
50fc406fe2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:46:24 +02:00
YuSanka
7b54c59b61 Added new icons 2019-04-10 09:41:04 +02:00
Enrico Turri
6f6b78d661 Copy and paste -> Copy a volume from an object and paste to another 2019-04-10 09:27:42 +02:00
Enrico Turri
6cbf9d2523 1st installment of copy and paste -> prototype for volumes copy and paste 2019-04-10 08:40:58 +02:00
tamasmeszaros
53861b2012 Removing separate X and Y relative correction. 2019-04-09 18:15:25 +02:00
Vojtech Kral
81f4ce5f2e Bitmaps: Pass wxWindow context in a few more places 2019-04-09 18:01:45 +02:00
Vojtech Kral
d399ebacc9 Bitmaps: Fix: Use scaling factor on Mac only 2019-04-09 18:01:45 +02:00
bubnikv
d383f3591d Switching to the preview screen when the "Slice now" button is pressed. 
Let's wait for the response of the beta testers whether it is a good
idea.
 2019-04-09 17:15:14 +02:00
Enrico Turri
7aa6c1854f Follow-up to af05e5fc2c -> added missing #else 2019-04-09 15:43:16 +02:00
Enrico Turri
0889877e26 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
Vojtech Kral
c17e8602ed Factor out load_scaled_bitmap 2019-04-09 15:16:10 +02:00
Vojtech Kral
64ce604ff4 GUI_App: Refactor exception handling 2019-04-09 15:16:10 +02:00
Vojtech Kral
2494dc6706 Fix SVG & bitmap scaling on Mac depending on Retina scaling 2019-04-09 15:16:10 +02:00
Vojtech Kral
d97037e246 GLCanvas3D: Fix an assert in _set_current() 2019-04-09 15:16:10 +02:00
tamasmeszaros
c702ddc65d Adding absolute correction (XY offset) and gamma correction parameters. 2019-04-09 13:42:32 +02:00
bubnikv
d8cb1b0792 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-09 13:13:57 +02:00
bubnikv
6bd54f0112 Hopefully fixing the "scroll to the first selected line" issue 
at the object list.
 2019-04-09 13:13:42 +02:00
Enrico Turri
24b8c1fde3 Forced one frame render after selecting single volume in objects list 2019-04-09 11:38:56 +02:00
Enrico Turri
a13b2b1de3 Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
bubnikv
7c75081a31 Changed the hot key in the keyboard shortcuts dialog for plater 
Ctrl+Left mouse for selection.
 2019-04-09 10:46:32 +02:00
bubnikv
0c7e351eb7 Fix of SPE-896 "SLA preview is not invalidated when profile is changed" 2019-04-09 10:41:42 +02:00
bubnikv
1fffae4e0b A little refactoring of loading meshes in VBO / non VBO case. 2019-04-08 18:11:36 +02:00
bubnikv
4904359399 Finished SLA print / material correction visualization. 2019-04-08 18:09:31 +02:00
bubnikv
28d999bc04 Merge remote-tracking branch 'remotes/origin/master' into tm_relative_correction 2019-04-08 16:02:05 +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
bubnikv
0de084df8d Merge remote-tracking branch 'remotes/origin/master' into tm_relative_correction 2019-04-08 14:00:27 +02:00
bubnikv
fa890c2bbc Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-08 13:35:22 +02:00
bubnikv
ca6a5af1dc 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
YuSanka
e0340f4f81 Set "cog" ison for sla_print preset 2019-04-08 12:29:08 +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
Vojtech Kral
7e32f2df71 Implement per-screen DPI on Windows, DPI change event, wxDialog & wxFrame mixin base classes 2019-04-08 11:34:46 +02:00
YuSanka
af05e5fc2c Fixed crash under oSX after selection with SHIFT from 3DScene 2019-04-08 11:10:57 +02:00
YuSanka
618d124bfb Icon updating for all application 2019-04-08 11:10:57 +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
09c7eb1d28 Follow-up of a7318dbe19 -> Do not disable other instances when an instance is selected 2019-04-08 09:49:21 +02:00
Enrico Turri
a688493d91 Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
Enrico Turri
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
YuSanka
d31590f438 Fixed Typo for the last commit 2019-04-05 12:18:58 +02:00
Enrico Turri
6ca49c05df Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
Enrico Turri
233eda2813 Export to stl of instances 2019-04-05 11:30:49 +02:00
YuSanka
0c662e298f Merge remote-tracking branch 'origin/ys_selection' 2019-04-05 11:25:29 +02:00
YuSanka
ef5281c3c9 Some improvements for a loading of icons 2019-04-05 11:18:59 +02:00
Enrico Turri
a9223aeb5f 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
Lukas Matena
177f5b02fa Disabled layer editing mode for SLA 2019-04-05 09:51:58 +02:00
YuSanka
77dcb7f5a3 Added missed code for my last commit 2019-04-05 09:04:52 +02:00
YuSanka
ccee04cd68 Implemented new logic for Instances splitting 2019-04-04 18:03:40 +02:00
YuSanka
8631cb006b Improved Selection from ObjectList side 2019-04-04 18:03:40 +02:00
tamasmeszaros
b56991d780 Fix for leaving the object outside bed after "optimize orientation" 2019-04-04 16:03:23 +02:00
Enrico Turri
763a91e2ca Export to stl of parts and modifiers 2019-04-04 15:13:43 +02:00
YuSanka
63dea6d5dc Merge remote-tracking branch 'origin/master' into ys_selection 2019-04-04 15:09:37 +02:00
YuSanka
09054a0bc9 Fixed non-consistency of the selection 2019-04-04 15:07:54 +02:00
Enrico Turri
24128e01ed Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 14:00:48 +02:00
Enrico Turri
6197f48321 Use current selection to determine proposed filename when exporting to stl files 2019-04-04 14:00:31 +02:00
Vojtech Kral
70ce79c86e SLA export: Finalize filename when exporting & uploading, 
set correct project name when uploading
 2019-04-04 13:10:11 +02:00
Vojtech Kral
251747e6fa GLGizmoCut: Scale input field 2019-04-04 12:31:13 +02:00
Enrico Turri
369cdd8b3b 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
Enrico Turri
c7d6691658 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 11:31:44 +02:00
Enrico Turri
30f44880d7 Removed 'Export print config' checkbox from save dialog for 3mf and amf files 2019-04-04 11:31:26 +02:00
bubnikv
39ce4c33a4 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 09:41:23 +02:00
Enrico Turri
936f7a3b84 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
bubnikv
a36bdefda5 Code to load SVG icons into the BitmapCache class. 2019-04-04 09:20:11 +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
Enrico Turri
a7318dbe19 Keeps non selected instances as disabled for any combination of current instance's volumes selection 2019-04-04 09:01:47 +02:00
tamasmeszaros
c6b5fe05e4 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
Vojtech Kral
703b9bda32 imgui: Fix scaling 2019-04-03 16:39:28 +02:00
Vojtech Kral
c99fe20504 imgui: Yet another font size fix 2019-04-03 16:31:49 +02:00
Enrico Turri
305b07978c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-03 15:28:27 +02:00
Enrico Turri
28ec3415eb Keep instance mode selection when at least one instance is already selected 2019-04-03 15:28:09 +02:00
Lukas Matena
69027b53fd SLA gizmo now allows to deselect a point 2019-04-03 14:44:24 +02:00
Enrico Turri
7d488e3424 Added call to schedule_background_process() when deleting modifier attribute 2019-04-03 12:45:06 +02:00
bubnikv
527c213b57 Fixed cutting of objects in left oriented coordinate space. 
Removed some spurious debugging printf.
 2019-04-03 12:07:58 +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
eff8dd1ae5 Fixed negative values for size shown in the sidebar matrix fields when mirroring is applied 2019-04-03 09:05:52 +02:00
YuSanka
d806e8e5e1 Merge remote-tracking branch 'origin/master' into ys_selection 2019-04-03 08:42:12 +02:00
YuSanka
fed0f189d3 Fixed typo 2019-04-03 08:39:36 +02:00
Enrico Turri
48da4d4756 Fixed conflicts after merge with master 2019-04-03 08:38:32 +02:00
bubnikv
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
YuSanka
81809018bc Selection improvements 
+ "Delete" menu_item for Instances under OSX
 2019-04-02 16:33:52 +02:00
Vojtech Kral
1979baf619 imgui: Fix font size and scaling on Windows 2019-04-02 15:28:14 +02:00
Enrico Turri
89a0c84c83 Fixed conflicts after merge with master 2019-04-02 15:13:26 +02:00
Enrico Turri
ba4f0445c3 Fixed rendering of sla cap slices after deleting object 2019-04-02 14:43:38 +02:00
Enrico Turri
f147da1e5d Fixed conflicts after cherry-picking 5c89135 2019-04-02 14:32:12 +02:00
bubnikv
dc64b4d971 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-02 13:54:46 +02:00
bubnikv
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
Vojtech Kral
9d5eb2cd48 Fix build 2019-04-02 10:56:30 +02:00
Enrico Turri
adf9c4bd40 Follow-up of d4b22cfb87 -> Fixed dragging of sla instances after slicing 2019-04-02 10:55:36 +02:00
Vojtech Kral
c542413962 imgui: More refactoring, cut gizmo window positioning 2019-04-02 10:36:24 +02:00
Vojtech Kral
145b8fd0df Firmware updater: Improve logging 2019-04-02 10:33:37 +02:00
Vojtech Kral
75990923f7 Firmware updater: Support for CW1 2019-04-02 10:33:37 +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
Vojtech Kral
88cc93cdc9 imgui: Refactor font size, font initialization 2019-04-01 14:28:39 +02:00
Enrico Turri
83aaa471cf Fixed conflicts after merge with master 2019-04-01 14:21:55 +02:00
Enrico Turri
d4b22cfb87 Fix dragging of mixed instances plus volumes selections 2019-04-01 13:53:48 +02:00
tamasmeszaros
50942e9382 Merge branch 'tm_reuse_unified' 2019-04-01 12:24:50 +02:00
Enrico Turri
7cfcf8fb9a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 11:40:08 +02:00
bubnikv
62539bc35b Fix of No preview of position in variable layer editing UI at retina resolution #2050 2019-04-01 11:08:26 +02:00
Enrico Turri
2ae5f386ae Added missing include 2019-04-01 10:28:04 +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
ba89f04429 Fix of visual hints for rotation of full single instance selection 2019-04-01 09:11:23 +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
tamasmeszaros
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
Vojtech Kral
3cfb234e86 imgui: Get font size from wxWidgets, fix #2043 2019-03-29 14:58:32 +01:00
YuSanka
ac6a232795 Improved Selection from ObjectList side 2019-03-29 14:36:59 +01:00
Lukas Matena
32ed064797 SLA gizmo fix: occasional crashes after deleting objects 2019-03-29 13:38:33 +01:00
Enrico Turri
aca78cfba2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-29 12:58:41 +01:00
Enrico Turri
49fe8a9f08 Volumes selected from the sidebar table taken from the currently selected instance 2019-03-29 10:48:20 +01:00
YuSanka
44d3243df1 Added context menu Item "Change Extruder" on 3D-Scene 2019-03-28 16:32:19 +01:00
YuSanka
016b5e35b6 Some _cosmetic_ fixes : 
+ Set wxDEFAULT_DIALOG_STYLE for MsgDialog
+ Changed Msg text before language changing
 2019-03-28 16:32:19 +01:00
Enrico Turri
af3a32b8a0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 09:30:23 +01:00
Enrico Turri
9b3f1a8942 Small refactoring -> GLGizmosManager gets model from selection and not from canvas 2019-03-28 09:30:01 +01:00
bubnikv
fc49abc2a4 Merge remote-tracking branch 'remotes/origin/tm_sla_png_minz' 2019-03-28 09:14:37 +01:00
Enrico Turri
98a848d239 Layers editing initialized only for 3D view and not for g-code preview 2019-03-28 09:12:32 +01:00
Enrico Turri
a4f404a6a4 Selection enabled only for 3D view and not for g-code preview 2019-03-28 08:44:46 +01:00
Enrico Turri
702186eec3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 08:24:25 +01:00
YuSanka
3c163285e5 Fix of SPE-879 and #2021 2019-03-27 17:00:29 +01:00
Enrico Turri
46eafca0eb Follow-up of 8ea8eb67e4, utf-8 path conversion moved into nanosvg library 2019-03-27 15:42:01 +01:00
Enrico Turri
d0046283fa Added #define glcheck() for the case HAS_GLSAFE not defined 2019-03-27 15:14:40 +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