115 Commits

Author SHA1 Message Date
YuSanka
ed51fc24c9 Follow-up last commit: Fixed warnings and added missed include 2024-04-05 13:16:05 +02:00
YuSanka
e9361b4f61 ImGuiWrapper is split now into ImGuiWrapper, which contains and uses internal variables,
and ImGuiPureWrap (name space which uses just pure ImGui functions and doesn't use wxWidgets)
2024-04-05 12:38:47 +02:00
enricoturri1966
c2b8914ed0 Tech ENABLE_GL_CORE_PROFILE set as default 2024-03-26 14:41:57 +01:00
Lukáš Hejl
76435e7add SPE-1840: Rework multi-material segmentation to work directly on the Voronoi diagram without creating a copy of it.
Previous algorithms assume that they can get an invalid Voronoi diagram. Because of that, during the multi-material segmentation, a copy of the Voronoi diagram was created, and there were several attempts to fix missing vertices and edges. But as it shows, this wasn't a good enough approach and sometimes led to several issues like bleeding layers.

After generalization, our approach for detection and repairs of invalid Voronoi diagrams from Arachne, we could assume that multi-material segmentation gets non-invalid Voronoi diagrams.
With this assumption, we reimplement multi-materials segmentation to work directly on the Voronoi diagram. That should make multi-material segmentation more stable.

So, this should fix several issues like bleeding layers. Also, memory consumption should decrease by a lot. Also, there should be some speedup of multi-materials segmentation.
2024-02-08 15:40:20 +01:00
Lukáš Hejl
8e6085bfa4 SPE-2016: Fixed crash in multi-material painting gizmo and during generating multicolor thumbnails.
The crash happened after changing the number of extruders.
2023-11-09 15:16:01 +01:00
Lukáš Hejl
7c22d7a842 SPE-1975: Show multi-material painting in thumbnails. 2023-10-31 15:35:28 +01:00
Lukáš Hejl
87187a35fe Don't set view_model_matrix, projection_matrix, and view_normal_matrix in TriangleSelectorMmGui::render() because they are already set inside GLGizmoMmuSegmentation::render_triangles(). 2023-10-31 15:35:28 +01:00
ps_copyright
f32859c302 final copyright headers 2023-09-01 14:49:07 +02:00
YuSanka
85b963704a Lokalization: Following-up previous commits:
* GCodeViewer : Used format() instead of sprintf()
 * Added comments to translators
 * Updated POT and merged with community dictionaries
2023-05-26 13:25:46 +02:00
YuSanka
1a82b5b5ff Localization: Workaround to localization of the labels inside of imgui color picker (part of #10568)
* Overridden ImGui::ColorEdit4 and ImGui::ColorPicker4 to send localized labels inside functions
+ Updated POT
2023-05-26 12:44:36 +02:00
YuSanka
ad79a0541a Partially fix for #10568 - Something untranslated 2023-05-22 10:23:50 +02:00
Filip Sykala - NTB T15p
ad81d530b1 Fix of freez when undo redo on text with modifier. 2023-04-03 16:24:07 +02:00
Filip Sykala - NTB T15p
dd7a19505a Another approach to fix undo redo:
Do not open gizmo on shortcut key: only create volume
2023-03-30 19:04:29 +02:00
Lukas Matena
e29970a2ed Added 'is_serializing' flag to GLGizmoBase::data_changed function 2023-03-14 13:57:31 +01:00
enricoturri1966
028dfb5d9e Tech ENABLE_LEGACY_OPENGL_REMOVAL set as default 2022-12-06 12:17:01 +01:00
YuSanka
fbcdd4191b Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master 2022-10-27 13:09:55 +02:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
2022-08-31 15:22:10 +02:00
YuSanka
2ac3861b2a Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-08 10:57:38 +02:00
enricoturri1966
22b634ca1d Fixed crash at startup on Mac OS 2022-07-13 08:56:00 +02:00
enricoturri1966
c468dcbed7 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders
Fixed conflicts during rebase with master
2022-05-26 12:25:55 +02:00
enricoturri1966
106b666e18 Tech ENABLE_GL_CORE_PROFILE - Fixed rendering of GLMmSegmentationGizmo3DScene
Fixed conflicts during rebase with master
2022-05-26 11:10:53 +02:00
enricoturri1966
1a1cf108fc Tech ENABLE_GL_SHADERS_ATTRIBUTES merged into ENABLE_LEGACY_OPENGL_REMOVAL
Fixed conflicts during rebase with master
2022-05-26 10:50:32 +02:00
YuSanka
91a1cd30a0 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-14 10:04:45 +02:00
Filip Sykala
40817f537b Merge branch 'master' into fs_emboss 2022-04-07 16:34:28 +02:00
enricoturri1966
a4435d214f Shader mm_contour - Customizable offset to calculate the correction to avoid z-fighting (MESA driver needs bigger one) 2022-04-07 12:59:11 +02:00
enricoturri1966
0995cfc658 Shader mm_contour - Correction to avoid z-fighting moved from fragment shader to vertex shader 2022-04-07 10:40:33 +02:00
Filip Sykala
65909c74c4 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
2022-03-22 12:52:16 +01:00
Filip Sykala
fec171d14e Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
2022-03-21 21:40:37 +01:00
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +01:00
YuSanka
37c32cb93f Merge remote-tracking branch 'origin/master' into ys_cut 2022-03-14 14:14:08 +01:00
enricoturri1966
4eee0d05f3 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Use shader's vertex attributes and matrices in GLMmSegmentationGizmo3DScene 2022-03-14 09:50:42 +01:00
YuSanka
e5b10ae289 Merge remote-tracking branch 'origin/master' into ys_cut 2022-03-11 15:58:14 +01:00
enricoturri1966
05b65c3a43 Fixed conflicts after merge with branch et_world_coordinates 2022-03-10 13:22:20 +01:00
Filip Sykala
70b94d592b Merge branch 'et_world_coordinates' into fs_emboss_with_CGAL_5_4
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
2022-03-09 11:06:58 +01:00
enricoturri1966
46283cfde3 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES 2022-03-09 08:22:07 +01:00
enricoturri1966
05efb88e3f Tech ENABLE_GLBEGIN_GLEND_REMOVAL renamed as ENABLE_LEGACY_OPENGL_REMOVAL 2022-03-08 14:08:11 +01:00
enricoturri1966
dbdc272c4e Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: mm_gouraud
2022-03-08 11:17:34 +01:00
enricoturri1966
66fa2b1e26 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: mm_contour
2022-03-08 10:57:43 +01:00
Filip Sykala
ad1510a30c Start using string_view in truncate text 2022-03-03 08:13:00 +01:00
YuSanka
ba7b0839f2 Merge remote-tracking branch 'origin/master' into ys_cut 2022-02-28 13:36:10 +01:00
Lukas Matena
389b7ce4bd MeshClipper extended:
- direction and range of the clipping plane can be now set from the outside
- it is now able to show a contour of the cut (not yet ideal with multipart objects that overlap)
2022-02-16 13:42:31 +01:00
Filip Sykala
74cf6649f3 Merge branch 'master' into fs_mouse 2022-02-10 10:26:04 +01:00
enricoturri1966
df3d670357 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed Slic3r::GUI::GLPaintContour from GLGizmoPainterBase.hpp/.cpp and replaced with GLModel 2022-02-09 15:11:56 +01:00
Filip Sykala
0c40e2f8c8 Merge branch 'master' into fs_mouse
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
2022-02-08 10:43:29 +01:00
enricoturri1966
afcac6e2ea Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring of GLModel to:
1) allow for custom vertex data layout

2) allow for custom index data format

3) allow for any OpenGL primitive type
2022-01-27 12:00:51 +01:00
enricoturri1966
0e3a3aa522 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - GLGizmoPainterBase circle 2022-01-21 09:33:52 +01:00
Filip Sykala
f23c356507 Merge branch 'dev' into fs_mouse
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
2022-01-20 09:25:06 +01:00
enricoturri1966
6201dad245 Tech ENABLE_COLOR_CLASSES set as default 2022-01-14 08:19:00 +01:00
enricoturri1966
a2dc1cd446 Fixed conflicts after merge with dev branch 2022-01-12 15:54:48 +01:00
enricoturri1966
243f5c38ee Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT set as default 2022-01-12 13:36:31 +01:00