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

85 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
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
enricoturri1966
4eee0d05f3 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Use shader's vertex attributes and matrices in GLMmSegmentationGizmo3DScene 2022-03-14 09:50:42 +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
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
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
123903f317 Clean up GLGizmoManagaer 
Clean up GLGizmoBase
 2021-12-10 14:58:06 +01:00
Lukáš Hejl
8a4323c5b9 Fixed the layout of the painting gizmos after the edit icon for sliders was added. 2021-11-17 11:44:38 +01:00
YuSanka
8bfa132a1b Localization fixes + new POT 2021-11-12 09:21:41 +01:00
enricoturri1966
f7662682c8 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Modified ImGuiWrapper::slider_float() to create a compound widget where an additional button can be used to set the keyboard focus into the slider to allow the user to type in the desired value 2021-11-05 14:46:44 +01:00
Lukáš Hejl
0f9a9de745 Fixed darker colors of objects inside multi-material gizmo when objects are mirrored. 2021-10-25 08:41:41 +02:00
Lukáš Hejl
0c2d9f01a6 Fixed z-fighting between contour around the area selected by smart fill and painted triangles inside the FDM support painting gizmo. 2021-10-18 11:35:13 +02:00
Lukáš Hejl
b45675b4e1 Follow-up of 6194e67e689d85d4e6d0666dd4c2b993fdeeb90d - Separated the part that computed triangles normals and lighting inside the fragment shader into a separate shader mm_gouraud, which is only used for the multi-material painting gizmo. 2021-10-18 11:35:13 +02:00
Lukáš Hejl
b2fc50c9d9 Small refactoring of showing tooltips in gizmos. 2021-10-18 10:56:50 +02:00
Lukáš Hejl
6f6f6de506 Added an option to limit painting to triangles only highlighted by "Highlight by angle" in the support painting gizmo. 2021-10-18 10:54:31 +02:00
Lukáš Hejl
d6d575f607 Renamed the brush "Pointer" to "Triangles" in the multi-material painting gizmo, and in the FDM supports painting gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
ebdc69bdc9 Fixed the positioning of the painting gizmos. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
2b59a16dc7 Refactored rendering of the contour around areas selected by smart fill to prepare it for the FDM supports painting gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
99edfd22ce Improved the alignment of tool type and brush type in the multi-material gizmo. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
925d3fad1f Fixed the wrong calculation of caption text size in all painting gizmos, which could lead to showing unintended space after ImGui::SliderFloat. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
6012bf1e03 Removed unintended space after ImGui::SliderFloat in all painting gizmos. 2021-10-07 13:12:36 +02:00
Lukáš Hejl
992a279bef Removed the vertical space in the below information about how to use gizmo for all painting gizmos. 2021-10-07 13:12:36 +02:00
David Kocik
29aab3a426 PrintInfoNotificationLevel with icon 2021-10-01 15:03:40 +02:00
Lukas Matena
c61a5d234e After gizmo snapshots are compacted, rename the last one to something generic 2021-09-30 12:17:52 +02:00
enricoturri1966
40877b12f7 Vertical alignment of labels in imgui dialog for GLGizmoMmuSegmentation 2021-09-15 14:32:43 +02:00
David Kocik
b9dab7540e Removes bottom status bar. 
StatusBar class calls are commented out and replaced with notifications.
SlicicingProgress notification shows progress of slicing, ProgressIndicator notification handles other progress information, like arrange objects etc.
 2021-09-10 14:35:13 +02:00
Lukas Matena
a4300b8e64 Naming of the entering/leaving snapshots is now more generic, 
it uses the actual name of the gizmo. Also, the keyboard shortcut
is now appended to the name, instead of being duplicated in it.
 2021-09-03 13:53:07 +02:00
Lukáš Hejl
3b4d10656c Renamed 'Seed fill' to 'Smart fill'. 2021-09-01 14:32:34 +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
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
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