3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Improved detection and removal of skew in matrices

Browse source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-05-19 12:19:18 +02:00
parent b76f9fc2ee
commit 4846b504a2
2 changed files with 43 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -944,11 +944,6 @@ void ObjectManipulation::update_reset_buttons_visibility()
const Geometry::Transformation& trafo = volume->get_instance_transformation(); const Geometry::Transformation& trafo = volume->get_instance_transformation();
rotation = trafo.get_rotation_matrix(); rotation = trafo.get_rotation_matrix();
scale = trafo.get_scaling_factor_matrix(); scale = trafo.get_scaling_factor_matrix();
if (trafo.has_skew())
// the instance transform contains skew
skew = trafo;
else {
// the world transform contains skew
const Selection::IndicesList& idxs = selection.get_volume_idxs(); const Selection::IndicesList& idxs = selection.get_volume_idxs();
for (unsigned int id : idxs) { for (unsigned int id : idxs) {
const Geometry::Transformation world_trafo(selection.get_volume(id)->world_matrix()); const Geometry::Transformation world_trafo(selection.get_volume(id)->world_matrix());
@ -957,7 +952,6 @@ void ObjectManipulation::update_reset_buttons_visibility()
break; break;
} }
} }
}
#else #else
rotation = volume->get_instance_rotation(); rotation = volume->get_instance_rotation();
scale = volume->get_instance_scaling_factor(); scale = volume->get_instance_scaling_factor();
@ -971,15 +965,9 @@ void ObjectManipulation::update_reset_buttons_visibility()
const Geometry::Transformation& trafo = volume->get_volume_transformation(); const Geometry::Transformation& trafo = volume->get_volume_transformation();
rotation = trafo.get_rotation_matrix(); rotation = trafo.get_rotation_matrix();
scale = trafo.get_scaling_factor_matrix(); scale = trafo.get_scaling_factor_matrix();
if (trafo.has_skew())
// the volume transform contains skew
skew = trafo;
else {
// the world transform contains skew
const Geometry::Transformation world_trafo(volume->world_matrix()); const Geometry::Transformation world_trafo(volume->world_matrix());
if (world_trafo.has_skew()) if (world_trafo.has_skew())
skew = world_trafo; skew = world_trafo;
}
#else #else
rotation = volume->get_volume_rotation(); rotation = volume->get_volume_rotation();
scale = volume->get_volume_scaling_factor(); scale = volume->get_volume_scaling_factor();

48
src/slic3r/GUI/Selection.cpp
View file

@ -1495,23 +1495,41 @@ void Selection::reset_skew()
for (unsigned int i : m_list) { for (unsigned int i : m_list) {
GLVolume& v = *(*m_volumes)[i]; GLVolume& v = *(*m_volumes)[i];
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(); Geometry::Transformation inst_trafo = volume_data.get_instance_transform();
const Geometry::Transformation& vol_trafo = volume_data.get_volume_transform(); Geometry::Transformation vol_trafo = volume_data.get_volume_transform();
const Geometry::Transformation world_trafo = inst_trafo * vol_trafo; Geometry::Transformation world_trafo = inst_trafo * vol_trafo;
if (!inst_trafo.has_skew() && !vol_trafo.has_skew() && world_trafo.has_skew()) { if (world_trafo.has_skew()) {
Geometry::Transformation mod_world_trafo = Geometry::Transformation(world_trafo.get_matrix_no_offset()); if (!inst_trafo.has_skew() && !vol_trafo.has_skew()) {
mod_world_trafo.reset_skew(); // <W> = [I][V]
v.set_volume_transformation(vol_trafo.get_offset_matrix() * inst_trafo.get_matrix_no_offset().inverse() * mod_world_trafo.get_matrix()); world_trafo.reset_offset();
world_trafo.reset_skew();
v.set_volume_transformation(vol_trafo.get_offset_matrix() * inst_trafo.get_matrix_no_offset().inverse() * world_trafo.get_matrix());
} }
else if (m_mode == Instance && inst_trafo.has_skew()) { else {
Geometry::Transformation trafo = inst_trafo; // <W> = <I><V>
trafo.reset_skew(); // <W> = <I>[V]
v.set_instance_transformation(trafo); // <W> = [I]<V>
if (inst_trafo.has_skew()) {
inst_trafo.reset_skew();
v.set_instance_transformation(inst_trafo);
}
if (vol_trafo.has_skew()) {
vol_trafo.reset_skew();
v.set_volume_transformation(vol_trafo);
}
}
}
else {
// [W] = [I][V]
// [W] = <I><V>
if (inst_trafo.has_skew()) {
inst_trafo.reset_skew();
v.set_instance_transformation(inst_trafo);
}
if (vol_trafo.has_skew()) {
vol_trafo.reset_skew();
v.set_volume_transformation(vol_trafo);
} }
else if (m_mode == Volume && vol_trafo.has_skew()) {
Geometry::Transformation trafo = vol_trafo;
trafo.reset_skew();
v.set_volume_transformation(trafo);
} }
} }