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

99 Commits

Author SHA1 Message Date
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
Lukas Matena
50ea144b84 Minor improvements: 
- const corectness
- volatile -> std::atomic
- GUI::format
- encoding issues
 2021-11-12 06:49:09 +01:00
Filip Sykala
9086879e16 Change float slider to wrap function. Enrico's request 2021-11-05 14:48:37 +01:00
Filip Sykala
ae5f594e1e Merge branch 'master' into fs_emboss 2021-10-21 19:43:05 +02:00
Filip Sykala
1a9a4088c2 Fix translation suggestion by @Oleksandra Iushchenko 2021-10-21 11:01:15 +02:00
Filip Sykala
5224e9c5cb Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
 2021-10-20 12:41:49 +02:00
Filip Sykala
fa7b2f351f Fix for: 
../src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:102:46: error: control reaches end of non-void function [-Werror=return-type]
src\slic3r\GUI\Gizmos\GLGizmoSimplify.cpp(103) : warning C4715: '<lambda_8434c3588ffcd21c397d2cfeb10266a5>::operator()': not all control paths return a value
 2021-10-20 11:19:15 +02:00
Filip Sykala
76c0c76f5f open simplification on center when open from notification 2021-10-19 18:53:42 +02:00
Filip Sykala
ee7d5db31c Add live preview on open gizmo 
Add delay 250ms before process for live move with slider
Add short cut for unmodified mesh in processing
 2021-10-19 16:51:03 +02:00
Filip Sykala
79dd007ec7 Fix bloating of history with live preview 2021-10-19 16:15:27 +02:00
Filip Sykala
6c8f754186 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/3DScene.cpp
 2021-10-19 13:40:19 +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