Commit graph

639 commits

Author SHA1 Message Date
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
Vojtech Bubnik
8a2a9dba2f Eradicated admesh from TriangleMesh:
TriangleMesh newly only holds indexed_triangle_set and
TriangleMeshStats. TriangleMeshStats contains an excerpt of stl_stats.
TriangleMeshStats are updated when initializing with indexed_triangle_set.

Admesh triangle mesh fixing is newly only used when loading an STL.
AMF / 3MF / OBJ file formats are already indexed triangle sets, thus
they are no more converted to admesh stl_file format, nor fixed
through admesh repair machinery. When importing AMF / 3MF / OBJ files,
volume is calculated and if negative, all faces are flipped. Also
a bounding box and number of open edges is calculated.

Implemented its_number_of_patches(), its_num_open_edges()
Optimized its_split(), its_is_splittable() using a visitor pattern.

Reworked QHull integration into TriangleMesh:
    1) Face normals were not right.
    2) Indexed triangle set is newly emitted instead of duplicating
       vertices for each face.

Fixed cut_mesh(): Orient the triangulated faces correctly.
2021-09-20 17:12:22 +02:00
Lukas Matena
677cb58000 Fix several warnings 2021-09-15 16:36:59 +02:00
enricoturri1966
40877b12f7 Vertical alignment of labels in imgui dialog for GLGizmoMmuSegmentation 2021-09-15 14:32:43 +02:00
enricoturri1966
f132ca9c3c Tech ENABLE_SINKING_CONTOURS set as default 2021-09-14 15:45:21 +02:00
Vojtech Bubnik
9d29eddf16 WIP: admesh eradication
follow-up to 58d8ab3dea
2021-09-14 14:51:40 +02:00
Vojtech Bubnik
58d8ab3dea Removed the PRUS format parser. WIP: admesh eradication:
stl_stats are newly only accessed by TriangleMesh::stats(),
most of the direct access to TriangleMesh::stl is gone with the exception
of parsing input files (3MF, AMF, obj).
2021-09-14 11:58:14 +02:00
Lukas Matena
4ac013ec9c Fixed painting gizmos with modifiers below the bed:
- When a modifier was below the bed and all the object parts above, it would clip
  the modifier but not triangulate the cut.
- When an object part was below, it would triangulate all modifiers with
  opaque orange color.

Both should now be fixed.
2021-09-13 09:02:11 +02:00
David Kocik
b9dab7540e Removes bottom status bar.
StatusBar class calls are commented out and replaced with notifications.
SlicicingProgress notification shows progress of slicing, ProgressIndicator notification handles other progress information, like arrange objects etc.
2021-09-10 14:35:13 +02:00
Lukas Matena
315663980b Do not allow 'replace by stl' when a gizmo is active,
some of the gizmos might not cope well. ALso avoided
code duplication in all such cases (currently fix by
Netfabb, simplify, replace by stl).
2021-09-03 13:53:07 +02:00
Lukas Matena
a4300b8e64 Naming of the entering/leaving snapshots is now more generic,
it uses the actual name of the gizmo. Also, the keyboard shortcut
is now appended to the name, instead of being duplicated in it.
2021-09-03 13:53:07 +02:00
Lukas Matena
4c80d9ed01 Fix taking entering/leaving snapshots in SLA gizmo:
This was broken between 2.2.0 and 2.3.0. The 'entering' snapshot
should be taken before the gizmo opens, not after. Otherwise it is
in fact the same as the next snapshot.
2021-09-03 13:53:07 +02:00
Filip Sykala
f6f70f6fd4 Fix Crash when delete model during simplification 2021-09-01 20:29:27 +02:00
Lukáš Hejl
3b4d10656c Renamed 'Seed fill' to 'Smart fill'. 2021-09-01 14:32:34 +02:00
enricoturri1966
9a5f61c306 Added missing vertical alignments of labels in imgui dialogs 2021-08-31 08:53:40 +02:00
enricoturri1966
1238afbdfd Fixed conflicts after merge with master 2021-08-30 13:26:35 +02:00
Lukáš Hejl
57f7b49223 Corrected undo/redo snapshot name when entering or leaving multi-material painting gizmo. 2021-08-30 10:41:41 +02:00
enricoturri1966
7a3f8c0a4c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_seams_as_models 2021-08-30 08:37:51 +02:00
Vojtech Bubnik
fbe4695958 Slight optimization of GLGizmoSimplify::process():
Moved a static variable from inside a lambda outside as the static
inner variable initialization & access has to be made thread safe.
2021-08-27 11:30:37 +02:00
enricoturri1966
dd5beee0bd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_seams_as_models 2021-08-27 10:17:20 +02:00
Filip Sykala
f90b10b63e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2021-08-26 14:21:59 +02:00
Filip Sykala
9f70afe44e Fix: Do not revert changes on change GLGizmoBase::m_state when apply was used 2021-08-26 14:21:54 +02:00
enricoturri1966
39ec1a6318 Fixed conflicts after merge with master 2021-08-26 12:39:28 +02:00
Lukáš Hejl
95e4ab9460 Fixed the issue that an object disappeared in a multi-material painting gizmo when the object was almost completely sunk under the bed.
Object disappearance was caused by calling glPolygonOffset for rendered triangles in the multi-material painting gizmo to resolve z-fighting between painted triangles and contours around selected areas using seed/bucket fill.
2021-08-26 12:08:21 +02:00
Lukáš Hejl
1c25078bc3 Added a missing include (GCC 11.1). 2021-08-26 08:43:47 +02:00
Filip Sykala
673a2bdac8 Fix:
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:109:23: warning: comparison of integer expressions of different signedness: 'std::basic_string<char>::size_type' {aka 'long unsigned int'} and 'int' [-Wsign-compare]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:132:17: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:171:17: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
Severity Code Description Project File Line Suppression State
Warning C26451 Arithmetic overflow: Using operator '-' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '-' to avoid overflow (io.2). libslic3r_gui C:\GIT\slic3r\src\slic3r\GUI\Gizmos\GLGizmoSimplify.cpp 143
2021-08-25 18:25:37 +02:00
Filip Sykala
9ea3be485f Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-25 16:56:24 +02:00
David Kocik
02dd1b5f7d rendering highlight arrow from svg 2021-08-25 16:31:31 +02:00
Filip Sykala
9896a21904 @Vojta request --> change ratio to decimation ratio 2021-08-25 13:09:37 +02:00
Filip Sykala
d7d4d52843 Fix
../src/libslic3r/QuadricEdgeCollapse.cpp:565:22: warning: comparison of integer expressions of different signedness: 'const int' and 'uint32_t' {aka 'unsigned int'} [-Wsign-compare]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:48:15: warning: unused variable 'min_triangle_count' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:160:9: warning: unused variable 'wanted_count' [-Wunused-variable]
..\src\slic3r\GUI\Gizmos\GLGizmoSimplify.cpp(167): warning C4305: '=': truncation from 'double' to 'float'
2021-08-24 08:21:14 +02:00
Filip Sykala
db6c984b36 remove unused variable 2021-08-23 16:26:21 +02:00
Filip Sykala
b555910185 Simplify dialog,
remove fast reduction - create mistake
2021-08-23 15:57:09 +02:00
Filip Sykala
89819c1c22 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-23 11:33:14 +02:00
Filip Sykala
6d895872b0 call render in main thread by function callAfter(hint by @Vojtech) 2021-08-20 14:29:52 +02:00
Filip Sykala
8fab4885c7 Add dirty state into Gizmo (hint by @DavidKocik) 2021-08-20 09:13:09 +02:00
David Kocik
8f58b11b08 Rotated arrow asset. 2021-08-19 14:01:54 +02:00
Filip Sykala
cc48f6c6a4 Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-18 12:08:00 +02:00
Lukas Matena
8a5278354e Fixed updating of cut contour in cut gizmo by comparing ObjectIDs,
for consistency with other gizmos and hopefully more robustness
2021-08-18 11:49:30 +02:00
Lukas Matena
3cf6d1c888 Revert 740067c and e645f4a
740067c: "Fixed cut contours in gizmo cut after deleting an object"
e645f4a: "Fixed cut contours after cutting an object in gizmo cut"
2021-08-18 11:44:21 +02:00
Filip Sykala
cc88b1e86b Merge branch 'master' into fs_QuadricEdgeCollapse 2021-08-18 10:37:21 +02:00
Filip Sykala
1e863cc031 Add restriction for simplification
Refuse outgoing during simlification.
Refuse start simplification when other Gizmo is active
Fix close after preview to revert changes
Allow change model for simplification
2021-08-18 10:37:08 +02:00
enricoturri1966
740067c576 Fixed cut contours in gizmo cut after deleting an object 2021-08-18 10:23:18 +02:00
enricoturri1966
e645f4a4ee Fixed cut contours after cutting an object in gizmo cut 2021-08-18 08:59:56 +02:00
tamasmeszaros
4e32863b99 Merge branch 'tm_rotfinder_fixes' 2021-08-17 16:15:41 +02:00
tamasmeszaros
1a2e58e521 Add better defined names for orientation optimizer goals 2021-08-17 15:35:52 +02:00