GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-04 04:40:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
21,935 Commits 131 Branches 318 Tags
Commit Graph

111 Commits

Author SHA1 Message Date
Lukáš Hejl
db60d23c18 Fix of #9809: Crash after splitting an object into parts. 
Now after splitting an object into parts, custom supports, seams, and multimaterial painting are removed, and the user is notified about it.

Also, this commit fixed the text of the notification about removing custom supports, seams, and multimaterial painting by Simplify gizmo. And it also fixed that info about custom supports, seams, and multimaterial painting was still shown in the right panel after the model simplification event when custom supports, seams, and multimaterial were removed.
 2023-02-21 13:55:24 +01:00
enricoturri1966
028dfb5d9e Tech ENABLE_LEGACY_OPENGL_REMOVAL set as default 2022-12-06 12:17:01 +01: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
enricoturri1966
bb36f0df0c Tech ENABLE_OPENGL_ES - 1st installment 2022-07-21 15:43:11 +02:00
enricoturri1966
8d0780aabe Tech ENABLE_GL_CORE_PROFILE - Added command line option '--opengl-core=M.m' which allows the user to select a specific OpenGL version supporting core profile 2022-05-30 16:15:25 +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
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
enricoturri1966
389dc36053 Tech ENABLE_GL_CORE_PROFILE - Use OpenGL core profile context - 1st installment 
Fixed conflicts during rebase with master
 2022-05-25 15:29:10 +02:00
Filip Sykala
37961c36e8 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
 2022-05-18 14:35:48 +02:00
David Kocik
ca3df3926e typo in notification text 2022-05-13 16:54:57 +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
Filip Sykala
65909c74c4 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
 2022-03-22 12:52:16 +01:00
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +01:00
enricoturri1966
05b65c3a43 Fixed conflicts after merge with branch et_world_coordinates 2022-03-10 13:22:20 +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
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
enricoturri1966
d6b0a9858b Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Selection sidebar hints
 2022-03-04 10:52:30 +01:00
enricoturri1966
f7d06f4ec8 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Gizmo Simplify
 2022-03-04 09:16:17 +01:00
Filip Sykala
ad1510a30c Start using string_view in truncate text 2022-03-03 08:13:00 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	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/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
 2022-02-02 15:27:25 +01:00
enricoturri1966
5db3c66cf7 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Added method void init_from(const TriangleMesh& mesh) to GLModel 2022-01-27 13:45:30 +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
Filip Sykala
0b2a52f916 Merge branch 'dev' into fs_simplify_multipart_object 
# Conflicts:
#	src/slic3r/GUI/GLModel.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
 2022-01-16 19:21:02 +01:00
Filip Sykala
d698df2c31 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
 2021-12-01 14:35:42 +01:00
YuSanka
b78b91b72e Localization: Updated CZ, DE, ES, FR, IT and PL dictionaries. 
+ Fixed some of phrases and updated POT-file
 2021-12-01 13:07:25 +01:00
Lukas Matena
2c5ddfefb2 Fixed an encoding problem in simplify suggestion 2021-11-26 15:15:51 +01:00
Filip Sykala
eba68f9a9e Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
 2021-11-23 09:09:09 +01:00
Filip Sykala
4211aba981 Fix esc key 
Fix model color
Fix
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:559:35: warning: unused variable 'volume_ids' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:560:28: warning: unused variable 'model_objects' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:694:16: warning: unused variable 'info' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:721:35: warning: unused variable 'volume_ids' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:97:17: warning: 'uint32_t Slic3r::GUI::get_triangle_count(const std::set<Slic3r::ObjectID>&, const Slic3r::GUI::Selection&)' defined but not used [-Wunused-function]
 2021-11-22 17:36:08 +01:00
Filip Sykala
74eb4ec042 Merge branch 'master' into fs_simplify_multipart_object 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
 2021-11-22 15:50:53 +01:00
Filip Sykala
471ebe5c83 using ObjectID instead of ModelVolume pointer and CompositID 2021-11-22 15:45:57 +01:00
Lukas Matena
a22bc7f7c8 Show an error dialog when opening simplification on incompatible selection 2021-11-22 11:00:17 +01:00
Lukas Matena
6180e3a89e Do not open simplify dialog on top of the main toolbar 2021-11-22 11:00:17 +01:00
Filip Sykala
f4ad435ec5 change windows position on one line only 2021-11-22 09:45:55 +01:00
Filip Sykala
8a44a754ca Fix glmodel initialization 2021-11-22 09:10:39 +01:00
Filip Sykala
edba9cfca3 multipart - Not finished 2021-11-19 15:42:03 +01:00
Filip Sykala
3670280ab6 multipart merge 2021-11-16 14:42:25 +01:00
enricoturri1966
f86cd8409d Added missing include 2021-11-12 08:07:07 +01:00
Lukas Matena
c677b2771c Make sure the object does not float after simplification 2021-11-12 07:37:17 +01:00
Filip Sykala
934ed0bbae Remove static flag and extend case when call after will be from unactive Gizmo. 2021-11-12 06:49:09 +01:00
Filip Sykala
d72fba2a6a translation of progress 2021-11-12 06:49:09 +01:00
Lukas Matena
a61c892c05 Some more fixes when switching objects while simplifying 2021-11-12 06:49:09 +01:00
Lukas Matena
0bfa81be56 Several more fixes: 
- fixed crash on close when worker is running
- refresh percentage in the UI by requesting extra frames
- get rid of extra m_is_worker_running variable
 2021-11-12 06:49:09 +01:00
Lukas Matena
9ad54ab4db Some more cleanup 2021-11-12 06:49:09 +01:00
Lukas Matena
be04751776 Many small fixes 2021-11-12 06:49:09 +01:00
Lukas Matena
7bcab6f795 Simplify does not touch ModelVolume all the time (runs, but needs polishing) 2021-11-12 06:49:09 +01:00
Lukas Matena
ab260d005e More adjustments, still working with Model directly 2021-11-12 06:49:09 +01:00
Lukas Matena
6661967f9f Shared data packed in a struct 2021-11-12 06:49:09 +01:00
Lukas Matena
ba56a79795 Simplify gizmo now renders the volume by itself, 
it does not rely on the usual GLVolume rendering. GLCanvas3D::toggle_model_object_visibility
was extended to hide a single volume. Rendering the model and wireframe uses the same
vertex buffer, which is now used through GLModel class. GLGizmoRenderTransparent class
should no longer be needed. GLCanvas3D::reload_scene calls replaced with request_rerender.
 2021-11-12 06:49:09 +01:00