Revision: 73927
http://sourceforge.net/p/brlcad/code/73927
Author: starseeker
Date: 2019-09-14 14:42:28 +0000 (Sat, 14 Sep 2019)
Log Message:
-----------
Don't 3D filter the points from trims - that was the whole point of breaking
this out. However, we may want to incorproate a 'will this make a valid face'
check into the rtree_bbox routine, so we can push the point out further into
the surface if we need to.
Modified Paths:
--------------
brlcad/trunk/src/libbrep/cdt_surf.cpp
Modified: brlcad/trunk/src/libbrep/cdt_surf.cpp
===================================================================
--- brlcad/trunk/src/libbrep/cdt_surf.cpp 2019-09-14 14:35:14 UTC (rev
73926)
+++ brlcad/trunk/src/libbrep/cdt_surf.cpp 2019-09-14 14:42:28 UTC (rev
73927)
@@ -714,6 +714,7 @@
fmesh->nmap[f3ind] = fnind;
}
+ // Points from trims are handled separately
for (osp_it = sinfo->on_trim_points.begin(); osp_it !=
sinfo->on_trim_points.end(); osp_it++) {
ON_2dPoint n2dp(**osp_it);
@@ -724,25 +725,11 @@
p3d = sinfo->s->PointAt(n2dp.x, n2dp.y);
}
- // If we're too close to an edge in 3D, the point is out.
- double fMin[3];
- fMin[0] = p3d.x - ON_ZERO_TOLERANCE;
- fMin[1] = p3d.y - ON_ZERO_TOLERANCE;
- fMin[2] = p3d.z - ON_ZERO_TOLERANCE;
- double fMax[3];
- fMax[0] = p3d.x + ON_ZERO_TOLERANCE;
- fMax[1] = p3d.y + ON_ZERO_TOLERANCE;
- fMax[2] = p3d.z + ON_ZERO_TOLERANCE;
- size_t nhits =
sinfo->s_cdt->face_rtrees_3d[sinfo->f->m_face_index].Search(fMin, fMax, NULL,
NULL);
- if (nhits) continue;
-
-
long f_ind2d = fmesh->add_point(n2dp);
fmesh->m_interior_pnts.insert(f_ind2d);
if (fmesh->m_bRev) {
norm = -1 * norm;
}
- //std::cout << "Face " << fmesh->f_id << " norm: " << norm.x << "," <<
norm.y << "," << norm.z << "\n";
long f3ind = fmesh->add_point(new ON_3dPoint(p3d));
long fnind = fmesh->add_normal(new ON_3dPoint(norm));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
