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

199 Commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
ed6a1b18f3 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-09-14 11:28:36 +02:00
YuSanka
2ca3e47f92 "legend_*"-icons from font_icons to font_icons_large to avoid blurring 2022-09-06 11:16:05 +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
enricoturri1966
2b996158d2 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_opengl_es_rebase 2022-08-18 12:51:55 +02:00
Vojtech Bubnik
a93620621d Performance improvement of GCodeProcessor: 
Replaced std::string with std::string_view for constant parameters
Replaced boost:istarts_with() with boost::starts_with()
 2022-08-18 10:33:26 +02:00
enricoturri1966
f9c6e8eb7a Added processing of mouse double click in ImGuiWrapper::update_mouse_data() 2022-07-29 12:06:52 +02:00
tamasmeszaros
9a7e024f78 Update wxWidgets to 3.1.7 
added handling for nanosvg with cmake
 2022-07-29 11:21:54 +02:00
enricoturri1966
5cf71bb094 Tech ENABLE_SHOW_TOOLPATHS_COG set as default 2022-07-27 15:52:40 +02:00
enricoturri1966
bb36f0df0c Tech ENABLE_OPENGL_ES - 1st installment 2022-07-21 15:43:11 +02:00
enricoturri1966
22b634ca1d Fixed crash at startup on Mac OS 2022-07-13 08:56:00 +02:00
enricoturri1966
41541287a1 Tech ENABLE_GL_IMGUI_SHADERS merged into ENABLE_LEGACY_OPENGL_REMOVAL 
Fixed conflicts during rebase with master
 2022-05-26 11:08:24 +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
eb9af502c8 Use OpenGLManager::are_compressed_textures_supported() where needed 2022-05-26 08:11: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
3e9778b46b Merge branch 'et_world_coordinates' into fs_emboss 2022-05-02 10:11:47 +02:00
Lukas Matena
09fe421fe8 Merge branch 'stable' (no conflicts fixed) 2022-04-27 22:24:13 +02:00
Lukas Matena
6288ec4bf0 Fix of #8171: Two Chinese characters added into the range to load for ImGui 2022-04-11 12:10:16 +02:00
Filip Sykala
331d4d4557 Show user warning about unknown symbols by font inside of input text 
Fix correct selection of collection ascent, descent, ...
Remove boost log from emboss --> not work properly on thread
 2022-04-07 16:34:14 +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
9be3d926c5 Tech ENABLE_LEGACY_OPENGL_REMOVAL - A few refactorings and fixes 2022-03-22 08:18:39 +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
4964d6ecd5 ENABLE_GL_IMGUI_SHADERS - Fixes in ImGuiWrapper::render_draw_data() 2022-03-21 11:31:32 +01:00
enricoturri1966
2ab8469cb6 Refactoring in ImGuiWrapper::render_draw_data() 2022-03-14 13:34:08 +01:00
enricoturri1966
5586fd92f2 Follow-up of d0d89a4d5bc02a87f417a2f2c73f5f91db0da5d6 - Fixed warnings 2022-03-14 09:50:25 +01:00
enricoturri1966
d0d89a4d5b Tech ENABLE_GL_IMGUI_SHADERS - Render imgui using shaders 2022-03-14 09:04:44 +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
Filip Sykala
ad1510a30c Start using string_view in truncate text 2022-03-03 08:13:00 +01:00
Filip Sykala
a0dde4651b Add default value to optional input 
Remove unnecessary addiction to canvas3d in imgui wrapper
 2022-03-02 14:34:25 +01:00
enricoturri1966
1eac357739 Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: GLVolume geometry + removed class GLIndexedVertexArray from codebase 2022-02-23 13:39:54 +01:00
Filip Sykala
a8ef5c35d2 Undo changes for input 2022-02-18 12:33:39 +01:00
Filip Sykala
84cd85e243 Fix advanced alliment + translation for calc offsets 2022-02-16 08:41:56 +01:00
Filip Sykala
faa63f3182 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
 2022-02-10 14:04:02 +01:00
enricoturri1966
92aa6540f5 Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity 2022-02-08 12:57:56 +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
Filip Sykala
53ee0092b0 Create emboss object on cursor position 2022-01-28 18:00:10 +01:00
YuSanka
94b8c4f096 Merge remote-tracking branch 'origin/master' into dev 2022-01-20 15:22:24 +01:00
David Kocik
86c49163f8 latin-2 for Hungarian in imgui 
#5479
 2022-01-20 14:17:02 +01:00
enricoturri1966
b9b702d550 Fixed conflicts after merge with branch dev 2022-01-14 09:55:13 +01:00
Filip Sykala
5c481a6da5 Fix imgui truncation 2022-01-14 09:36:42 +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
Filip Sykala
3e0bc4a529 Only unique name of font item 
Add FontListSerializable for store/load font list from AppConfig
 2022-01-10 10:59:10 +01:00
Filip Sykala
82ee1c5e4a Add boldness and skew(italic) for embossed text 
Change line_gap and char_gap to optional value
 2022-01-05 16:56:20 +01:00
enricoturri1966
cd4094743e Tech ENABLE_COLOR_CLASSES - 1st installment -> Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation 2021-12-22 10:45:35 +01:00
Filip Sykala
1259b878fb add NSVG utils into cmakelists 
Move trunc to ImGuiWrapper
 2021-12-20 21:58:21 +01:00
Filip Sykala
88523bceb6 Merge branch 'master' into fs_emboss 2021-12-13 10:52:04 +01:00
enricoturri1966
f958c14db8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-12-09 09:03:20 +01:00
Lukas Matena
06fd732b57 Fixed behaviour of float sliders in SLA gizmos, 
which was broken after the 'Edit' button was added.
This is a bit hacky fix, it might be worth improving later.
 2021-12-08 16:19:08 +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