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

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

Browse Source
This commit is contained in:
enricoturri1966 2022-05-18 09:11:20 +02:00
parent eb8c114a06
commit 599fc84e98
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1418,7 +1418,13 @@ void Selection::reset_skew()
const VolumeCache& volume_data = m_cache.volumes_data[i]; const VolumeCache& volume_data = m_cache.volumes_data[i];
const Geometry::Transformation& inst_trafo = volume_data.get_instance_transform(); const Geometry::Transformation& inst_trafo = volume_data.get_instance_transform();
const Geometry::Transformation& vol_trafo = volume_data.get_volume_transform(); const Geometry::Transformation& vol_trafo = volume_data.get_volume_transform();
if (m_mode == Instance && inst_trafo.has_skew()) { const Geometry::Transformation world_trafo = inst_trafo * vol_trafo;
if (!inst_trafo.has_skew() && !vol_trafo.has_skew() && world_trafo.has_skew()) {
Geometry::Transformation mod_world_trafo = Geometry::Transformation(world_trafo.get_matrix_no_offset());
mod_world_trafo.reset_skew();
v.set_volume_transformation(vol_trafo.get_offset_matrix() * inst_trafo.get_matrix_no_offset().inverse() * mod_world_trafo.get_matrix());
}
else if (m_mode == Instance && inst_trafo.has_skew()) {
Geometry::Transformation trafo = inst_trafo; Geometry::Transformation trafo = inst_trafo;
trafo.reset_skew(); trafo.reset_skew();
v.set_instance_transformation(trafo); v.set_instance_transformation(trafo);
@ -1428,19 +1434,6 @@ void Selection::reset_skew()
trafo.reset_skew(); trafo.reset_skew();
v.set_volume_transformation(trafo); v.set_volume_transformation(trafo);
} }
else {
const Geometry::Transformation world_trafo = inst_trafo * vol_trafo;
if (world_trafo.has_skew()) {
if (m_mode == Instance) {
// TODO
int a = 0;
}
else {
// TODO
int a = 0;
}
}
}
} }
ensure_on_bed(); ensure_on_bed();