Commit Graph

10348 Commits

Author SHA1 Message Date
enricoturri1966
cd6155293b Fixed conflicts after merge with master 2022-06-07 11:10:19 +02:00
enricoturri1966
904e3a874e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_trafo_matrix_rebase 2022-06-06 14:57:09 +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
f591535d20 Removed tech ENABLE_WORLD_COORDINATE_VOLUMES_LOCAL_OFFSET 2022-06-06 12:44:01 +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
e3d648c802 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reoworked calculation of volume matrix for newly added modifiers and parts
Fixed conflicts during rebase with master
2022-06-06 12:16:17 +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
9062a74c5c Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Fixed scale reset 2022-06-06 10:18:04 +02:00
enricoturri1966
9efeb0b9e5 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Fixed missing update of object manipulator panel after selecting an object in the 3D scene 2022-06-06 10:18:04 +02:00
enricoturri1966
243985173e Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Allow for relative rotations only when using the object manipulator panel 2022-06-06 10:18:04 +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
fd45d0eeed Tech ENABLE_WORLD_COORDINATE_SHOW_AXES - Fixed bed axes visualization 2022-06-06 10:00:53 +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
eeb81b1ef8 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Let reset buttons in object manipulator to be always visible when needed, no matter what is the current selected reference system 2022-06-06 09:54:46 +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
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
a4c0d99616 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of gizmo rotate
Fixed conflicts during rebase with master
2022-06-03 13:06:53 +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
9acf181dda Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of bed axes 2022-06-03 12:31:02 +02:00
enricoturri1966
47a1989fdc Tech ENABLE_WORLD_COORDINATE - ObjectManipulation::update_reset_buttons_visibility() changed logic for drop to bed button 2022-06-03 12:31:02 +02:00
enricoturri1966
45335ee26b Tech ENABLE_OBJECT_MANIPULATOR_FOCUS - Fixed kill focus handling for sidebar object manipulator fields 2022-06-03 12:27:41 +02:00
enricoturri1966
2b002da8ce Tech ENABLE_WORLD_COORDINATE - Fixed rotation performed from sidebar manipulation fields 2022-06-03 12:27:41 +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
tamasmeszaros
1d3c8ac5b4 Further refactor
Reduce code size for astar
2022-06-03 10:17:05 +02:00
tamasmeszaros
d9ed45be56 Apply remarks from code review with additional cosmethics 2022-06-03 10:08:11 +02:00
enricoturri1966
c29bb039a6 Tech ENABLE_WORLD_COORDINATE - Revisited rotation of single instance 2022-06-03 09:59:02 +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
6e92b4fc3b Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Mirror transform in local system for volumes and a few fixes in rotation
Fixed conflicts during rebase with master
2022-06-03 08:41:23 +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