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

135 Commits

Author SHA1 Message Date
Lukas Matena
e29970a2ed Added 'is_serializing' flag to GLGizmoBase::data_changed function 2023-03-14 13:57:31 +01:00
enricoturri1966
bf48848b00 Small optimization - Removed unneeded normalization from gizmos Move, Rotate and Scale 2023-02-08 10:21:33 +01:00
enricoturri1966
49fdf01319 Tech ENABLE_WORLD_COORDINATE - Fixed size of Move Gizmo in 3D scene 2023-01-06 13:41:43 +01:00
enricoturri1966
028dfb5d9e Tech ENABLE_LEGACY_OPENGL_REMOVAL set as default 2022-12-06 12:17:01 +01:00
enricoturri1966
6f18f8f784 Tech ENABLE_RAYCAST_PICKING set as default 2022-12-05 10:24:30 +01:00
Filip Sykala - NTB T15p
e28f9daf1e Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Point.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-11-25 11:03:50 +01:00
enricoturri1966
569db9689f Removal of calls to Geometry::assemble_transform() 2022-11-24 14:58:20 +01:00
YuSanka
fbcdd4191b Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master 2022-10-27 13:09:55 +02:00
YuSanka
a8440db5ec Cut WIP: 
* ObjectList & Selection: Show Connectors in the Scene, when CutConnectors Item is selected
* ObjectList: refactoring: extract the adding of volumes to the add_volumes_to_object_in_list()
* If some connector is selected on 3dScene -> select all connectors of this object
* GLGizmoScale3D : check if grabber is enabled, when do rendering
+ GLGizmoCut: refactoring : split render_cut_plane_grabbers to several functions
 2022-09-30 14:07:17 +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
Filip Sykala - NTB T15p
79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Selection.cpp
#	src/slic3r/GUI/Selection.hpp
 2022-07-20 13:02:07 +02:00
enricoturri1966
b38001b1a6 Fixed conflicts after merge with master 2022-07-20 11:02:25 +02:00
YuSanka
89a7f6bdb1 Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut 2022-06-29 11:44:11 +02:00
enricoturri1966
0cedf331b1 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Scale Gizmo 2022-06-13 14:46:06 +02:00
enricoturri1966
df47ba7122 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo 2022-06-13 13:09:24 +02:00
enricoturri1966
36ec839767 Tech ENABLE_GIZMO_GRABBER_REFACTOR set as default 2022-06-10 15:46:28 +02:00
enricoturri1966
cd6155293b Fixed conflicts after merge with master 2022-06-07 11:10:19 +02:00
enricoturri1966
00878fb330 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES merged into ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-06 13:36:29 +02:00
enricoturri1966
ebb9a4aadb Tech ENABLE_WORLD_COORDINATE_SHOW_AXES merged into tech ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-06 11:39:15 +02:00
enricoturri1966
88ce6ccdef Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::scale(const Vec3d& scale, TransformationType transformation_type) to use matrix multiplication 
Fixed conflicts during rebase with master
 2022-06-06 09:54:19 +02:00
enricoturri1966
0e3490620e Added method const GLVolume* Selection::get_first_volume() const to simplify client code 
Fixed conflicts during rebase with master
 2022-06-06 08:44:11 +02:00
enricoturri1966
9f503b95e8 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::rotate(const Vec3d& rotation, TransformationType transformation_type) to use matrix multiplication 
Fixed conflicts during rebase with master
 2022-06-03 15:44:45 +02:00
enricoturri1966
7e72963293 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - 1st installment. Geometry::Transformation modified to store data in a single matrix, without store the matrix components 
Fixed conflicts during rebase with master
 2022-06-03 13:58:36 +02:00
enricoturri1966
90e54e5821 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES merged into tech ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-03 09:57:07 +02:00
enricoturri1966
cd4704e493 Fixed warnings 
Fixed conflicts during rebase with master
 2022-06-03 09:11:06 +02:00
enricoturri1966
fb31bcd0f0 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Volumes scaling in all reference systems using Scale gizmo and part manipulator fields 
Fixed conflicts during rebase with master
 2022-06-03 08:25:08 +02:00
enricoturri1966
5e5fdc4844 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Volumes translation in all reference systems using Move gizmo and part manipulator fields 
Fixed conflicts during rebase with master
 2022-06-02 15:45:06 +02:00
enricoturri1966
79bdcefbde Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - 1st installment: introduction of instance reference system in part manipulation 
Fixed conflicts during rebase with master
 2022-06-02 14:58:44 +02:00
enricoturri1966
679f8b0111 Tech ENABLE_WORLD_COORDINATE - Fixed center of Move and Scale gizmos 
Fixed conflicts during rebase with master
 2022-06-02 14:20:26 +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
e76b5875b7 Tech ENABLE_WORLD_COORDINATE - Fixed Move and Rotate Gizmo size when the selected instance is scaled 
Fixed conflicts during rebase with master
 2022-06-02 11:20:09 +02:00
enricoturri1966
30a0246610 Tech ENABLE_WORLD_COORDINATE - Fixes in Gizmo Move behavior 
Fixed conflicts during rebase with master
 2022-06-02 11:08:37 +02:00
enricoturri1966
c968ba05fb Tech ENABLE_WORLD_COORDINATE - Resize Move and Rotate gizmos in dependence of the selected coordinate system 
Fixed conflicts during rebase with master
 2022-06-02 10:50:22 +02:00
enricoturri1966
ca5742c401 Tech ENABLE_WORLD_COORDINATE - Gizmo rotate oriented in dependence of the selected coordinate system 
Fixed conflicts during rebase with master
 2022-06-02 10:16:07 +02:00
enricoturri1966
61e7eb4ade Tech ENABLE_WORLD_COORDINATE - Modified text of tooltips for Gizmo Move 
Fixed conflicts during rebase with master
 2022-06-02 09:08:24 +02:00
enricoturri1966
ebe411aefb Tech ENABLE_WORLD_COORDINATE - 1st installment 
1) Added combo to select world/local coordinate to part manipulator in sidebar

2) Gizmo move oriented in dependence of the selected coordinate system

3) Sidebar hints for position oriented in dependence of the selected coordinate system

Fixed conflicts during rebase with master
 2022-06-02 08:57:07 +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
914a66e2c3 Tech ENABLE_GL_CORE_PROFILE - Thick lines shader enhanced to render dashed lines 
Fixed conflicts while rebase with master
 2022-05-26 08:11:04 +02:00
enricoturri1966
017784c38e Tech ENABLE_GL_CORE_PROFILE - Use thick_lines shader where needed 
Fixed conflicts during rebase with master
 2022-05-25 15:55:39 +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
YuSanka
73469ffa21 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-28 13:25:00 +02:00
Filip Sykala
7ec422d12f Merge branch 'et_world_coordinates' into fs_emboss 
# Conflicts:
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
 2022-04-20 12:13:17 +02:00
enricoturri1966
8a36c12f13 Fixed conflicts after merge with master 2022-04-20 11:53:51 +02:00
enricoturri1966
f504236734 Tech ENABLE_GIZMO_GRABBER_REFACTOR - Refactoring of GLGizmoBase::Grabber to have a single static instance of the cube and cone models to be shared by all grabbers 2022-04-14 15:15:14 +02:00
YuSanka
91a1cd30a0 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-14 10:04:45 +02:00
YuSanka
463e9ab530 Cut WIP: 
+ Added CutObjectBase class which contains cut attributes for object
+ ObjectList and ManipulationPanel :
    * Disable all ManipulationEditors for solid/negative volumes of cut object
    * Disable Scale/Size ManipulationEditors for objects/instances of objects which are CutParts of initial object
+ Scale/Rotation/Move gizmos are disabled for solid/negative volumes of cut object
+ Select whole CutParts of initial object when ScaleGizmo is active
 2022-04-11 11:20:00 +02:00
enricoturri1966
2b8f8a2842 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-03-28 14:14:12 +02:00