Revision: 73884
http://sourceforge.net/p/brlcad/code/73884
Author: starseeker
Date: 2019-09-10 20:31:53 +0000 (Tue, 10 Sep 2019)
Log Message:
-----------
Don't RemoveAll in the rtrees when we're calculating the distance (copy paste
strikes again...)
Modified Paths:
--------------
brlcad/trunk/src/libbrep/cdt_edge.cpp
brlcad/trunk/src/libbrep/cdt_surf.cpp
Modified: brlcad/trunk/src/libbrep/cdt_edge.cpp
===================================================================
--- brlcad/trunk/src/libbrep/cdt_edge.cpp 2019-09-10 18:35:28 UTC (rev
73883)
+++ brlcad/trunk/src/libbrep/cdt_edge.cpp 2019-09-10 20:31:53 UTC (rev
73884)
@@ -1716,6 +1716,13 @@
}
}
}
+#if 0
+ struct bu_vls fname = BU_VLS_INIT_ZERO;
+ bu_vls_sprintf(&fname, "%d-rtree_2d_final.plot3",
face.m_face_index);
+ plot_rtree_2d2(s_cdt->face_rtrees_2d[face_index],
bu_vls_cstr(&fname));
+ bu_vls_free(&fname);
+#endif
+
}
}
@@ -1737,9 +1744,7 @@
ON_Brep* brep = s_cdt->brep;
for (int face_index = 0; face_index < brep->m_F.Count(); face_index++) {
ON_BrepFace &face = s_cdt->brep->m_F[face_index];
- s_cdt->face_rtrees_2d[face.m_face_index].RemoveAll();
cdt_mesh::cdt_mesh_t *fmesh = &s_cdt->fmeshes[face.m_face_index];
- std::cout << "Face " << face.m_face_index << " final 2D rtree
build...\n";
std::vector<cdt_mesh::cpolyedge_t *> ws;
std::vector<cdt_mesh::cpolyedge_t *>::iterator w_it;
Modified: brlcad/trunk/src/libbrep/cdt_surf.cpp
===================================================================
--- brlcad/trunk/src/libbrep/cdt_surf.cpp 2019-09-10 18:35:28 UTC (rev
73883)
+++ brlcad/trunk/src/libbrep/cdt_surf.cpp 2019-09-10 20:31:53 UTC (rev
73884)
@@ -635,6 +635,8 @@
p2[1] = bb.Max().y;
sp.plot("current_patch.plot3");
+ plot_rtree_2d2(*sinfo->rtree_2d, "rtree.plot3");
+
// Do the search
size_t tcnt = sinfo->rtree_2d->Search(p1, p2, NULL, NULL);
if (tcnt) {
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
