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

132 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
745c55abc3 Follow-up of 9c7a4a1e519fa51c03aa177ad0006e4278e115f8 and 62ecc3a82a4fb13b51c1d942334df434140a3e5a - Fixed gizmo scale rotating for parts having skew and its rendering for mirrored parts 2023-02-13 14:53:21 +01:00
enricoturri1966
62ecc3a82a Partial revert of 9c7a4a1e519fa51c03aa177ad0006e4278e115f8 which broke gizmo scale in Object Coordinates for mirrored instances 2023-02-10 14:04:58 +01:00
enricoturri1966
d319f920cb Simplified code into GLGizmoScale3D::on_render() 2023-02-08 14:45:45 +01:00
enricoturri1966
b182675e35 Removed obsolete code from gizmo scale 2023-02-08 10:42:01 +01:00
enricoturri1966
bf48848b00 Small optimization - Removed unneeded normalization from gizmos Move, Rotate and Scale 2023-02-08 10:21:33 +01:00
enricoturri1966
c2a6694df3 Fixed constrained scale of single instance selections 2023-02-07 13:48:13 +01:00
enricoturri1966
9c7a4a1e51 Fixed rendering of scale gizmo 2023-02-07 11:05:32 +01:00
enricoturri1966
4bb768c1ce Tech ENABLE_WORLD_COORDINATE - Fixed size of Scale Gizmo in 3D scene 2023-01-09 08:14:47 +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
8f644f5e08 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-09-23 14:11:47 +02:00
YuSanka
b2d5fd72e9 Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-23 13:32:32 +02:00
Lukas Matena
70be93d112 Fixed issue with Euler angles: 
the function to extract Euler angles did not work reliably in some of the corner cases.
The bug was not present in 2.5.0 release.
 2022-09-23 13:23:40 +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
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
YuSanka
89a7f6bdb1 Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut 2022-06-29 11:44:11 +02:00
enricoturri1966
0a7dae6df6 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Cut Gizmo 2022-06-13 14:54:52 +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
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
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
e4fb142afc Tech ENABLE_WORLD_COORDINATE_SCALE_REVISITED merged into tech ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-06 12:01:44 +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
b5d366d385 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Allow skew in matrices 
Fixed conflicts during rebase with master
 2022-06-06 09:07:50 +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
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
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
f944595d3d Tech ENABLE_WORLD_COORDINATE - Fixed constrained scaling of volumes in local coordinates 2022-06-02 13:39:01 +02:00
enricoturri1966
cf90ad699f Tech ENABLE_WORLD_COORDINATE - Fixed unconstrained scaling of volumes in local coordinates 
Fixed conflicts during rebase with master
 2022-06-02 13:38:47 +02:00
enricoturri1966
ad6dcf3f10 Tech ENABLE_WORLD_COORDINATE - Fixed constrained scaling of instances in local coordinates 
Fixed conflicts during rebase with master
 2022-06-02 13:30:23 +02:00
enricoturri1966
0eaa4c5dea Tech ENABLE_WORLD_COORDINATE - Fixed unconstrained scaling in world coordinates for volumes 
Fixed conflicts during rebase with master
 2022-06-02 13:21:24 +02:00
enricoturri1966
9074407196 Follow-up of 86b44b48005e3ddb96e851e19f8e2ccd1a38b667 - Constrained uniform scaling in world coordinates for rotated instances 2022-06-02 13:09:43 +02:00
enricoturri1966
1191ab42cb Tech ENABLE_WORLD_COORDINATE - Added constrained uniform scaling in world coordinates for instances 
Fixed conflicts during rebase with master
 2022-06-02 13:09:30 +02:00
enricoturri1966
d7753fc476 Tech ENABLE_WORLD_COORDINATE - Fixed constrained non-uniform scaling in world coordinates for rotated instances 
Fixed conflicts during rebase with master
 2022-06-02 13:05:12 +02:00
enricoturri1966
d5a02e617a Partial revert of 7e5c214b91ae14740fc188413948818a1b49928a to restore code mistakenly removed and needed when tech ENABLE_WORLD_COORDINATE is disabled 
Fixed conflicts during rebase with master
 2022-06-02 12:58:35 +02:00
enricoturri1966
b2a7c84c85 Tech ENABLE_WORLD_COORDINATE - Fixed gizmo Scale in world coordinates 
Fixed conflicts during rebase with master
 2022-06-02 11:34:53 +02:00
enricoturri1966
c4ad8bc41a Other refactoring plus some fixes into GLGizmoScale3D 
Fixed conflicts during rebase with master
 2022-06-02 11:29:47 +02:00