Revision: 68966
http://sourceforge.net/p/brlcad/code/68966
Author: starseeker
Date: 2016-10-02 20:13:09 +0000 (Sun, 02 Oct 2016)
Log Message:
-----------
refactor out another rt_vlblock_init, although this one appears to be in a
chain of functions which aren't used...
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c 2016-10-02 03:17:14 UTC
(rev 68965)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fcut.c 2016-10-02 20:13:09 UTC
(rev 68966)
@@ -1493,7 +1493,7 @@
* at this vertexuse.
*/
HIDDEN int
-nmg_special_wedge_processing(struct nmg_vu_stuff *vs, int start, int end,
double lo_ang, double hi_ang, int wclass, int *exclude, const struct bn_tol
*tol)
+nmg_special_wedge_processing(struct nmg_vu_stuff *vs, int start, int end,
double lo_ang, double hi_ang, int wclass, int *exclude, struct bu_list *vlfree,
const struct bn_tol *tol)
/* vu index of coincident range */
@@ -1525,7 +1525,7 @@
/* Plot all the loops that touch here. */
m = nmg_find_model((uint32_t *)vs[start].vu);
b = (long *)bu_calloc(m->maxindex, sizeof(long),
"nmg_special_wedge_processing flag[]");
- vbp = rt_vlblock_init();
+ vbp = bn_vlblock_init(vlfree, 32);
for (i=start; i < end; i++) {
struct loopuse *lu;
lu = nmg_find_lu_of_vu(vs[i].vu);
@@ -1629,7 +1629,8 @@
/* Recurse on inner wedge */
if (nmg_special_wedge_processing(vs, start, end,
- vs[inner_wedge].lo_ang,
vs[inner_wedge].hi_ang, wclass, exclude, tol))
+ vs[inner_wedge].lo_ang,
vs[inner_wedge].hi_ang, wclass,
+ exclude, vlfree, tol))
return 1; /* An inner wedge was cut */
/*
@@ -1653,7 +1654,7 @@
* sort them into the "proper" order for driving the state machine.
*/
HIDDEN int
-nmg_face_coincident_vu_sort(struct nmg_ray_state *rs, int start, int end)
+nmg_face_coincident_vu_sort(struct nmg_ray_state *rs, int start, int end,
struct bu_list *vlfree)
/* first index */
/* last index + 1 */
@@ -1794,13 +1795,13 @@
/* XXX */
/* Here is where the special wedge-breaking code goes */
- if (nmg_special_wedge_processing(vs, 0, nvu, 0.0, 180.0, WEDGE_RIGHT, (int
*)0, rs->tol)) {
+ if (nmg_special_wedge_processing(vs, 0, nvu, 0.0, 180.0, WEDGE_RIGHT, (int
*)0, vlfree, rs->tol)) {
if (RTG.NMG_debug&DEBUG_VU_SORT)
bu_log("*** nmg_face_coincident_vu_sort(, %d, %d) restarting after
0--180 wedge\n", start, end);
goto top;
}
/* XXX reclass on/on edges from WEDGE_RIGHT to WEDGE_LEFT here? */
- if (nmg_special_wedge_processing(vs, 0, nvu, 360.0, 180.0, WEDGE_LEFT,
(int *)0, rs->tol)) {
+ if (nmg_special_wedge_processing(vs, 0, nvu, 360.0, 180.0, WEDGE_LEFT,
(int *)0, vlfree, rs->tol)) {
if (RTG.NMG_debug&DEBUG_VU_SORT)
bu_log("*** nmg_face_coincident_vu_sort(, %d, %d) restarting after
180-360 wedge\n", start, end);
goto top;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
