suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix possible problems with roundoff errors of SbRotation

Browse Source
This commit is contained in:
wmayer 2016-02-06 18:51:22 +01:00
parent 1324575b35
commit c30031f3d2
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Gui/ManualAlignment.cpp
View File

@ -688,7 +688,15 @@ void ManualAlignment::setViewingDirections(const Base::Vector3d& view1, const Ba
SbRotation rot2; SbRotation rot2;
SbVec3f up(0.0f, 1.0f, 0.0f); SbVec3f up(0.0f, 1.0f, 0.0f);
rot.multVec(up, up); rot.multVec(up, up);
rot2.setValue(up, SbVec3f(up1.x, up1.y, up1.z));
// avoid possible problems with roundoff errors
SbVec3f upDir(up1.x, up1.y, up1.z);
float dot = up.dot(upDir);
if (dot < -0.99f) {
up = -upDir;
}
rot2.setValue(up, upDir);
myViewer->getViewer(0)->getSoRenderManager()->getCamera()->orientation.setValue(rot * rot2); myViewer->getViewer(0)->getSoRenderManager()->getCamera()->orientation.setValue(rot * rot2);
myViewer->getViewer(0)->viewAll(); myViewer->getViewer(0)->viewAll();
} }
@ -700,7 +708,15 @@ void ManualAlignment::setViewingDirections(const Base::Vector3d& view1, const Ba
SbRotation rot2; SbRotation rot2;
SbVec3f up(0.0f, 1.0f, 0.0f); SbVec3f up(0.0f, 1.0f, 0.0f);
rot.multVec(up, up); rot.multVec(up, up);
rot2.setValue(up, SbVec3f(up2.x, up2.y, up2.z));
// avoid possible problems with roundoff errors
SbVec3f upDir(up2.x, up2.y, up2.z);
float dot = up.dot(upDir);
if (dot < -0.99f) {
up = -upDir;
}
rot2.setValue(up, upDir);
myViewer->getViewer(1)->getSoRenderManager()->getCamera()->orientation.setValue(rot * rot2); myViewer->getViewer(1)->getSoRenderManager()->getCamera()->orientation.setValue(rot * rot2);
myViewer->getViewer(1)->viewAll(); myViewer->getViewer(1)->viewAll();
} }