GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 14:15:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::synchronize_unselected_volumes() to use the new matrix only implementation of Geometry::Transformation

Browse Source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-05-05 08:48:31 +02:00
parent f9f7e6e759
commit c8d93e69be
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/Selection.cpp
View File

@ -3131,10 +3131,14 @@ void Selection::synchronize_unselected_volumes()
#endif // ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL #endif // ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL
const int volume_idx = volume->volume_idx(); const int volume_idx = volume->volume_idx();
#if ENABLE_TRANSFORMATIONS_BY_MATRICES
const Geometry::Transformation& trafo = volume->get_volume_transformation();
#else
const Vec3d& offset = volume->get_volume_offset(); const Vec3d& offset = volume->get_volume_offset();
const Vec3d& rotation = volume->get_volume_rotation(); const Vec3d& rotation = volume->get_volume_rotation();
const Vec3d& scaling_factor = volume->get_volume_scaling_factor(); const Vec3d& scaling_factor = volume->get_volume_scaling_factor();
const Vec3d& mirror = volume->get_volume_mirror(); const Vec3d& mirror = volume->get_volume_mirror();
#endif // ENABLE_TRANSFORMATIONS_BY_MATRICES
// Process unselected volumes. // Process unselected volumes.
for (unsigned int j = 0; j < (unsigned int)m_volumes->size(); ++j) { for (unsigned int j = 0; j < (unsigned int)m_volumes->size(); ++j) {
@ -3145,10 +3149,14 @@ void Selection::synchronize_unselected_volumes()
if (v->object_idx() != object_idx || v->volume_idx() != volume_idx) if (v->object_idx() != object_idx || v->volume_idx() != volume_idx)
continue; continue;
#if ENABLE_TRANSFORMATIONS_BY_MATRICES
v->set_volume_transformation(trafo);
#else
v->set_volume_offset(offset); v->set_volume_offset(offset);
v->set_volume_rotation(rotation); v->set_volume_rotation(rotation);
v->set_volume_scaling_factor(scaling_factor); v->set_volume_scaling_factor(scaling_factor);
v->set_volume_mirror(mirror); v->set_volume_mirror(mirror);
#endif // ENABLE_TRANSFORMATIONS_BY_MATRICES
} }
} }
} }