Commit Graph

2259 Commits

Author SHA1 Message Date
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
98120d01a3 Adjusted the default support_points_minimal_distance to 1mm. 2019-04-09 10:18:52 +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
bubnikv
9bc93134f9 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-08 12:05:44 +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
Enrico Turri
ea3d30bff1 Fix of #2082 -> Added lines M73 P100 and M73 Q100 to gcode to signal that print is finished 2019-04-08 11:54:58 +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
bubnikv
43fb8df1fb Increased the default SLA support density to 130% of the previous value
(100% now works as 130% before)
2019-04-08 10:27:56 +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
tamasmeszaros
2487bb8794 Remove unnecessary reversals of print polygons.
second take...
2019-04-05 17:04:55 +02:00
tamasmeszaros
08b9d9a519 fix for hole disappearance 2019-04-05 16:24:23 +02:00
YuSanka
d31590f438 Fixed Typo for the last commit 2019-04-05 12:18:58 +02:00
bubnikv
f554d02665 SLA: Invalidate all PrintObjects if the scaling correction changes.
Fixes a bug, where the sla_transofmation() function works with
the new scaling values for both old and new ModelObjects, therefore
no reslicing is triggered.
(untested)
2019-04-05 11:56:11 +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
bubnikv
88059baddb
Detect Remote Desktop connection and use Mesa OpenGL renderer. 2019-04-05 10:01:48 +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
bubnikv
a71f05cdc0 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 16:24:44 +02:00
bubnikv
ef1a273f0c Fix of "Latest commit of Slic3r 1.42.0 cuts away part of the model #2063"
Fixed one bug of many in admesh library, where the face connectivity
was broken when removing a degenerate face. Likely there are some
similar issues left to be solved.
Placed a workaround to always recalculate face connectivity before slicing.
2019-04-04 16:16:57 +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
tamasmeszaros
590ae25b13 Altering sla export interface to support explicit project name. 2019-04-04 12:30:11 +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
tamasmeszaros
f0d106e5f0 Added method for relative correction retrieval. 2019-04-04 10:52:14 +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
d79b090f7c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-04 09:19:07 +02:00
Enrico Turri
c29f7bc147 Fix of #2044
Added sorting by z of the preview data used to generate the gcode preview because there can be shuffling in case of sequential printing
2019-04-04 09:16:03 +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
ecdd4b6e7a Suggestion for Z offset correction 2019-04-03 18:23:29 +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
6a9c0d4543 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-03 12:08:11 +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
tamasmeszaros
f7ce59d070 Merge branch 'tm_clipperutils_update' 2019-04-03 11:17:44 +02:00
tamasmeszaros
1534356268 Call Line conversion operator explicitly. 2019-04-03 11:17:15 +02:00
bubnikv
9f8ad0153e Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-03 11:12:15 +02:00
bubnikv
382326ffc8 Fixed FFF slicing of meshes with left hand oriented transformations applied.
Slight optimization of FFF slicing - optimized copy of an object with just
a single volume.
2019-04-03 11:12:03 +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
tamasmeszaros
32af3ff3c0 Remove unnecessary reversals of print polygons. 2019-04-03 10:29:27 +02:00
tamasmeszaros
7b414fe34a Get rid of unnecessary copies and moves in ClipperUtils
This is up to a code review session.
2019-04-03 10:17:57 +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
tamasmeszaros
66fce6d46c Add mirror correction to rasterized polygons. 2019-04-02 17:48:50 +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
e1177b1810 Fix of the previous commmit. 2019-04-02 13:54:23 +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
tamasmeszaros
6a74564900 More accurate status proportions for SLA steps. 2019-04-02 11:19:52 +02:00
Vojtech Kral
9d5eb2cd48 Fix build 2019-04-02 10:56:30 +02:00
Enrico Turri
f3a214e391 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-02 10:55:54 +02:00
Enrico Turri
adf9c4bd40 Follow-up of d4b22cfb87 -> Fixed dragging of sla instances after slicing 2019-04-02 10:55:36 +02:00
tamasmeszaros
a3dcb6863e Rethought sla status indication. 2019-04-02 10:54:14 +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
bubnikv
9594bf43b5 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-01 17:12:50 +02:00
bubnikv
c1b7d987a0 Improvement in handling of the custom bridging angle value.
In case the bridge is only supported at one side, it is technically
not considered to be a support, therefore the default infill angle is used.
With this change, the bridging areas use the custom angle value even
if not supported on both sides.
2019-04-01 17:12:39 +02:00
tamasmeszaros
b8289c32b0 Fix for broken SLA status indication. 2019-04-01 16:10:15 +02:00
Lukas Matena
5f66a2d181 SLA gizmo dialog now respects system font settings 2019-04-01 14:51:18 +02:00
bubnikv
728e053a7f Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-01 14:50:55 +02:00
bubnikv
fbce7b001b Some optimizations of "Fix crash on splitting some models #2042"
replaced std::vector<bool> with std::vector<unsigned char>
as std::vector<bool> is a specialized version optimized for memory,
not speed (8 bools are packed into a single boolean).
The triangle neighbor traversal was optimized to not push visited
or non-neighbors into the queue.
2019-04-01 14:50:40 +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
tamasmeszaros
32a49d1468 Fixing negative status values in console output 2019-04-01 13:59:39 +02:00
Enrico Turri
d4b22cfb87 Fix dragging of mixed instances plus volumes selections 2019-04-01 13:53:48 +02:00
bubnikv
9821814604 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-01 12:28:42 +02:00
bubnikv
d728f4be5e Revert "Use number_of_parts for is_splittable"
It is too dangerous to rely on the admesh flag without inspecting the
admesh code line by line and a through test.

This reverts commit cd3cec3e45.
2019-04-01 12:27:45 +02:00
tamasmeszaros
50942e9382 Merge branch 'tm_reuse_unified' 2019-04-01 12:24:50 +02:00
tamasmeszaros
2baa651f1e Fixing the broken rasterizer.
Paths and holes cannot be added separately.
2019-04-01 12:15:47 +02:00
Sijmen Schoon
cd3cec3e45 Use number_of_parts for is_splittable
It's there, why not use it
2019-04-01 12:09:44 +02:00
Sijmen Schoon
4a9e05194c Move repaired check to find_unvisited_neighbors 2019-04-01 12:09:44 +02:00
Sijmen Schoon
69199215b0 Fix a bunch of warnings 2019-04-01 12:09:44 +02:00
Sijmen Schoon
19dc89bfab Clean up and fix TriangleMesh::split and relatives 2019-04-01 12:09:44 +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
tamasmeszaros
4eb5d91a8f Parallel loop for the statistics 2019-04-01 11:37:26 +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
6593421802 fix for statistics 2019-03-29 17:20:19 +01: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
tamasmeszaros
b19d411738 It seems that stats are not broken after all. 2019-03-29 13:34:22 +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
tamasmeszaros
98c976dd9f Merge branch 'tm_sla_png_minz' 2019-03-28 17:56:50 +01:00
tamasmeszaros
1e47cc9004 Improving Zipper API error handling. 2019-03-28 17:21:19 +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
0acee468a3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 11:56:35 +01:00
bubnikv
d209aaa200 Enabled slicing of SLA from the command line. 2019-03-28 11:24:21 +01:00
bubnikv
ba89a3d1ab Removed dependency on libz on Windows. 2019-03-28 11:20:48 +01:00