Commit graph

683 commits

Author SHA1 Message Date
enricoturri1966
2c0815f537 Fixed conflicts after merge with master and ported changes into gouraud shaders to gouraud_mod shaders 2021-10-19 11:27:11 +02:00
Filip Sykala
76cbb7c17e Fix
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:433:11: warning: unused variable 'checkbox_width' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:227:27: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:245:27: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
2021-10-18 20:15:11 +02:00
Filip Sykala
88f9a387e3 Do not disapeared apply button 2021-10-18 19:20:20 +02:00
Filip Sykala
a9bd989eda Add [esc] to interupt preview in simplify 2021-10-18 16:47:25 +02:00
Filip Sykala
80ccb77b00 live preview in simplification 2021-10-18 16:01:32 +02:00
Lukáš Hejl
0c2d9f01a6 Fixed z-fighting between contour around the area selected by smart fill and painted triangles inside the FDM support painting gizmo. 2021-10-18 11:35:13 +02:00
Lukáš Hejl
b45675b4e1 Follow-up of 6194e67e68 - Separated the part that computed triangles normals and lighting inside the fragment shader into a separate shader mm_gouraud, which is only used for the multi-material painting gizmo. 2021-10-18 11:35:13 +02:00
Lukáš Hejl
912f73d79c Fixed the positioning of the supports painting gizmo. 2021-10-18 11:33:47 +02:00
Lukáš Hejl
6f3baf9262 Added tooltips to the support painting gizmo. Used multi-line text for the label "Highlight overhang by angle". 2021-10-18 10:57:57 +02:00
Lukáš Hejl
b2fc50c9d9 Small refactoring of showing tooltips in gizmos. 2021-10-18 10:56:50 +02:00
Lukáš Hejl
6f6f6de506 Added an option to limit painting to triangles only highlighted by "Highlight by angle" in the support painting gizmo. 2021-10-18 10:54:31 +02:00
enricoturri1966
29340c1560 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-10-07 14:22:06 +02:00
Lukáš Hejl
d6d575f607 Renamed the brush "Pointer" to "Triangles" in the multi-material painting gizmo, and in the FDM supports painting gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
ebdc69bdc9 Fixed the positioning of the painting gizmos. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
542ba1bb9a Added rendering of smart fill and contour around selected areas for the FDM supports painting gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
2b59a16dc7 Refactored rendering of the contour around areas selected by smart fill to prepare it for the FDM supports painting gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
8c9c8a9cc4 Prepared the FDM support gizmo for smart fill. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
99edfd22ce Improved the alignment of tool type and brush type in the multi-material gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
dfb4ccdb13 Reworked seam painting gizmo to the same layout as multi-material painting gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
925d3fad1f Fixed the wrong calculation of caption text size in all painting gizmos, which could lead to showing unintended space after ImGui::SliderFloat. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
6012bf1e03 Removed unintended space after ImGui::SliderFloat in all painting gizmos. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
992a279bef Removed the vertical space in the below information about how to use gizmo for all painting gizmos. 2021-10-07 13:12:36 +02:00
enricoturri1966
5739178306 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-10-04 13:07:53 +02:00
Filip Sykala
39a98e97b4 Fix. Allow simplify volume inside object, fix drawing wireframe 2021-10-04 12:29:45 +02:00
enricoturri1966
4103086a6e #7056 - Gizmo cut input set to use current locale 2021-10-04 11:12:29 +02:00
Filip Sykala
56996104cc fix assert 2021-10-04 09:30:30 +02:00
Filip Sykala
91462cf9d5 Fix wireframe transformation when supports in SLA are added 2021-10-04 09:23:06 +02:00
enricoturri1966
2e779d8594 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-10-04 08:30:13 +02:00
Filip Sykala
f5faad80a9 add close suggestion notification 2021-10-01 17:40:30 +02:00
David Kocik
29aab3a426 PrintInfoNotificationLevel with icon 2021-10-01 15:03:40 +02:00
enricoturri1966
1f82eb5624 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-09-30 15:08:35 +02:00
Lukas Matena
c61a5d234e After gizmo snapshots are compacted, rename the last one to something generic 2021-09-30 12:17:52 +02:00
Vojtech Bubnik
1f3b272d77 Redo of the project state, implementation of Undo/Redo stack compression 2021-09-30 12:17:39 +02:00
Filip Sykala
da251fbd1c Add checkbox for show wire frame 2021-09-30 13:56:04 +02:00
Filip Sykala
07a97f41d3 Fix: ../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:411:21: warning: comparison of integer expressions of different signedness: 'std::vector<Slic3r::ModelObject*>::size_type' {aka 'long unsigned int'} and 'int' [-Wsign-compare] 2021-09-30 13:15:21 +02:00
Filip Sykala
a2d2dec107 Merge branch 'master' into fs_simplify_wireframe 2021-09-30 13:03:32 +02:00
Filip Sykala
e3459c7c46 Add Rendering wire frame when simplify 2021-09-30 13:03:15 +02:00
Lukas Matena
5fe90599fc Painting gizmos no longer use a separate undo/redo stack 2021-09-30 12:18:43 +02:00
enricoturri1966
b19c742455 Fixed conflicts after merge with master 2021-09-30 10:31:25 +02:00
Filip Sykala
6b9ee1126d Not buildable render contour 2021-09-30 09:40:06 +02:00
Filip Sykala
6bd78aa9c4 Add call for render 2021-09-30 09:23:04 +02:00
Filip Sykala
84f8ba9fb4 Fix for deleted object after preview 2021-09-29 19:06:31 +02:00
Filip Sykala
95fc054590 fix for getting name of gizmo without key(like simplify) 2021-09-29 18:17:19 +02:00
Vojtech Bubnik
8f4f02f84c Merge remote-tracking branch 'remotes/origin/vb_project_state' 2021-09-27 14:36:22 +02:00
Vojtech Bubnik
9c4494637c WIP Undo / Redo and project state: Marking Undo / Redo snapshots
with their purpose.
Follow-up to 41dc265a45
2021-09-27 14:32:09 +02:00
Vojtech Bubnik
41dc265a45 WIP Undo / Redo and project state: Marking Undo / Redo snapshots
with their purpose.
2021-09-27 14:10:53 +02:00
Lukas Matena
6a5feb818f Revert "Fixed volume transformations in SLA:":
The fix is not complete, it is better not to break it more than it was.

This reverts commit 6b25a9c836.
2021-09-24 13:03:56 +02:00
Lukas Matena
6b25a9c836 Fixed volume transformations in SLA:
Volume transformations were ignored in SLA mode. This did not matter for plain STLs
and PS own 3MF, because in those cases, the volume trafo was identity. Importing
a 3rd party 3MF leads to issues with support/holes placement and generation.
Fixes #6100 and #6744.
2021-09-24 12:14:44 +02:00
enricoturri1966
1dad3c20f7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-09-21 13:52:10 +02:00
enricoturri1966
cf380fb456 Tech ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS - Out of bed detection for circular printbeds 2021-09-21 13:51:57 +02:00