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

Assembly: Fixes slider special move mode.Fixes #13370

Browse Source
This commit is contained in:
PaddleStroke
2024-04-09 16:25:14 +02:00
committed by Yorik van Havre
parent 9115f31c84
commit a858e8ad44
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Gui/View3DInventorViewer.cpp
View File

@@ -2732,16 +2732,13 @@ SbVec3f View3DInventorViewer::getPointOnLine(const SbVec2s& pnt, const SbVec3f&
SbVec3f pt, ptOnFocalPlaneAndOnLine, ptOnFocalPlane;
SbPlane focalPlane = vol.getPlane(focalDist);
vol.projectPointToLine(pnt2d, line);
if (!focalPlane.intersect(line, ptOnFocalPlane)) {
return {}; // No intersection found
}
focalPlane.intersect(line, ptOnFocalPlane);
// Check if line is orthogonal to the focal plane
SbVec3f focalPlaneNormal = focalPlane.getNormal();
float dotProduct = fabs(axis.dot(focalPlaneNormal));
if (dotProduct > 1.0 - 1e-6) {
return {};
if (dotProduct > (1.0 - 1e-6)) {
return ptOnFocalPlane;
}
SbLine projectedLine = projectLineOntoPlane(axisCenter, axisCenter + axis, focalPlane);
@@ -2751,10 +2748,10 @@ SbVec3f View3DInventorViewer::getPointOnLine(const SbVec2s& pnt, const SbVec3f&
// - the line passing by ptOnFocalPlaneAndOnLine normal to focalPlane
// - The line (axisCenter, axisCenter + axis)
// Line normal to focal plane through ptOnFocalPlane
SbLine normalLine(ptOnFocalPlane, ptOnFocalPlane + focalPlane.getNormal());
// Line normal to focal plane through ptOnFocalPlaneAndOnLine
SbLine normalLine(ptOnFocalPlaneAndOnLine, ptOnFocalPlaneAndOnLine + focalPlaneNormal);
SbLine axisLine(axisCenter, axisCenter + axis);
pt = intersection(ptOnFocalPlane, ptOnFocalPlane + focalPlane.getNormal(), axisCenter, axisCenter + axis);
pt = intersection(ptOnFocalPlaneAndOnLine, ptOnFocalPlaneAndOnLine + focalPlaneNormal, axisCenter, axisCenter + axis);
return pt;
}