Commit graph

662 commits

Author SHA1 Message Date
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
Filip Sykala
11c91d781e FIX: extra frame request
Do not freeze bargraph in Siplify dialog when no mouse move.
2021-08-17 15:28:08 +02:00
Filip Sykala
090728b9d5 Add private member prefix m_ 2021-08-17 08:58:45 +02:00
tamasmeszaros
db7f424e46 Merge branch 'tm_rotfinder_fixes' 2021-08-16 16:43:08 +02:00
tamasmeszaros
900814ff47 Add tooltips for combo items in rotation optimization dialog 2021-08-16 16:03:20 +02:00
Filip Sykala
268b06bdbb fix position of window 2021-08-16 15:30:33 +02:00
Filip Sykala
21fd35d243 Fix: Do not close dialog after preview 2021-08-16 13:06:51 +02:00
Lukas Matena
0b2ee3bb46 SLA supports: ask about saving changes when Esc is pressed 2021-08-16 13:05:31 +02:00
Lukas Matena
021688fe50 Fix place on bed and sinking instances:
all sinking objects were incorrectly shifted to bed when
'place on face' was applied to any object.
2021-08-12 10:17:59 +02:00
Lukas Matena
7f2ad140b6 Fix a crash recently introduced by b14faf6 (reported in #6794) 2021-08-11 22:03:26 +02:00
Lukas Matena
b14faf627b Do not show sinking contours when a gizmo hides some objects 2021-08-11 16:17:28 +02:00
Lukas Matena
9632e6fa6a New icons for mmu painting, fuzzy skin and object info items 2021-08-11 13:52:15 +02:00
Lukáš Hejl
18cff61bd2 Reworked visualization of selected triangles by seed fill and bucket fill inside the multi-material painting gizmo. Now is drawn boundary around a selected area, and also all triangles inside the selected area are drawn with a darker color. 2021-08-10 21:38:48 +02:00
Lukas Matena
a5ebd45d4d Renamed 'MMU segmentation; to 'Multimaterial painting' 2021-08-10 11:26:46 +02:00
Lukas Matena
ef30cc8690 Fixup of previous commit: there are two more painting gizmos 2021-08-09 11:49:48 +02:00
Lukas Matena
13604469fd Painting gizmos and sinking objects:
1. Do not show what's below the bed when a gizmo is open
2. Triangulate the cut so people don't see inside
3. If regular clipping plane is used, the cuts are mutually clipped by one another
4. Painting itself ignores the hidden part of the object
2021-08-09 10:47:51 +02:00
Lukas Matena
0ccc791750 Merge branch 'fs_QuadricEdgeCollapse' 2021-08-06 18:23:49 +02:00
Lukáš Hejl
dd55b55853 Swapped the position of seed fill and bucket fill inside the multi-material gizmo. Changed the default value for the seed fill angle. 2021-08-06 16:46:48 +02:00
Lukáš Hejl
56d4ba7a29 Fixed the issue when the object was selected by seed fill or bucket fill could stay selected when the painting tool was switched to brush. 2021-08-06 16:46:48 +02:00
Lukáš Hejl
666cdeecd9 Forced recomputation of seed fill selected areas when the seed fill angle is changed by ALT+mouse wheel. 2021-08-06 16:46:48 +02:00
Lukáš Hejl
cf2a7f4dfa Fixed the possibility of changing brush size in the multi-material gizmo by ALT+mouse wheel when brush for painting single triangles is selected. 2021-08-06 16:46:48 +02:00
Lukas Matena
17860fb38a Added cancel button into 'Save support points?' message box, changed the title 2021-08-06 16:30:02 +02:00
Lukas Matena
85c7dea1a9 Finished concept of gizmos with no toolbar icon:
on_is_selectable and on_is_activable functions are now completely independent,
the former says if there shall be an icon in the left toolbar, the latter
says if the gizmo can be activated (by a shortcut or GLGizmoManager::open_gizmo)
2021-08-06 16:08:04 +02:00
Lukas Matena
01f32e18d6 Fixed build on Linux, abs->std::abs 2021-08-06 13:03:30 +02:00
Vojtech Bubnik
ea5a90f08c Merge remote-tracking branch 'remotes/origin/master' into fs_QuadricEdgeCollapse 2021-08-05 17:17:18 +02:00
enricoturri1966
66d43b882e Fixed calls set_uniform(emission_factor, xx) to use floats 2021-08-04 11:58:50 +02:00
enricoturri1966
ab9dfb7932 Added a few missing glsafe() 2021-08-02 14:40:13 +02:00
Filip Sykala
fc4b18ebb1 Merge master 2021-08-02 10:46:47 +02:00