Revision: 45570
http://brlcad.svn.sourceforge.net/brlcad/?rev=45570&view=rev
Author: r_weiss
Date: 2011-07-21 23:56:21 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Updated function nmg_radial_build_list within file nmg_fuse.c. These changes
support the prototype version of nmg_triangulate_fu. This change corrects a
problem when the edge radial pointers are not already sorted. These changes are
disabled by default. This is a work in progress.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2011-07-21 23:31:06 UTC
(rev 45569)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2011-07-21 23:56:21 UTC
(rev 45570)
@@ -1965,8 +1965,13 @@
if (rt_g.NMG_debug & DEBUG_MESH_EU)
bu_log("\trad->eu = %x, rad->ang = %g\n", rad->eu, rad->ang);
+#ifdef TRI_PROTOTYPE
+ /* the radial list is not always sorted */
+ nmg_radial_sorted_list_insert(hd, rad);
+#else
/* Just append. Should already be properly sorted. */
BU_LIST_INSERT(hd, &(rad->l));
+#endif
/* Add to list of all shells involved at this edge */
if (shell_tbl) bu_ptbl_ins_unique(shell_tbl, (long
*)&(rad->s->l.magic));
@@ -1976,7 +1981,10 @@
if (teu == eu) break;
}
+#ifndef TRI_PROTOTYPE
+ /* the radial is increasing since we sorted it above */
nmg_insure_radial_list_is_increasing(hd, amin, amax);
+#endif
/* Increasing, with min or max value possibly repeated */
if (!rmin) {
@@ -2043,7 +2051,12 @@
BU_LIST_DEQUEUE(hd);
/* Append head after maximum, before minimum */
BU_LIST_APPEND(&(rmax->l), hd);
+#ifndef TRI_PROTOTYPE
+ /* the radial pointers are not always ready to be
+ * verified here
+ */
nmg_radial_verify_pointers(hd, tol);
+#endif
} else {
bu_log(" %f %f %f --- %f %f %f\n",
V3ARGS(eu->vu_p->v_p->vg_p->coord),
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
