Commit graph

951 commits

Author SHA1 Message Date
Enrico Turri
251a7d1329 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 08:23:55 +01:00
Lukas Matena
378321231f Fix of tripping glAssert after switching to Preview on Linux/GTK2
(fix suggested and thus approved by @enricoturri1966)
2020-01-31 14:50:37 +01:00
Enrico Turri
3a99b23ec7 #3580 - Added menu item 'Edit/Reload from disk' and F5 key acceleration to reload the entire plater 2020-01-31 12:15:04 +01:00
bubnikv
9ef65b23d8 Implemented loading of hollowed SLA mesh into the scene
in place of the normal mesh.

WIP: The code is inefficient (it does not store the timestamp
of the hollowed mesh, therefore it refreshes the hollowed mesh on each
scene update) and if the hollowing gets invalidated, the original mesh
is currently not being reloaded and the hollowed mesh is still visible.
2020-01-30 17:58:49 +01:00
Lukas Matena
08dcbd0271 Hollowing gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:39 +01:00
Enrico Turri
0407634824 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 15:46:48 +01:00
Enrico Turri
e679bcced6 Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization 2020-01-29 15:40:56 +01:00
Enrico Turri
504413cc91 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 12:31:50 +01:00
Enrico Turri
17a6b696e7 Workaround to fix SPE-1082 + refactoring of 6 dof camera 2020-01-29 12:08:38 +01:00
Lukas Matena
76927ce399 REVERT LATER: TEMPORARILY MANGLED reload_scene FUNCTION
This commit horribly cripples reload_scene function just to update volumes in scene so that Hollowing and SLASupport gizmos can be updated to the new logic
    It should be later reverted and the same be achieved in a better way
2020-01-29 10:07:59 +01:00
Enrico Turri
9032dadff3 Added extra frame renders to let labels grow to their final size 2020-01-28 15:57:02 +01:00
Enrico Turri
d5b258c267 1st installment of object/instance labels in 3D scene 2020-01-28 13:15:21 +01:00
tamasmeszaros
6b0af43665 Use mesh boolean in the backend to drill holes. 2020-01-24 10:53:40 +01:00
tamasmeszaros
b45e95877e Merge branch 'master' into lm_tm_hollowing 2020-01-23 17:43:18 +01:00
YuSanka
5ff8ae955b Implemented editing for extruder of existing ToolChangeCode tick
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
YuSanka
1ed313ab79 Synchronized mode of color_print data to/from 3mf/amf
+ Code refactoring " CustomGCode extracted to separate namespace and file
2020-01-23 16:11:21 +01:00
bubnikv
71fa411100 Refactored PrintObject::m_copies to PrintInstances,
so that the ordering code at G-code export may work directly with
pointers to PrintInstances instead of with pair of <PrintObject, copy idx>.
Also the PrintInstance knows its source ModelInstance, which allows
sorting of PrintInstances for sequential printing in the order
they appear in Plater's object list.
2020-01-23 09:53:06 +01:00
Lukas Matena
63b0eec5a9 Merge branch 'master' into lm_tm_hollowing 2020-01-21 13:00:07 +01:00
Enrico Turri
b368f8ff24 Fixed conflicts after merge with master 2020-01-17 14:58:19 +01:00
YuSanka
2259f7b3e8 Code refactoring to mode comparison 2020-01-17 12:24:58 +01:00
Enrico Turri
94a3d38afd ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG set as default 2020-01-17 11:45:52 +01:00
Enrico Turri
4eee702984 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE set as default 2020-01-17 11:26:26 +01:00
Enrico Turri
b6ab6378d7 ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX set as default 2020-01-17 10:50:25 +01:00
Enrico Turri
34aac7e292 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_6dof_camera 2020-01-17 08:13:58 +01:00
YuSanka
52c590f57a Merge remote-tracking branch 'origin/ys_cp_improvements' 2020-01-16 16:06:19 +01:00
YuSanka
89fcd7f95a Added "mode" variable for custom_gcode_per_print_z 2020-01-16 16:01:19 +01:00
Enrico Turri
6be4b3865b Merge remote-tracking branch 'foxox/feature/ScaleSpeedLegendToVisible2' 2020-01-16 13:55:59 +01:00
Lukas Matena
822f9ff4a6 Fixed issues in SLA gizmos related to showing/hiding of the model/support structures 2020-01-16 13:18:43 +01:00
Enrico Turri
3f2ccf08d2 3Dconnexion devices translation linearly dependent on zoom 2020-01-16 10:17:07 +01:00
Enrico Turri
9df7eb4e08 Customizable use of 6 dof camera 2020-01-16 09:12:36 +01:00
Enrico Turri
62e60bcb43 Six degrees of freedom camera - 1st installment 2020-01-15 12:49:34 +01:00
YuSanka
4f1f507d5a Fix of #3371 2020-01-06 12:41:27 +01:00
Lukas Matena
b3f15b1c98 Merge branch 'master' into lm_tm_hollowing 2019-12-20 10:33:53 +01:00
YuSanka
f7e06ded67 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-17 14:16:58 +01:00
YuSanka
afcc6bbb08 Code refactoring for Color change implementation 2019-12-17 08:37:50 +01:00
Enrico Turri
43213b9548 Added [X] and [Close] buttons to close 3Dconnexion setting imgui dialog by clicking on them 2019-12-16 13:35:45 +01:00
bubnikv
e649a28ffc Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-13 13:43:31 +01:00
bubnikv
65772958b7 Improved adaptive layer height metrics: Using the area of a triangle
delimited by the extrusion stepping and the sloping surface.
This leads to a yet different metric from Cura or upstream Slic3r.
2019-12-13 13:43:16 +01:00
Enrico Turri
f2b8607d11 Fixed positioning of gizmos' imgui dialogs 2019-12-12 13:38:08 +01:00
Lukas Matena
537260494d Merge branch 'master' into lm_tm_hollowing 2019-12-12 11:37:33 +01:00
Enrico Turri
57d069bd0a Some rework on layout of imgui dialogs 2019-12-11 15:30:25 +01:00
Enrico Turri
64fc278212 GLCanvas3D - render methods set as constant methods 2019-12-10 12:57:55 +01:00
bubnikv
03bb8a60a3 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-10 11:13:09 +01:00
bubnikv
b12bc5c4d5 Optimization in GLCanvas3D::reload_scene():
Use sorting and binary search instead of linear search.
O(n log n) versus O(n^2)
2019-12-10 11:12:17 +01:00
Enrico Turri
bdfed9d9ef Attempt to fix view toolbar background not showing up on Mac when using dark mode 2019-12-10 10:56:21 +01:00
Enrico Turri
68812b081f Removed obsolete (and unused) code 2019-12-09 15:40:14 +01:00
foxox
dea83da5b7 Speed legend scales depending on travel visibility. 2019-12-08 00:03:41 -05:00
YuSanka
3acbc07caf Localization improvements 2019-12-06 16:20:59 +01:00
YuSanka
805a6c936c Localization improvements: Text correction 2019-12-06 13:58:23 +01:00
Enrico Turri
45f10a3730 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Removed debug output and cleanup 2019-12-02 11:44:11 +01:00
Enrico Turri
40498eee44 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Extended debug output to investigate issues on Mac and Linux 2019-11-29 14:24:24 +01:00
Lukas Matena
735f82c019 Hollowing gizmo has now its own shortcut [H], fixed a situation with supports showed in editing mode 2019-11-29 13:56:39 +01:00
Enrico Turri
1d5db5cf7a ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added debug output to investigate issues on Mac and Linux 2019-11-29 12:45:41 +01:00
Enrico Turri
3dd46f2e03 ENABLE_THUMBNAIL_GENERATOR -> some other refactoring 2019-11-28 15:19:42 +01:00
Enrico Turri
ddd1df1552 ENABLE_THUMBNAIL_GENERATOR -> render printbed into thumbnails 2019-11-28 14:18:24 +01:00
Enrico Turri
bd1ee8ee4a Small refactoring in Camera::calc_zoom_to_bounding_box_factor 2019-11-28 12:14:31 +01:00
Enrico Turri
0de3704287 ENABLE_THUMBNAIL_GENERATOR -> small refactoring 2019-11-28 12:03:19 +01:00
Enrico Turri
3537f74936 Printbed axes renderable on demand 2019-11-28 11:51:00 +01:00
YuSanka
dfd38c7818 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-11-28 09:01:14 +01:00
YuSanka
901a20b3b1 Code cleaning 2019-11-27 15:27:44 +01:00
Enrico Turri
1ba3f0a4f6 Transparent background for thumbnails saved into gcode and sl1 files 2019-11-27 13:37:37 +01:00
Enrico Turri
5fcf41a3aa ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added undo/redo 2019-11-27 11:08:10 +01:00
Enrico Turri
55a163e216 Added tooltip, showing layer height at mouse cursor, to layer height profile bar 2019-11-26 14:44:14 +01:00
Enrico Turri
381d7e6c2e ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Attempt to fix sliders size, on Mac, into imgui dialog for adaptive layers 2019-11-26 12:50:57 +01:00
Enrico Turri
643b26a0f3 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Small refactoring 2019-11-26 12:24:07 +01:00
bubnikv
6fcd51d5be Fix of "Slicer crashes when slicing for flexible filament" #2988 2019-11-22 16:08:25 +01:00
Enrico Turri
599403ba94 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-11-22 14:40:59 +01:00
Enrico Turri
aea32ffe72 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added 'keep min' option to smoothing algorithm 2019-11-20 14:06:30 +01:00
Enrico Turri
955439b3ba Fixed build on Mac 2019-11-20 10:57:56 +01:00
Enrico Turri
4982e177a2 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Attempt to fix imgui dialog position on Mac 2019-11-19 15:39:49 +01:00
tamasmeszaros
7011c58faa Merge branch 'master' into lm_tm_hollowing 2019-11-18 17:50:56 +01:00
Enrico Turri
9e7e1fb5e2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-11-18 14:51:06 +01:00
Enrico Turri
da44618074 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Fixed adaptive layer height profile and layer height profile smoothing calculations 2019-11-18 14:32:41 +01:00
Enrico Turri
28dedd65f0 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Code cleanup 2019-11-18 10:25:23 +01:00
Enrico Turri
68a9980a5e ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Small refactoring to improve performances 2019-11-18 10:17:44 +01:00
YuSanka
bc68b8eaf2 ExtruderSequenceDialog :
Fixed layouts after the second opening of the dialog.
 (Removing any extruder from the sequence does not cause an incorrect layout)
Validation of entered values added
 (0 is not a valid value)
2019-11-16 02:12:37 +01:00
YuSanka
0fb8b2ce09 Delete color changes for unused extruders 2019-11-15 16:36:29 +01:00
Enrico Turri
f548a4d7d6 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Profile smoothing using gaussian blur 2019-11-15 15:49:07 +01:00
Enrico Turri
5baffdb9c2 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Customizable cusp value 2019-11-14 10:22:48 +01:00
Enrico Turri
0001ce3dab ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Refactoring of SlicingAdaptive to account for volumes' transformation 2019-11-13 13:53:02 +01:00
Enrico Turri
b77ba32bb2 Adaptive layer height profile -> Added Adaptive button to imgui dialog 2019-11-12 14:18:43 +01:00
Enrico Turri
9d5da8b18c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_adaptive_layer_height 2019-11-12 12:43:16 +01:00
Enrico Turri
316832b23d Fixed out of printbed detection for non-printable objects leading to inconsistent volumes' color 2019-11-12 09:14:42 +01:00
YuSanka
6c8bb51f4a Use constant names for G-codes like M600, M601 and "tool_change"(Change extruder) 2019-11-11 09:38:45 +01:00
YuSanka
f2120c1122 Fixed a sequence of the legend items 2019-11-07 16:36:24 +01:00
Enrico Turri
6e4060569a 1) Added new tech ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE
2) Imgui dialog replaces texture for reset button and tooltip when layer editing is active
2019-11-07 15:55:45 +01:00
YuSanka
72852ffab5 Updated DoubleSlider band. Added smart color selection for M600 2019-11-07 13:57:43 +01:00
Enrico Turri
55a4b99e44 Fixed bug into Camera::set_target() 2019-11-07 11:48:59 +01:00
Enrico Turri
a624590b36 Fixed conflicts after merge with master 2019-11-07 09:55:44 +01:00
YuSanka
c4a62819f4 Implemented new color change preview from Gcode
+ Added missed "change_extruder.svg"
2019-11-07 08:13:26 +01:00
tamasmeszaros
a82f1268f3 Hollowed interior is now visible in preview 2019-11-06 14:26:15 +01:00
Enrico Turri
41dadfdfcf ENABLE_THUMBNAIL_GENERATOR -> Generate thumbnails using GLEW_EXT_framebuffer_object on graphic cards supporting it 2019-11-05 14:50:58 +01:00
YuSanka
ba0ad954e8 Code cleaning for the 6ed9adaeff commit 2019-11-05 12:56:57 +01:00
YuSanka
6ed9adaeff New legend for color print.
Some improvements for coloration multimaterial print indicator
2019-11-05 09:48:53 +01:00
YuSanka
d5f7956a55 Set custom color for color change 2019-11-04 13:42:47 +01:00
Enrico Turri
3d450df680 ENABLE_THUMBNAIL_GENERATOR -> Transparent background for thumbnails saved into .3mf 2019-11-04 11:59:23 +01:00
YuSanka
c564f693e9 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-11-03 19:34:34 +01:00
YuSanka
674c6ce1c5 Implemented coloration of multi-extruder print with color changes for separated extruder. 2019-11-03 19:33:02 +01:00
Enrico Turri
f94f75d481 ENABLE_THUMBNAIL_GENERATOR -> Render thumbnails using shader 2019-11-01 12:19:27 +01:00
Enrico Turri
bf8fcabb29 ENABLE_THUMBNAIL_GENERATOR -> Use orthographic camera when rendering thumbnails 2019-10-31 17:03:33 +01:00