kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Core: Fix resetting placement of transformed image

Browse Source 
The restored Euler angles of a rotation may significantly differ from the input Euler angles so that determining the plane isn't very reliable.
To get the plane reliably multiply (0,0,1) with the rotation and use this as reference normal of the plane.
This commit is contained in:
wmayer
2024-09-28 18:46:35 +02:00
parent 6e2cd4e733
commit 09e140cf19
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Gui/TaskView/TaskImage.cpp
View File

@@ -288,6 +288,9 @@ void TaskImage::onPreview()
// NOLINTNEXTLINE
void TaskImage::restoreAngles(const Base::Rotation& rot)
{
Base::Vector3d vec(0, 0, 1);
rot.multVec(vec, vec);
double yaw {};
double pitch {};
double roll {};
@@ -300,32 +303,49 @@ void TaskImage::restoreAngles(const Base::Rotation& rot)
const double angle2 = 180.0;
auto isTopOrBottom = [=](bool& reverse) {
if (fabs(pitch) < tol && (fabs(roll) < tol || fabs(roll - angle2) < tol)) {
if (fabs(roll - angle2) < tol) {
reverse = true;
}
if (std::fabs(vec.z - 1.0) < tol) {
return true;
}
if (std::fabs(vec.z + 1.0) < tol) {
reverse = true;
return true;
}
return false;
};
auto isFrontOrRear = [=](bool& reverse) {
if (fabs(roll - angle1) < tol && (fabs(yaw) < tol || fabs(yaw - angle2) < tol)) {
if (fabs(yaw - angle2) < tol) {
reverse = true;
auto isFrontOrRear = [&](bool& reverse) {
if (std::fabs(vec.y + 1.0) < tol) {
if (std::fabs(yaw - angle2) < tol) {
pitch = -angle2 - pitch;
}
return true;
}
if (std::fabs(vec.y - 1.0) < tol) {
if (std::fabs(yaw) < tol) {
pitch = -angle2 - pitch;
}
reverse = true;
return true;
}
return false;
};
auto isRightOrLeft = [=](bool& reverse) {
if (fabs(roll - angle1) < tol && (fabs(yaw - angle1) < tol || fabs(yaw + angle1) < tol)) {
if (fabs(yaw + angle1) < tol) {
reverse = true;
auto isRightOrLeft = [&](bool& reverse) {
if (std::fabs(vec.x - 1.0) < tol) {
if (std::fabs(yaw + angle1) < tol) {
pitch = -angle2 - pitch;
}
return true;
}
if (std::fabs(vec.x + 1.0) < tol) {
if (std::fabs(yaw - angle1) < tol) {
pitch = -angle2 - pitch;
}
reverse = true;
return true;
}
return false;
};