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

289 Commits

Author SHA1 Message Date
enricoturri1966
989cbeceb1 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate 2023-05-11 12:08:35 +02:00
YuSanka
8e3a988bff Fix for SPE-1687 : SLA - Loop/crash during editing SLA support points 
ManipulationPanel: Disable editable controls, when some gizmo is in editing mode
 2023-05-11 11:57:35 +02:00
enricoturri1966
d9dde32b78 SPE-1606 - Fixed a bunch of bugs/crashes related to visualizing original or processed volumes in 3D scene after slicing using SLA printers when multiple objects are on the printbed 2023-05-03 13:45:15 +02:00
enricoturri1966
159e699cd5 Fixed conflicts after merge with master 2023-04-26 12:35:02 +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
enricoturri1966
797dd1197e Allow the user to switch between visualizing original or processed volumes in 3D scene after slicing using SLA printers 2023-04-03 08:54:04 +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
Filip Sykala - NTB T15p
58e3143ad8 Different handling of shortcut 'T' for emboss text 2023-03-30 18:16:59 +02:00
Lukas Matena
e29970a2ed Added 'is_serializing' flag to GLGizmoBase::data_changed function 2023-03-14 13:57:31 +01:00
YuSanka
be74338e53 Follow-up a41dd8eeed50b9bfbb9f37769569f091512d8124 - Added missed updates for transformed bounding box 
+ Fixed Arrow Up/Down action. Cut plane is moved during the its own normal instead of during the Z axes
 2023-02-23 10:01:40 +01:00
David Kocik
08135550e2 Fix of hints arrow for gizmos and hints text 2023-02-17 09:56:34 +01:00
enricoturri1966
a078627552 Follow-up of 1218103fd620b319c56fd08116f81b581c537188 - Fixed gizmo missbehavior when closing a gizmo by resetting the selection clicking on the scene 2023-01-30 14:00:02 +01:00
enricoturri1966
1218103fd6 Revert of a3324d3e50114aa16c48be7ec6b939c9315f4dde - Replaced with a more robust fix 2023-01-30 09:34:17 +01:00
enricoturri1966
43c195e227 Fixed conflicts after merge with master 2022-12-07 15:44:27 +01:00
enricoturri1966
028dfb5d9e Tech ENABLE_LEGACY_OPENGL_REMOVAL set as default 2022-12-06 12:17:01 +01:00
enricoturri1966
8eb12cbaf0 Fixed conflicts after merge with master 2022-12-05 13:29:28 +01:00
enricoturri1966
6f18f8f784 Tech ENABLE_RAYCAST_PICKING set as default 2022-12-05 10:24:30 +01:00
enricoturri1966
38d2e0605a Gizmo Measure - Handling of [ESC] key 
When two features are selected -> unselected second feature

When one feature is selected -> unselect first feature

When no feature is selected -> close gizmo
 2022-12-02 12:26:29 +01:00
enricoturri1966
543950bf4b Gizmo Measure - Use [Delete] key in place of Shift+Right mouse to restart selection 2022-12-02 12:26:29 +01:00
enricoturri1966
602c48a116 Added new base class for SLA gizmos to remove duplicated code 2022-11-29 11:14:35 +01:00
Filip Sykala - NTB T15p
7c1a513e5a Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
 2022-11-21 10:16:25 +01:00
enricoturri1966
a117a13b91 Gizmo measure - Modified states: 
Pressing CTRL activates 'point selection'

Pressing CTRL+SHIFT while hovering a circle or an edge with extra point activates 'center selection'
 2022-11-10 13:34:47 +01:00
Filip Sykala - NTB T15p
c77f8373bd Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Selection.hpp
 2022-11-07 15:44:33 +01:00
enricoturri1966
da5a9277fa Tech ENABLE_MEASURE_GIZMO set as default 2022-11-02 08:50:12 +01:00
enricoturri1966
2c9d047520 Fixed conflicts after merge with master 2022-10-31 14:59:41 +01:00
YuSanka
fbcdd4191b Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master 2022-10-27 13:09:55 +02:00
enricoturri1966
ed287215db Measuring: Added Measure gizmo imgui dialog + removed tech ENABLE_MEASURE_GIZMO_DEBUG + locking of features by pressing CTRL key 2022-10-12 09:22:34 +02:00
enricoturri1966
aeb8dec463 Measuring: code for Measure gizmo embedded into new tech ENABLE_MEASURE_GIZMO 
Fixed conflicts while rebasing to master
 2022-10-12 09:22:20 +02:00
Lukas Matena
bd63320a00 Measuring: separated another gizmo 2022-10-12 09:10:50 +02:00
YuSanka
58c7d8b188 CutGizmo: Connectors mode: Implemented Rectangular selection of connectors 
+ some code refactoring
 2022-10-03 17:24:50 +02:00
YuSanka
94685b5ad8 WIP Cut: Fixed an adding/deleting of the connectors to the selection_info 
+ more code refactoring
 2022-09-20 20:29:00 +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
YuSanka
31800bb85d GizmoScale: Suppress ununiversal scale for cut objects 
+ Gizmos/GLGizmoRotate: Deleted changes which was made for GizmoCut, but aren't used any more
 2022-07-28 14:23:51 +02:00
YuSanka
27f7a8da0f Cut WIP: Added shortcuts for "Edit connectors" ImGuiDialog 
+ Added processing for the Ctrl+A ("Select All connectors")
 2022-07-27 13:53:54 +02:00
YuSanka
89a7f6bdb1 Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut 2022-06-29 11:44:11 +02:00
enricoturri1966
df47ba7122 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo 2022-06-13 13:09:24 +02:00
enricoturri1966
cd6155293b Fixed conflicts after merge with master 2022-06-07 11:10:19 +02:00
enricoturri1966
c99e93c357 Fixed differences after rebase with master 2022-06-06 14:55:38 +02:00
enricoturri1966
f89a902bbb Tech ENABLE_WORLD_COORDINATE - Fixed translation in local coordinate for single instance selection 
Fixed conflicts during rebase with master
 2022-06-02 12:23:01 +02:00
enricoturri1966
ca5c04bab2 Tech ENABLE_WORLD_COORDINATE - Modified method Selection::requires_uniform_scale() 
Fixed conflicts during rebase with master
 2022-06-02 12:13:52 +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
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
enricoturri1966
b9b8406ad8 Fixed conflicts after merge with master 2022-03-10 10:32:00 +01:00
Filip Sykala
f75f326f8e Merge branch 'master' into fs_emboss_with_CGAL_5_4 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
 2022-03-09 11:08:39 +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
c17c4d2e9a Follow-up of 005fef7bf68e2e589e8ecb3de80a43aa37043ce3 - Fixed imgui dialogs associated to gizmo bar and toolbar items 2022-03-08 09:24:42 +01:00
enricoturri1966
f4726f738c Follow-up of 005fef7bf68e2e589e8ecb3de80a43aa37043ce3 - Fixed highlight arrows for gizmos bar and toolbars 2022-03-07 15:06:45 +01:00