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

Method Transformation::reset_skew() modified to use SVD decomposition of transformation matrix

Browse Source
This commit is contained in:
enricoturri1966 2023-02-02 10:58:48 +01:00
parent f3fda618e9
commit 8446eff59c
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libslic3r/Geometry.cpp
View File

@ -722,26 +722,15 @@ void Transformation::reset()
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
void Transformation::reset_skew() void Transformation::reset_skew()
{ {
Matrix3d rotation; auto new_scale_factor = [](const Matrix3d& s) {
Matrix3d scale; // return s.determinant(); // scale determinant
m_matrix.computeRotationScaling(&rotation, &scale); return (s(0, 0) + s(1, 1) + s(2, 2)) / 3.0; // scale average
// return std::max(s(0, 0), std::max(s(1, 1), s(2, 2))); // max scale
// return std::min(s(0, 0), std::min(s(1, 1), s(2, 2))); // min scale
};
const double average_scale = std::cbrt(scale(0, 0) * scale(1, 1) * scale(2, 2)); const Geometry::TransformationSVD svd(*this);
m_matrix = get_offset_matrix() * Transform3d(svd.u) * scale_transform(new_scale_factor(svd.s)) * Transform3d(svd.v.transpose());
scale(0, 0) = is_left_handed() ? -average_scale : average_scale;
scale(1, 1) = average_scale;
scale(2, 2) = average_scale;
scale(0, 1) = 0.0;
scale(0, 2) = 0.0;
scale(1, 0) = 0.0;
scale(1, 2) = 0.0;
scale(2, 0) = 0.0;
scale(2, 1) = 0.0;
const Vec3d offset = get_offset();
m_matrix = rotation * scale;
m_matrix.translation() = offset;
} }
Transform3d Transformation::get_matrix_no_offset() const Transform3d Transformation::get_matrix_no_offset() const