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

306 Commits

Author SHA1 Message Date
enricoturri1966
5351137183 (Win Only) Detection of cursor size, to place tooltips on scene, performed on tooltip text setting instead of being repeated every frame 2022-12-06 13:49:05 +01:00
enricoturri1966
028dfb5d9e Tech ENABLE_LEGACY_OPENGL_REMOVAL set as default 2022-12-06 12:17:01 +01:00
enricoturri1966
075c241906 Tech ENABLE_GIZMO_MEASURE_WORLD_COORDINATES set as default 
Fixed conflicts during rebase to master
 2022-12-02 12:26:12 +01:00
enricoturri1966
fc2f0bad6e Gizmo measure modified to accept single full instance selection, to combine the volumes meshes into a single mesh and pass it to the back end after transform it in world coordinates 
Changes embedded into tech ENABLE_GIZMO_MEASURE_WORLD_COORDINATES

Fixed conflicts during rebase to master
 2022-12-02 11:59:47 +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
bba6d8b94d Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-10-25 16:16:36 +02:00
Filip Sykala - NTB T15p
a752ccb420 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-10-19 19:35:31 +02:00
enricoturri1966
71660a281b Tech ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL set as default 2022-10-19 08:52:35 +02:00
YuSanka
1f1ed048db Fixed context menu for Text 2022-10-03 11:22:41 +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
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
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
enricoturri1966
4e315bcf27 Follow-up of 4e188c71c30677c64d97404c36d6cc8181938644 - Betterfix for update of non selected instances when applying mirror 2022-09-05 14:16:08 +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
4e188c71c3 SPE-1275 - Tech ENABLE_WORLD_COORDINATE - Fixed update of non selected instances when applying mirror 2022-08-25 11:59:51 +02:00
Filip Sykala - NTB T15p
e86477f20a Fix blinking when undo change 2022-07-26 11:00: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
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
4846b504a2 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Improved detection and removal of skew in matrices 
Fixed conflicts during rebase with master
 2022-06-06 12:43:42 +02:00
enricoturri1966
b76f9fc2ee Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Scaling using object manipulator fields 
Fixed conflicts during rebase with master
 2022-06-06 12:38:20 +02:00
enricoturri1966
3b3edb5a97 Fixed build and warnings on Linux and Mac 
Fixed conflicts during rebase with master
 2022-06-06 12:22:42 +02:00
enricoturri1966
2602c6bf92 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Implemented reset skew button for the case when volume world matrix contains skew while volume and instance matrices do not 
Fixed conflicts during rebase with master
 2022-06-06 12:07:45 +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
7c86cf84a3 Tech ENABLE_COORDINATE_DEPENDENT_SELECTION_BOX merged into tech ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-06 10:53:26 +02:00
enricoturri1966
882a5ffec5 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Fixed uniform scale using object manipulator panel 
Fixed conflicts during rebase with master
 2022-06-06 10:22:05 +02:00
enricoturri1966
3fcfd04921 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Fixed translation of volumes in local coordinate system 
Fixed conflicts during rebase with master
 2022-06-06 10:17:43 +02:00
enricoturri1966
19712749c3 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Added reset button to remove skew, when detected, in object manipulator panel 
Fixed conflicts during rebase with master
 2022-06-06 10:00:28 +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
63c9ce23df Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void synchronize_unselected_instances(SyncRotationType sync_rotation_type) to use the new matrix only implementation of Geometry::Transformation 
Fixed conflicts during rebase with master
 2022-06-06 09:04:12 +02:00
enricoturri1966
c8d93e69be Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::synchronize_unselected_volumes() to use the new matrix only implementation of Geometry::Transformation 
Fixed conflicts during rebase with master
 2022-06-06 08:55:38 +02:00
enricoturri1966
f9f7e6e759 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::flattening_rotate(const Vec3d& normal) to use matrix multiplication 
Fixed conflicts during rebase with master
 2022-06-06 08:50:57 +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
55be16d158 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::translate(unsigned int object_idx, unsigned int instance_idx, const Vec3d& displacement) to use matrix multiplication and removed unused method void Selection::translate(unsigned int object_idx, const Vec3d& displacement) 
Fixed conflicts during rebase with master
 2022-06-03 15:05:44 +02:00
enricoturri1966
2f6f73e10f Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::translate(const Vec3d& displacement, ECoordinatesType type) to use matrix multiplication 
Fixed conflicts during rebase with master
 2022-06-03 14:56:07 +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
8c95f47d4a Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of sidebar hints reference system 
Fixed conflicts during rebase with master
 2022-06-03 13:00:10 +02:00
enricoturri1966
155c3e8895 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of selection bounding box 
Fixed conflicts during rebase with master
 2022-06-03 12:42:30 +02:00
enricoturri1966
e86cbf0d8c Tech ENABLE_WORLD_COORDINATE_SCALE_REVISITED - Detection of required transformation baking done on mouse dragging event in place of mouse up event for gizmo scale 
Fixed conflicts during rebase with master
 2022-06-03 12:27:24 +02:00
enricoturri1966
622796e9e3 Tech ENABLE_WORLD_COORDINATE_SCALE_REVISITED - Alternate implementation of manipulating scale for instances and volumes using gizmo scale and sidebar object manipulator fields - 1st installment 
Fixed conflicts during rebase with master
 2022-06-03 12:17:12 +02:00
enricoturri1966
558bccec48 Tech ENABLE_WORLD_COORDINATE_SHOW_AXES - Show axes of the current reference system when sidebar hints are active for non-world reference systems 
Fixed conflicts during rebase with master
 2022-06-03 11:45:22 +02:00
enricoturri1966
912d781446 Tech ENABLE_COORDINATE_DEPENDENT_SELECTION_BOX - Render the selection bounding box in the current reference system 
Fixed conflicts during rebase with master
 2022-06-03 11:05:49 +02:00
enricoturri1966
9706f16e69 Tech ENABLE_WORLD_COORDINATE - Revisited rotation of single volume 
Fixed conflicts during rebase with master
 2022-06-03 10:26:37 +02:00