ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-09-23 02:02:49 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stl_projectnormal_getfirstintersecting' into 'master'

Browse Source 
Use BoxTree::GetFirstIntersecting in STLChart::ProjectNormal

See merge request jschoeberl/netgen!264
This commit is contained in:
Joachim Schöberl 2019-10-02 10:37:30 +00:00
commit 560178d0a8
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libsrc/stlgeom/stltool.cpp
View File

@ -832,31 +832,37 @@ STLTrigId STLChart :: ProjectNormal (Point<3> & p3d) const
int starttrig = 1; int starttrig = 1;
if (inner_searchtree) if (inner_searchtree)
{ {
NgArray<STLTrigId> trigs;
starttrig = GetNChartT()+1; starttrig = GetNChartT()+1;
Point<2> p2d = Project2d (p3d); Point<2> p2d = Project2d (p3d);
inner_searchtree->GetIntersecting(p2d, p2d, trigs);
for (STLTrigId i : trigs)
bool inside = false;
STLTrigId trignum;
inner_searchtree->GetFirstIntersecting(p2d, p2d, [&](auto i)
{ {
auto & trig = geometry->GetTriangle(i); auto & trig = geometry->GetTriangle(i);
const Point<3> & c = trig.center; const Point<3> & c = trig.center;
if (quadfun.Eval(c) > sqr (trig.rad)) if (quadfun.Eval(c) > sqr (trig.rad))
continue; return false;
Point<3> p = p3d; Point<3> p = p3d;
Vec<3> lam; Vec<3> lam;
int err = trig.ProjectInPlain(geometry->GetPoints(), GetNormal(), p, lam); int err = trig.ProjectInPlain(geometry->GetPoints(), GetNormal(), p, lam);
bool inside = (err == 0 && lam(0) > -lamtol && inside = (err == 0 && lam(0) > -lamtol &&
lam(1) > -lamtol && (1-lam(0)-lam(1)) > -lamtol); lam(1) > -lamtol && (1-lam(0)-lam(1)) > -lamtol);
if (inside) if (inside)
{ {
trignum=i;
p3d = p; p3d = p;
return i; return true;
} }
} return false;
});
if(inside)
return trignum;
} }