caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SSurface::EdgeNormalsWithinSurface() to handle non-orthogonal u,v derivatives correctly.

Browse Source
This commit is contained in:
phkahler 2020-06-01 21:10:25 -04:00 committed by whitequark
parent 225f82a292
commit 94a3cfdeb7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/srf/boolean.cpp
View File

@ -379,11 +379,17 @@ void SSurface::EdgeNormalsWithinSurface(Point2d auv, Point2d buv,
enxyz = (ab.Cross(*surfn)).WithMagnitude(SS.ChordTolMm()); enxyz = (ab.Cross(*surfn)).WithMagnitude(SS.ChordTolMm());
// And based on that, compute the edge's inner normal in uv space. This // And based on that, compute the edge's inner normal in uv space. This
// vector is perpendicular to the edge in xyz, but not necessarily in uv. // vector is perpendicular to the edge in xyz, but not necessarily in uv.
Vector tu, tv; Vector tu, tv, tx, ty;
TangentsAt(muv.x, muv.y, &tu, &tv); TangentsAt(muv.x, muv.y, &tu, &tv);
Vector n = tu.Cross(tv);
// since tu and tv may not be orthogonal, use y in place of v, x in place of u.
// |y| = |v|sin(theta) where theta is the angle between tu and tv.
ty = n.Cross(tu).ScaledBy(1.0/tu.MagSquared());
tx = tv.Cross(n).ScaledBy(1.0/tv.MagSquared());
Point2d enuv; Point2d enuv;
enuv.x = enxyz.Dot(tu) / tu.MagSquared(); enuv.x = enxyz.Dot(tx) / tx.MagSquared();
enuv.y = enxyz.Dot(tv) / tv.MagSquared(); enuv.y = enxyz.Dot(ty) / ty.MagSquared();
// Compute the inner and outer normals of this edge (within the srf), // Compute the inner and outer normals of this edge (within the srf),
// in xyz space. These are not necessarily antiparallel, if the // in xyz space. These are not necessarily antiparallel, if the