Revision: 76649
http://sourceforge.net/p/brlcad/code/76649
Author: starseeker
Date: 2020-08-02 21:10:40 +0000 (Sun, 02 Aug 2020)
Log Message:
-----------
RTG is now down to rtg_vlfree (which is the tough one to eliminate.) Remove
the wrapping struct.
Modified Paths:
--------------
brlcad/branches/bioh/include/rt/global.h
brlcad/branches/bioh/src/adrt/load_g.c
brlcad/branches/bioh/src/conv/dxf/g-dxf.c
brlcad/branches/bioh/src/conv/g-acad.c
brlcad/branches/bioh/src/conv/g-egg.c
brlcad/branches/bioh/src/conv/g-nff.c
brlcad/branches/bioh/src/conv/g-obj.c
brlcad/branches/bioh/src/conv/g-shell-rect.c
brlcad/branches/bioh/src/conv/g-vrml.c
brlcad/branches/bioh/src/conv/g-x3d.c
brlcad/branches/bioh/src/conv/g-xxx_facets.c
brlcad/branches/bioh/src/conv/iges/add_inner_shell.c
brlcad/branches/bioh/src/conv/iges/brep.c
brlcad/branches/bioh/src/conv/iges/conv_drawings.c
brlcad/branches/bioh/src/conv/iges/extrude.c
brlcad/branches/bioh/src/conv/iges/g-iges.c
brlcad/branches/bioh/src/conv/iges/get_outer_shell.c
brlcad/branches/bioh/src/conv/iges/iges.c
brlcad/branches/bioh/src/conv/iges/make_face.c
brlcad/branches/bioh/src/conv/iges/orient_loops.c
brlcad/branches/bioh/src/conv/iges/trimsurf.c
brlcad/branches/bioh/src/conv/jack/g-jack.c
brlcad/branches/bioh/src/conv/jack/jack-g.c
brlcad/branches/bioh/src/conv/nastran-g.c
brlcad/branches/bioh/src/conv/nmg/asc-nmg.c
brlcad/branches/bioh/src/conv/obj-g.c
brlcad/branches/bioh/src/conv/off/g-off.c
brlcad/branches/bioh/src/conv/off/off-g.c
brlcad/branches/bioh/src/conv/patch/patch-g.c
brlcad/branches/bioh/src/conv/ply/g-ply.c
brlcad/branches/bioh/src/conv/raw/g-raw.c
brlcad/branches/bioh/src/conv/stl/g-stl.c
brlcad/branches/bioh/src/conv/tankill/tankill-g.c
brlcad/branches/bioh/src/gtools/gsh.cpp
brlcad/branches/bioh/src/libdm/osgl/osg-test.cpp
brlcad/branches/bioh/src/libgcv/bottess.c
brlcad/branches/bioh/src/libgcv/facetize.c
brlcad/branches/bioh/src/libgcv/plugins/asc/asc_v5.cpp
brlcad/branches/bioh/src/libgcv/plugins/fastgen4/fastgen4_write.cpp
brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c
brlcad/branches/bioh/src/libgcv/plugins/obj/obj_write.c
brlcad/branches/bioh/src/libgcv/plugins/obj/tri_face.c
brlcad/branches/bioh/src/libgcv/plugins/stl/stl_write.c
brlcad/branches/bioh/src/libgcv/plugins/vrml/vrml_write.c
brlcad/branches/bioh/src/libgcv/region_end.c
brlcad/branches/bioh/src/libged/bev/bev.c
brlcad/branches/bioh/src/libged/bigE/bigE.c
brlcad/branches/bioh/src/libged/bot/bot_fuse.c
brlcad/branches/bioh/src/libged/brep/plot.cpp
brlcad/branches/bioh/src/libged/decompose/decompose.c
brlcad/branches/bioh/src/libged/draw/draw.c
brlcad/branches/bioh/src/libged/facetize/facetize.cpp
brlcad/branches/bioh/src/libged/inside.c
brlcad/branches/bioh/src/libged/nmg/nmg_cmface.c
brlcad/branches/bioh/src/libged/nmg/nmg_collapse.c
brlcad/branches/bioh/src/libged/nmg/nmg_fix_normals.c
brlcad/branches/bioh/src/libged/nmg/nmg_simplify.c
brlcad/branches/bioh/src/libged/shells/shells.c
brlcad/branches/bioh/src/librt/globals.c
brlcad/branches/bioh/src/librt/prep.c
brlcad/branches/bioh/src/librt/primitives/annot/annot.c
brlcad/branches/bioh/src/librt/primitives/arb8/arb8.c
brlcad/branches/bioh/src/librt/primitives/arbn/arbn.c
brlcad/branches/bioh/src/librt/primitives/ars/ars.c
brlcad/branches/bioh/src/librt/primitives/bot/bot.c
brlcad/branches/bioh/src/librt/primitives/brep/brep.cpp
brlcad/branches/bioh/src/librt/primitives/cline/cline.c
brlcad/branches/bioh/src/librt/primitives/dsp/dsp.c
brlcad/branches/bioh/src/librt/primitives/ebm/ebm.c
brlcad/branches/bioh/src/librt/primitives/ehy/ehy.c
brlcad/branches/bioh/src/librt/primitives/epa/epa.c
brlcad/branches/bioh/src/librt/primitives/extrude/extrude.c
brlcad/branches/bioh/src/librt/primitives/hyp/hyp.c
brlcad/branches/bioh/src/librt/primitives/metaball/metaball_tri.c
brlcad/branches/bioh/src/librt/primitives/nmg/nmg.c
brlcad/branches/bioh/src/librt/primitives/nmg/nmg_mirror.c
brlcad/branches/bioh/src/librt/primitives/nmg/nmg_tri_mc.c
brlcad/branches/bioh/src/librt/primitives/pipe/pipe.c
brlcad/branches/bioh/src/librt/primitives/poly/poly.c
brlcad/branches/bioh/src/librt/primitives/rhc/rhc.c
brlcad/branches/bioh/src/librt/primitives/rpc/rpc.c
brlcad/branches/bioh/src/librt/primitives/tgc/tgc.c
brlcad/branches/bioh/src/librt/primitives/vol/vol.c
brlcad/branches/bioh/src/librt/vlist.c
brlcad/branches/bioh/src/libtclcad/rt.c
brlcad/branches/bioh/src/libwdb/nmg.c
brlcad/branches/bioh/src/mged/edsol.c
brlcad/branches/bioh/src/mged/mged.c
brlcad/branches/bioh/src/mged/wdb_obj.c
brlcad/branches/bioh/src/other/gct/BRLCAD/BrlcadTreeWalker.cpp
brlcad/branches/bioh/src/proc-db/nmgmodel.c
brlcad/branches/bioh/src/proc-db/tea_nmg.c
brlcad/branches/bioh/src/qged/cadapp.cpp
brlcad/branches/bioh/src/remrt/rtsrv.c
Modified: brlcad/branches/bioh/include/rt/global.h
===================================================================
--- brlcad/branches/bioh/include/rt/global.h 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/include/rt/global.h 2020-08-02 21:10:40 UTC (rev
76649)
@@ -32,46 +32,35 @@
__BEGIN_DECLS
-/**
- * Definitions for librt.a which are global to the library regardless
- * of how many different models are being worked on
- */
-struct rt_g {
- struct bu_list rtg_vlfree; /**< @brief head of bn_vlist freelist
*/
-};
-#define RT_G_INIT_ZERO { BU_LIST_INIT_ZERO }
+/* head of LIBRT global bn_vlist freelist */
+RT_EXPORT extern struct bu_list rtg_vlfree; /**< @brief head of
bn_vlist freelist */
/**
- * global ray-trace geometry state
- */
-RT_EXPORT extern struct rt_g RTG;
-
-/**
* Applications that are going to use RT_ADD_VLIST and RT_GET_VLIST
* are required to execute this macro once, first:
*
- * BU_LIST_INIT(&RTG.rtg_vlfree);
+ * BU_LIST_INIT(&rtg_vlfree);
*
* Note that RT_GET_VLIST and RT_FREE_VLIST are non-PARALLEL.
*/
-#define RT_GET_VLIST(p) BN_GET_VLIST(&RTG.rtg_vlfree, p)
+#define RT_GET_VLIST(p) BN_GET_VLIST(&rtg_vlfree, p)
/** Place an entire chain of bn_vlist structs on the freelist */
-#define RT_FREE_VLIST(hd) BN_FREE_VLIST(&RTG.rtg_vlfree, hd)
+#define RT_FREE_VLIST(hd) BN_FREE_VLIST(&rtg_vlfree, hd)
-#define RT_ADD_VLIST(hd, pnt, draw) BN_ADD_VLIST(&RTG.rtg_vlfree, hd, pnt,
draw)
+#define RT_ADD_VLIST(hd, pnt, draw) BN_ADD_VLIST(&rtg_vlfree, hd, pnt, draw)
/** set the transformation matrix to display matrix */
-#define RT_VLIST_SET_DISP_MAT(_dest_hd, _ref_pt)
BN_VLIST_SET_DISP_MAT(&RTG.rtg_vlfree, _dest_hd, _ref_pt)
+#define RT_VLIST_SET_DISP_MAT(_dest_hd, _ref_pt)
BN_VLIST_SET_DISP_MAT(&rtg_vlfree, _dest_hd, _ref_pt)
/** set the transformation matrix to model matrix */
-#define RT_VLIST_SET_MODEL_MAT(_dest_hd)
BN_VLIST_SET_MODEL_MAT(&RTG.rtg_vlfree, _dest_hd)
+#define RT_VLIST_SET_MODEL_MAT(_dest_hd) BN_VLIST_SET_MODEL_MAT(&rtg_vlfree,
_dest_hd)
/** Set a point size to apply to the vlist elements that follow. */
-#define RT_VLIST_SET_POINT_SIZE(hd, size)
BN_VLIST_SET_POINT_SIZE(&RTG.rtg_vlfree, hd, size)
+#define RT_VLIST_SET_POINT_SIZE(hd, size) BN_VLIST_SET_POINT_SIZE(&rtg_vlfree,
hd, size)
/** Set a line width to apply to the vlist elements that follow. */
-#define RT_VLIST_SET_LINE_WIDTH(hd, width)
BN_VLIST_SET_LINE_WIDTH(&RTG.rtg_vlfree, hd, width)
+#define RT_VLIST_SET_LINE_WIDTH(hd, width)
BN_VLIST_SET_LINE_WIDTH(&rtg_vlfree, hd, width)
__END_DECLS
Modified: brlcad/branches/bioh/src/adrt/load_g.c
===================================================================
--- brlcad/branches/bioh/src/adrt/load_g.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/adrt/load_g.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -219,7 +219,7 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* FIXME: where is this released? */
BU_ALLOC(mesh, struct adrt_mesh_s);
@@ -272,7 +272,7 @@
/* make empty NMG model */
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/*
* these should probably encode so the result can be passed back to client
Modified: brlcad/branches/bioh/src/conv/dxf/g-dxf.c
===================================================================
--- brlcad/branches/bioh/src/conv/dxf/g-dxf.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/dxf/g-dxf.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -193,7 +193,7 @@
triangulate:
if (do_triangulate) {
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* Count triangles */
tri_count = 0;
@@ -216,7 +216,7 @@
}
}
- nmg_vertex_tabulate(&verts, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &r->l.magic, &rtg_vlfree);
color_num = find_closest_color(color);
@@ -410,7 +410,7 @@
tol.perp = 1e-6;
tol.para = 1 - tol.perp;
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "a:n:o:pr:vx:D:P:X:ih?")) != -1) {
Modified: brlcad/branches/bioh/src/conv/g-acad.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-acad.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/g-acad.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -102,11 +102,11 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* list all vertices in result */
- nmg_vertex_tabulate(&verts, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &r->l.magic, &rtg_vlfree);
/* Get number of vertices */
@@ -280,7 +280,7 @@
printf("Attempting to process region %s\n", db_path_to_string(pathp));
fflush(stdout);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
if (ret_tree != curtree) {
db_free_tree(curtree, &rt_uniresource);
}
@@ -506,7 +506,7 @@
tol.para = 1 - tol.perp;
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "a:n:o:r:vx:D:P:X:e:ih?")) != -1) {
Modified: brlcad/branches/bioh/src/conv/g-egg.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-egg.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/g-egg.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -85,7 +85,7 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &conv_data->tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &conv_data->tol);
/* Write pertinent info for this region */
fprintf(conv_data->fp, " <VertexPool> %s {\n", (region_name+1));
@@ -223,7 +223,7 @@
/* make empty NMG model */
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((i = bu_getopt(argc, argv, "a:89n:o:r:vx:D:P:X:h?")) != -1) {
Modified: brlcad/branches/bioh/src/conv/g-nff.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-nff.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/g-nff.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -91,7 +91,7 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* output triangles */
for (BU_LIST_FOR(s, shell, &r->s_hd)) {
@@ -183,8 +183,8 @@
if (!BU_SETJUMP) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
@@ -388,7 +388,7 @@
tol.para = 1 - tol.perp;
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "a:n:o:r:vx:D:X:e:ih?")) != -1) {
Modified: brlcad/branches/bioh/src/conv/g-obj.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-obj.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/g-obj.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -214,7 +214,7 @@
tol.para = 1 - tol.perp;
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
++argv; --argc;
@@ -321,10 +321,10 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* list all vertices in result */
- nmg_vertex_tabulate(&verts, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &r->l.magic, &rtg_vlfree);
/* Get number of vertices */
numverts = BU_PTBL_LEN(&verts);
@@ -331,7 +331,7 @@
/* get list of vertexuse normals */
if (do_normals)
- nmg_vertexuse_normal_tabulate(&norms, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertexuse_normal_tabulate(&norms, &r->l.magic, &rtg_vlfree);
/* BEGIN CHECK SECTION */
/* Check vertices */
@@ -569,8 +569,8 @@
if (!BU_SETJUMP) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
Modified: brlcad/branches/bioh/src/conv/g-shell-rect.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-shell-rect.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/g-shell-rect.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -164,7 +164,7 @@
nmg_vertex_gv(*_v[1], _ep1->pt); \
if (!(*_v[2])->vg_p) \
nmg_vertex_gv(*_v[2], _ep2->pt); \
- if (nmg_calc_face_g(_fu,&RTG.rtg_vlfree)) { \
+ if (nmg_calc_face_g(_fu,&rtg_vlfree)) { \
if (debug > 3) \
bu_log("Killing degenerate face\n"); \
(void)nmg_kfu(_fu); \
@@ -199,7 +199,7 @@
nmg_vertex_gv(*_v[2], _ep2->pt); \
if (!(*_v[3])->vg_p) \
nmg_vertex_gv(*_v[3], _ep3->pt); \
- if (nmg_calc_face_g(_fu,&RTG.rtg_vlfree)) { \
+ if (nmg_calc_face_g(_fu,&rtg_vlfree)) { \
if (debug > 3) \
bu_log("Killing degenerate face\n"); \
(void)nmg_kfu(_fu); \
@@ -431,7 +431,7 @@
VINVDIR(rd.rd_invdir, rp->r_dir);
rd.magic = NMG_RAY_DATA_MAGIC;
- nmg_isect_ray_model((struct nmg_ray_data *)&rd,&RTG.rtg_vlfree);
+ nmg_isect_ray_model((struct nmg_ray_data *)&rd,&rtg_vlfree);
if (BU_LIST_IS_EMPTY(&rd.rd_hit))
ret = 0;
@@ -674,7 +674,7 @@
if (fu->orientation != OT_SAME)
continue;
- nmg_calc_face_g(fu,&RTG.rtg_vlfree);
+ nmg_calc_face_g(fu,&rtg_vlfree);
f = fu->f_p;
nmg_face_bb(f, &tol);
@@ -719,7 +719,7 @@
if (fu->orientation != OT_SAME)
continue;
- nmg_calc_face_g(fu,&RTG.rtg_vlfree);
+ nmg_calc_face_g(fu,&rtg_vlfree);
f = fu->f_p;
nmg_face_bb(f, &tol);
@@ -938,7 +938,7 @@
if (vu1_cut->v_p == eu1->eumate_p->vu_p->v_p)
eu1 = BU_LIST_PNEXT_CIRC(edgeuse, &eu1->l);
/* cut loop */
- new_lu = nmg_cut_loop(vu1_cut, vu2_cut, &RTG.rtg_vlfree);
+ new_lu = nmg_cut_loop(vu1_cut, vu2_cut, &rtg_vlfree);
lu->orientation = OT_SAME;
lu->lumate_p->orientation = OT_SAME;
new_lu->orientation = OT_SAME;
@@ -972,9 +972,9 @@
bu_ptbl_init(&verts, 128, "verts");
Split_side_faces(s, &verts);
- nmg_triangulate_shell(s, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_shell(s, &rtg_vlfree, &tol);
- nmg_split_loops_into_faces(&s->l.magic, &RTG.rtg_vlfree, &tol);
+ nmg_split_loops_into_faces(&s->l.magic, &rtg_vlfree, &tol);
sd.s = s;
sd.manifolds = nmg_manifolds(m);
@@ -1165,8 +1165,8 @@
}
if (!new_vu2)
bu_exit(1, "ERROR: Cannot find VU in lu2\n");
- new_lu1 = nmg_cut_loop(new_vu1, vu1, &RTG.rtg_vlfree);
- new_lu2 = nmg_cut_loop(new_vu2, vu2, &RTG.rtg_vlfree);
+ new_lu1 = nmg_cut_loop(new_vu1, vu1, &rtg_vlfree);
+ new_lu2 = nmg_cut_loop(new_vu2, vu2, &rtg_vlfree);
ref_data->lu1->orientation = OT_SAME;
ref_data->lu2->orientation = OT_SAME;
new_lu1->orientation = OT_SAME;
@@ -1209,8 +1209,8 @@
}
}
- (void)nmg_split_loops_into_faces(&ref_data->fu1->l.magic, &RTG.rtg_vlfree,
&tol);
- (void)nmg_split_loops_into_faces(&ref_data->fu2->l.magic, &RTG.rtg_vlfree,
&tol);
+ (void)nmg_split_loops_into_faces(&ref_data->fu1->l.magic, &rtg_vlfree,
&tol);
+ (void)nmg_split_loops_into_faces(&ref_data->fu2->l.magic, &rtg_vlfree,
&tol);
for (BU_LIST_FOR(vu, vertexuse, &new_vu->v_p->vu_hd)) {
struct faceuse *fu;
@@ -1229,7 +1229,7 @@
bu_ptbl_ins(ref_data->new_edges, (long *)eu->e_p);
- nmg_calc_face_g(fu,&RTG.rtg_vlfree);
+ nmg_calc_face_g(fu,&rtg_vlfree);
}
return 1;
@@ -1252,7 +1252,7 @@
m = nmg_find_model(&s->l.magic);
- nmg_edge_tabulate(&edges_1, &s->l.magic, &RTG.rtg_vlfree);
+ nmg_edge_tabulate(&edges_1, &s->l.magic, &rtg_vlfree);
cur = &edges_1;
bu_ptbl_init(&edges_2, 64, "edges_2");
next = &edges_2;
@@ -1540,7 +1540,7 @@
if (decimation_tol > 0.0) {
bu_log("%d edges eliminated by decimation to tolerance of %gmm\n",
- nmg_edge_collapse(m, &tol, decimation_tol, min_angle,
&RTG.rtg_vlfree), decimation_tol);
+ nmg_edge_collapse(m, &tol, decimation_tol, min_angle,
&rtg_vlfree), decimation_tol);
}
if (do_extra_rays || edge_tol > 0.0 || decimation_tol > 0.0)
Modified: brlcad/branches/bioh/src/conv/g-vrml.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-vrml.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/g-vrml.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -626,7 +626,7 @@
nmg_eue_dist = 2.0;
}
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "a:bd:en:o:r:vx:X:u:h?")) != -1) {
@@ -1026,7 +1026,7 @@
}
if (!is_light) {
- nmg_triangulate_model(m, &RTG.rtg_vlfree, tol2);
+ nmg_triangulate_model(m, &rtg_vlfree, tol2);
fprintf(fp_out, "\t\t\t}\n");
fprintf(fp_out, "\t\t\tgeometry IndexedFaceSet {\n");
fprintf(fp_out, "\t\t\t\tcoord Coordinate {\n");
@@ -1033,7 +1033,7 @@
}
/* get list of vertices */
- nmg_vertex_tabulate(&verts, &m->magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &m->magic, &rtg_vlfree);
if (!is_light) {
fprintf(fp_out, "\t\t\t\t\tpoint [");
} else {
@@ -1286,7 +1286,7 @@
/* Begin bomb protection */
if (!BU_SETJUMP) {
/* try */
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
char *name = db_path_to_string(pathp);
Modified: brlcad/branches/bioh/src/conv/g-x3d.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-x3d.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/g-x3d.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -378,7 +378,7 @@
nmg_eue_dist = 2.0;
}
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "d:a:n:o:r:vx:P:X:u:h?")) != -1) {
@@ -551,7 +551,7 @@
*/
if (!BU_SETJUMP) {
/* try */
- if (nmg_triangulate_fu(fu, &RTG.rtg_vlfree, &tol)) {
+ if (nmg_triangulate_fu(fu, &rtg_vlfree, &tol)) {
if (nmg_kfu(fu)) {
(void) nmg_ks(s);
shell_is_dead = 1;
@@ -714,7 +714,7 @@
/* FIXME: need code to handle light */
/* get list of vertices */
- nmg_vertex_tabulate(&verts, &m->magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &m->magic, &rtg_vlfree);
fprintf(fp, "\t\t<IndexedFaceSet coordIndex=\"\n");
first = 1;
@@ -930,7 +930,7 @@
if (!BU_SETJUMP) {
/* try */
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
Modified: brlcad/branches/bioh/src/conv/g-xxx_facets.c
===================================================================
--- brlcad/branches/bioh/src/conv/g-xxx_facets.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/g-xxx_facets.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -245,7 +245,7 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* Output triangles */
if (verbose) {
@@ -346,8 +346,8 @@
if (!BU_SETJUMP) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
Modified: brlcad/branches/bioh/src/conv/iges/add_inner_shell.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/add_inner_shell.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/conv/iges/add_inner_shell.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -62,7 +62,7 @@
face_count++;
}
- nmg_gluefaces(fu, face_count, &RTG.rtg_vlfree, &tol);
+ nmg_gluefaces(fu, face_count, &rtg_vlfree, &tol);
bu_free((char *)fu, "Add_inner_shell: faceuse list");
bu_free((char *)face_de, "Add_inner_shell: face DE's");
Modified: brlcad/branches/bioh/src/conv/iges/brep.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/brep.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/iges/brep.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -89,9 +89,9 @@
Orient_loops(r);
/* orient shells */
- nmg_fix_normals(s_outer, &RTG.rtg_vlfree, &tol);
+ nmg_fix_normals(s_outer, &rtg_vlfree, &tol);
for (i = 0; i < num_of_voids; i++) {
- nmg_fix_normals(void_shells[i], &RTG.rtg_vlfree, &tol);
+ nmg_fix_normals(void_shells[i], &rtg_vlfree, &tol);
nmg_invert_shell(void_shells[i]);
}
@@ -98,7 +98,7 @@
if (do_bots) {
/* Merge all shells into one */
for (i = 0; i < num_of_voids; i++)
- nmg_js(s_outer, void_shells[i], &RTG.rtg_vlfree, &tol);
+ nmg_js(s_outer, void_shells[i], &rtg_vlfree, &tol);
/* write out BOT */
if (mk_bot_from_nmg(fdout, dir[entityno]->name, s_outer))
Modified: brlcad/branches/bioh/src/conv/iges/conv_drawings.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/conv_drawings.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/iges/conv_drawings.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -407,7 +407,7 @@
s = BU_LIST_FIRST(shell, &r->s_hd);
BU_LIST_INIT(&vhead);
- BU_LIST_INIT(&RTG.rtg_vlfree);
+ BU_LIST_INIT(&rtg_vlfree);
sina = sin(ang);
cosa = cos(ang);
Modified: brlcad/branches/bioh/src/conv/iges/extrude.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/extrude.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/iges/extrude.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -118,7 +118,7 @@
pt_ptr = pt_ptr->next;
}
- if (nmg_calc_face_g(fu, &RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu, &rtg_vlfree)) {
bu_log("Extrude: Failed to calculate face geometry\n");
nmg_km(m);
bu_free((char *)curv_pts, "curve_pts");
@@ -125,7 +125,7 @@
return 0;
}
- if (nmg_extrude_face(fu, evect, &RTG.rtg_vlfree, &tol)) {
+ if (nmg_extrude_face(fu, evect, &rtg_vlfree, &tol)) {
bu_log("Extrude: extrusion failed\n");
nmg_km(m);
bu_free((char *)curv_pts, "curve_pts");
Modified: brlcad/branches/bioh/src/conv/iges/g-iges.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/g-iges.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/iges/g-iges.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -223,7 +223,7 @@
tol.para = 1 - tol.perp;
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
prog_name = argv[0];
@@ -451,8 +451,8 @@
if (!BU_SETJUMP) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- result = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ result = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
Modified: brlcad/branches/bioh/src/conv/iges/get_outer_shell.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/get_outer_shell.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/conv/iges/get_outer_shell.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -63,7 +63,7 @@
face_count++;
}
- nmg_gluefaces(fu, face_count, &RTG.rtg_vlfree, &tol);
+ nmg_gluefaces(fu, face_count, &rtg_vlfree, &tol);
bu_free((char *)fu, "Get_outer_shell: faceuse list");
bu_free((char *)face_de, "Get_outer_shell: face DE's");
Modified: brlcad/branches/bioh/src/conv/iges/iges.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/iges.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/iges/iges.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -774,7 +774,7 @@
return 0;
/* Find outer shells and void shells and their associations */
- outer_shell_count = nmg_find_outer_and_void_shells(r, &shells,
&RTG.rtg_vlfree, &tol);
+ outer_shell_count = nmg_find_outer_and_void_shells(r, &shells,
&rtg_vlfree, &tol);
brep_de = (int *)bu_calloc(outer_shell_count, sizeof(int),
"nmgregion_to_iges: brep_de");
@@ -1094,7 +1094,7 @@
dir_entry[i] = DEFAULT;
/* Built list of vertex structs */
- nmg_vertex_tabulate(vtab, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(vtab, &r->l.magic, &rtg_vlfree);
/* write parameter data for vertex list entity */
bu_vls_printf(&str, "502,%ld", (long int)BU_PTBL_LEN(vtab));
@@ -1244,7 +1244,7 @@
dir_entry[i] = DEFAULT;
/* Build list of edge structures */
- nmg_edge_tabulate(etab, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_edge_tabulate(etab, &r->l.magic, &rtg_vlfree);
bu_vls_printf(&str, "504,%ld", (long int)BU_PTBL_LEN(etab));
Modified: brlcad/branches/bioh/src/conv/iges/make_face.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/make_face.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/iges/make_face.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -166,7 +166,7 @@
dist = DIST_PNT_PLANE(outside_pt, pl);
VJOIN1(outside_pt, outside_pt, -dist, pl);
- if (nmg_class_pnt_lu_except(outside_pt, lu, (struct edge *)NULL,
&RTG.rtg_vlfree, &tol) != NMG_CLASS_AoutB) {
+ if (nmg_class_pnt_lu_except(outside_pt, lu, (struct edge *)NULL,
&rtg_vlfree, &tol) != NMG_CLASS_AoutB) {
nmg_reverse_face(fu);
if (fu->orientation != OT_SAME) {
fu = fu->fumate_p;
Modified: brlcad/branches/bioh/src/conv/iges/orient_loops.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/orient_loops.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/iges/orient_loops.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -45,7 +45,7 @@
if (lu == lptr->lu)
continue;
- if (nmg_classify_lu_lu(lu, lptr->lu, &RTG.rtg_vlfree, &tol) ==
NMG_CLASS_AinB) {
+ if (nmg_classify_lu_lu(lu, lptr->lu, &rtg_vlfree, &tol) ==
NMG_CLASS_AinB) {
if (lptr->inner_loops == (struct loop_list *)NULL) {
BU_ALLOC(lptr->inner_loops, struct loop_list);
@@ -74,7 +74,7 @@
prev = (struct loop_list *)NULL;
while (inner1) {
if (inner->lu != inner1->lu) {
- if (nmg_classify_lu_lu(inner1->lu, inner->lu, &RTG.rtg_vlfree,
&tol) == NMG_CLASS_AinB) {
+ if (nmg_classify_lu_lu(inner1->lu, inner->lu, &rtg_vlfree,
&tol) == NMG_CLASS_AinB) {
struct loop_list *tmp;
/* inner1->lu is inside inner->lu,
@@ -138,7 +138,7 @@
for (BU_LIST_FOR(lu1, loopuse, &fu->lu_hd)) {
if (lu1 == lu)
continue;
- if (nmg_classify_lu_lu(lu, lu1, &RTG.rtg_vlfree, &tol) ==
NMG_CLASS_AinB) {
+ if (nmg_classify_lu_lu(lu, lu1, &rtg_vlfree, &tol) ==
NMG_CLASS_AinB) {
outer = 0;
break;
}
Modified: brlcad/branches/bioh/src/conv/iges/trimsurf.c
===================================================================
--- brlcad/branches/bioh/src/conv/iges/trimsurf.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/iges/trimsurf.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -1397,7 +1397,7 @@
bu_log("Converted %zu Trimmed Surfaces successfully out of %zu total
Trimmed Surfaces\n", convsurf, totsurfs);
if (convsurf) {
- (void)nmg_vertex_fuse(&m->magic, &RTG.rtg_vlfree, &tol);
+ (void)nmg_vertex_fuse(&m->magic, &rtg_vlfree, &tol);
if (!BU_STR_EMPTY(curr_file->obj_name))
mk_nmg(fdout, curr_file->obj_name, m);
Modified: brlcad/branches/bioh/src/conv/jack/g-jack.c
===================================================================
--- brlcad/branches/bioh/src/conv/jack/g-jack.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/jack/g-jack.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -202,7 +202,7 @@
map = (int *)bu_calloc(r->m_p->maxindex, sizeof(int), "Jack vert map");
/* Built list of vertex structs */
- nmg_vertex_tabulate(&vtab, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&vtab, &r->l.magic, &rtg_vlfree);
/* FIXME: What to do if 0 vertices? */
@@ -238,8 +238,8 @@
if (!BU_SETJUMP) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
@@ -387,7 +387,7 @@
(int)(tsp->ts_mater.ma_color[1] * 255),
(int)(tsp->ts_mater.ma_color[2] * 255));
BU_LIST_INIT(&vhead);
- nmg_r_to_vlist(&vhead, r, 0, &RTG.rtg_vlfree);
+ nmg_r_to_vlist(&vhead, r, 0, &rtg_vlfree);
bn_vlist_to_uplot(fp, &vhead);
fclose(fp);
RT_FREE_VLIST(&vhead);
@@ -454,7 +454,7 @@
}
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, optstring)) != -1) {
Modified: brlcad/branches/bioh/src/conv/jack/jack-g.c
===================================================================
--- brlcad/branches/bioh/src/conv/jack/jack-g.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/jack/jack-g.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -280,7 +280,7 @@
jfile, i+1);
}
- nmg_vertex_fuse(&m->magic, &RTG.rtg_vlfree, &tol);
+ nmg_vertex_fuse(&m->magic, &rtg_vlfree, &tol);
/* Associate the face geometry. */
for (i = 0, fail = 0; i < face; i++)
@@ -309,11 +309,11 @@
/* Compute "geometry" for region and shell */
nmg_region_a(r, &tol);
- nmg_break_e_on_v(&m->magic, &RTG.rtg_vlfree, &tol);
+ nmg_break_e_on_v(&m->magic, &rtg_vlfree, &tol);
empty_model = nmg_kill_zero_length_edgeuses(m);
/* Glue edges of outward pointing face uses together. */
- if (!empty_model) nmg_edge_fuse(&m->magic, &RTG.rtg_vlfree, &tol);
+ if (!empty_model) nmg_edge_fuse(&m->magic, &rtg_vlfree, &tol);
}
}
Modified: brlcad/branches/bioh/src/conv/nastran-g.c
===================================================================
--- brlcad/branches/bioh/src/conv/nastran-g.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/nastran-g.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -949,7 +949,7 @@
nmg_vertex_gv(g_pts[gin2].v[pid_index], pt2);
if (!g_pts[gin3].v[pid_index]->vg_p)
nmg_vertex_gv(g_pts[gin3].v[pid_index], pt3);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
v[0] = &g_pts[gin1].v[pid_index];
v[1] = &g_pts[gin3].v[pid_index];
@@ -959,7 +959,7 @@
if (!g_pts[gin4].v[pid_index]->vg_p)
nmg_vertex_gv(g_pts[gin4].v[pid_index], pt4);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
}
@@ -1047,7 +1047,7 @@
if (!g_pts[gin3].v[pid_index]->vg_p)
nmg_vertex_gv(g_pts[gin3].v[pid_index], pt3);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
}
@@ -1336,10 +1336,10 @@
m = nmg_find_model(&psh->s->l.magic);
nmg_rebound(m, &tol);
- nmg_fix_normals(psh->s, &RTG.rtg_vlfree, &tol);
+ nmg_fix_normals(psh->s, &rtg_vlfree, &tol);
if (psh->thick > tol.dist) {
- nmg_model_face_fuse(m, &RTG.rtg_vlfree, &tol);
- nmg_hollow_shell(psh->s, psh->thick*conv[units], 1,
&RTG.rtg_vlfree, &tol);
+ nmg_model_face_fuse(m, &rtg_vlfree, &tol);
+ nmg_hollow_shell(psh->s, psh->thick*conv[units], 1, &rtg_vlfree,
&tol);
}
sprintf(name, "pshell.%d", psh->pid);
if (polysolids)
Modified: brlcad/branches/bioh/src/conv/nmg/asc-nmg.c
===================================================================
--- brlcad/branches/bioh/src/conv/nmg/asc-nmg.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/nmg/asc-nmg.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -162,11 +162,11 @@
nmg_face_g( fu, pl );
if (!NEAR_ZERO(MAGNITUDE(Ext), 0.001))
- nmg_extrude_face(BU_LIST_FIRST(faceuse, &s->fu_hd), Ext,
&RTG.rtg_vlfree, &tol);
+ nmg_extrude_face(BU_LIST_FIRST(faceuse, &s->fu_hd), Ext, &rtg_vlfree,
&tol);
nmg_region_a(r, &tol); /* Calculate geometry for region and shell. */
- nmg_fix_normals( s, &RTG.rtg_vlfree, &tol ); /* insure that faces have
outward pointing normals */
+ nmg_fix_normals( s, &rtg_vlfree, &tol ); /* insure that faces have outward
pointing normals */
create_brlcad_db(fpout, m, reg_name, grp_name);
Modified: brlcad/branches/bioh/src/conv/obj-g.c
===================================================================
--- brlcad/branches/bioh/src/conv/obj-g.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/obj-g.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -1355,7 +1355,7 @@
if (fu != NULL) {
/* do simple or robust triangulation based on whether face is concave
or convex */
- if (nmg_lu_is_convex(BU_LIST_FIRST(loopuse, &fu->lu_hd),
&RTG.rtg_vlfree, tol)) {
+ if (nmg_lu_is_convex(BU_LIST_FIRST(loopuse, &fu->lu_hd), &rtg_vlfree,
tol)) {
/* compute number of new triangles to create */
if (gfi->num_vertices_arr[face_idx] > 3) {
@@ -2879,7 +2879,7 @@
if ((verbose > 1) || debug) {
bu_log("Running nmg_model_fuse on (%ld) faces from obj file face
grouping name (%s), obj file face grouping index (%zu)\n", BU_PTBL_LEN(&faces),
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
- num_entities_fused = nmg_model_fuse(m, &RTG.rtg_vlfree, tol);
+ num_entities_fused = nmg_model_fuse(m, &rtg_vlfree, tol);
if ((verbose > 1) || debug) {
bu_log("Completed nmg_model_fuse for obj file face grouping name
(%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
bu_log("Fused (%d) entities in obj file face grouping name (%s),
obj file face grouping index (%zu)\n",
@@ -2890,7 +2890,7 @@
if ((verbose > 1) || debug) {
bu_log("Running nmg_gluefaces on (%ld) faces from obj file face
grouping name (%s), obj file face grouping index (%zu)\n", BU_PTBL_LEN(&faces),
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
- nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &RTG.rtg_vlfree, tol);
+ nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &rtg_vlfree, tol);
if ((verbose > 1) || debug) {
bu_log("Completed nmg_gluefaces for obj file face grouping name
(%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
@@ -2899,7 +2899,7 @@
if ((verbose > 1) || debug) {
bu_log("Running nmg_mark_edges_real with approx (%ld) faces from
obj file face grouping name (%s), obj file face grouping index (%zu)\n",
BU_PTBL_LEN(&faces), bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index +
1);
}
- (void)nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
if ((verbose > 1) || debug) {
bu_log("Completed nmg_mark_edges_real for obj file face grouping
name (%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
@@ -2942,7 +2942,7 @@
if ((verbose > 1) || debug) {
bu_log("Running nmg_fix_normals with approx (%ld) faces
from obj file face grouping name (%s), obj file face grouping index (%zu)\n",
BU_PTBL_LEN(&faces), bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index +
1);
}
- nmg_fix_normals(s, &RTG.rtg_vlfree, tol);
+ nmg_fix_normals(s, &rtg_vlfree, tol);
if ((verbose > 1) || debug) {
bu_log("Completed nmg_fix_normals for obj file face
grouping name (%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
Modified: brlcad/branches/bioh/src/conv/off/g-off.c
===================================================================
--- brlcad/branches/bioh/src/conv/off/g-off.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/off/g-off.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -103,7 +103,7 @@
tol.para = 1 - tol.perp;
the_model = nmg_mm();
- BU_LIST_INIT( &RTG.rtg_vlfree ); /* for vlist macros */
+ BU_LIST_INIT( &rtg_vlfree ); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "a:dn:p:r:vx:P:X:h?")) != -1) {
@@ -212,8 +212,8 @@
if ( !BU_SETJUMP ) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
@@ -359,7 +359,7 @@
(int)(tsp->ts_mater.ma_color[1] * 255),
(int)(tsp->ts_mater.ma_color[2] * 255) );
BU_LIST_INIT( &vhead );
- nmg_r_to_vlist(&vhead, r, 0, &RTG.rtg_vlfree);
+ nmg_r_to_vlist(&vhead, r, 0, &rtg_vlfree);
bn_vlist_to_uplot( fp, &vhead );
fclose(fp);
if (verbose) bu_log("*** Wrote %s\n", bu_vls_addr(&file));
@@ -404,7 +404,7 @@
map = (int *)bu_calloc(r->m_p->maxindex, sizeof(int), "Jack vert map");
/* Built list of vertex structs */
- nmg_vertex_tabulate( &vtab, &r->l.magic, &RTG.rtg_vlfree );
+ nmg_vertex_tabulate( &vtab, &r->l.magic, &rtg_vlfree );
/* FIXME: What to do if 0 vertices? */
Modified: brlcad/branches/bioh/src/conv/off/off-g.c
===================================================================
--- brlcad/branches/bioh/src/conv/off/off-g.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/off/off-g.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -141,7 +141,7 @@
if (fail) return -1;
- nmg_gluefaces(outfaceuses, nfaces, &RTG.rtg_vlfree, &tol);
+ nmg_gluefaces(outfaceuses, nfaces, &rtg_vlfree, &tol);
nmg_region_a(r, &tol);
bu_free((char *)pts, "points list");
Modified: brlcad/branches/bioh/src/conv/patch/patch-g.c
===================================================================
--- brlcad/branches/bioh/src/conv/patch/patch-g.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/patch/patch-g.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -392,7 +392,7 @@
struct loopuse *lu;
for (BU_LIST_FOR (lu, loopuse, &fu1->lu_hd))
- nmg_simplify_loop(lu, &RTG.rtg_vlfree);
+ nmg_simplify_loop(lu, &rtg_vlfree);
}
}
}
@@ -640,29 +640,29 @@
bu_free((char *)verts, "build_solid: verts");
/* fuse vertices */
- (void)nmg_vertex_fuse(&m->magic, &RTG.rtg_vlfree, tol);
+ (void)nmg_vertex_fuse(&m->magic, &rtg_vlfree, tol);
/* FASTGEN targets may have vertices that should be part of an
* adjoining edge. Use nmg_break_long_edges to fix this
*/
- i = nmg_break_edges(&m->magic, &RTG.rtg_vlfree, tol);
+ i = nmg_break_edges(&m->magic, &rtg_vlfree, tol);
if (debug > 2)
bu_log("nmg_break_edges broke %zu edges\n", i);
/* glue all the faces together */
- nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &RTG.rtg_vlfree, tol);
+ nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &rtg_vlfree, tol);
for (BU_LIST_FOR (s, shell, &r->s_hd))
- nmg_make_faces_within_tol(s, &RTG.rtg_vlfree, tol);
+ nmg_make_faces_within_tol(s, &rtg_vlfree, tol);
if (!plate_mode) {
/* make sure the normals are correct */
for (BU_LIST_FOR (s, shell, &r->s_hd))
- nmg_fix_normals(s, &RTG.rtg_vlfree, tol);
+ nmg_fix_normals(s, &rtg_vlfree, tol);
/* make sure we are dealing with closed shells */
for (BU_LIST_FOR (s, shell, &r->s_hd))
- nmg_close_shell(s, &RTG.rtg_vlfree, tol);
+ nmg_close_shell(s, &rtg_vlfree, tol);
/* free the memory for the face list */
bu_ptbl_free(&faces);
@@ -679,8 +679,8 @@
if (polysolid) {
mk_bot_from_nmg(outfp, name, s);
} else {
- nmg_shell_coplanar_face_merge(s, tol, 0, &RTG.rtg_vlfree);
- if (!nmg_simplify_shell(s, &RTG.rtg_vlfree)) {
+ nmg_shell_coplanar_face_merge(s, tol, 0, &rtg_vlfree);
+ if (!nmg_simplify_shell(s, &rtg_vlfree)) {
struct model *m_copy = nmg_clone_model(m);
mk_nmg(outfp, name, m_copy); /* frees m_copy */
}
@@ -688,7 +688,7 @@
/* if this solid is mirrored, don't go through the entire process again
*/
if (mirror_name[0]) {
- nmg_mirror_model(m, &RTG.rtg_vlfree);
+ nmg_mirror_model(m, &rtg_vlfree);
if (polysolid) {
mk_bot_from_nmg(outfp, mirror_name, s);
@@ -806,7 +806,7 @@
nmg_patch_coplanar_face_merge(s, &face_count, p_faces, tol, 0);
- if (nmg_simplify_shell(s, &RTG.rtg_vlfree))
+ if (nmg_simplify_shell(s, &rtg_vlfree))
return 1;
/* Calculate bounding boxes */
@@ -821,7 +821,7 @@
}
/* Duplicate shell */
- is = nmg_dup_shell(s, ©_tbl, &RTG.rtg_vlfree, tol);
+ is = nmg_dup_shell(s, ©_tbl, &rtg_vlfree, tol);
/* make a new flags array */
bu_free((char *)flags, "build_solid: flags");
@@ -870,10 +870,10 @@
if (fu->orientation == OT_SAME)
bu_ptbl_ins(&faces, (long *)fu);
}
- nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &RTG.rtg_vlfree, tol);
+ nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &rtg_vlfree, tol);
bu_ptbl_reset(&faces);
- nmg_shell_coplanar_face_merge(is, tol, 0, &RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(is, tol, 0, &rtg_vlfree);
nmg_shell_a(is, tol);
/* make yet another version of the flags array */
@@ -921,7 +921,7 @@
/* Adjust the vertices of new_v */
if (debug > 2)
bu_log("Moving (%f %f %f)", V3ARGS(new_v->vg_p->coord));
- if (nmg_in_vert(new_v, 1, &RTG.rtg_vlfree, tol)) {
+ if (nmg_in_vert(new_v, 1, &rtg_vlfree, tol)) {
/* FAILURE, kill the model and shell and return a failure
notification */
bu_log("nmg_in_vert failed on %s!\n", name);
if (!nmg_ks(is)) {
@@ -955,12 +955,12 @@
mk_nmg(outfp, tmp_name, m_copy); /* frees m_copy */
}
- nmg_make_faces_within_tol(is, &RTG.rtg_vlfree, tol);
+ nmg_make_faces_within_tol(is, &rtg_vlfree, tol);
/* Close shell */
if (debug)
bu_log("Close shell\n");
- if (nmg_open_shells_connect(s, is, (const long **)copy_tbl,
&RTG.rtg_vlfree, tol)) {
+ if (nmg_open_shells_connect(s, is, (const long **)copy_tbl, &rtg_vlfree,
tol)) {
/* debugging: write an NMG of the outer shell named "name.BAD" */
char bad[NAMESIZE+5];
@@ -986,7 +986,7 @@
}
if (debug)
bu_log("Re-glue faces\n");
- nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &RTG.rtg_vlfree, tol);
+ nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &rtg_vlfree, tol);
bu_ptbl_free(&faces);
/* Calculate bounding boxes */
@@ -1003,8 +1003,8 @@
if (polysolid) {
mk_bot_from_nmg(outfp, name, s);
} else {
- nmg_shell_coplanar_face_merge(s, tol, 0, &RTG.rtg_vlfree);
- if (!nmg_simplify_shell(s, &RTG.rtg_vlfree)) {
+ nmg_shell_coplanar_face_merge(s, tol, 0, &rtg_vlfree);
+ if (!nmg_simplify_shell(s, &rtg_vlfree)) {
struct model *m_copy = nmg_clone_model(m);
mk_nmg(outfp, name, m_copy); /* frees m_copy */
}
@@ -1014,7 +1014,7 @@
if (mirror_name[0]) {
if (debug)
bu_log("Mirror model\n");
- nmg_mirror_model(m, &RTG.rtg_vlfree);
+ nmg_mirror_model(m, &rtg_vlfree);
if (debug)
bu_log("writing %s (mirrored) to BRL-CAD DB\n", mirror_name);
Modified: brlcad/branches/bioh/src/conv/ply/g-ply.c
===================================================================
--- brlcad/branches/bioh/src/conv/ply/g-ply.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/ply/g-ply.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -188,7 +188,7 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* Output triangles */
if (verbose)
@@ -415,8 +415,8 @@
if (!BU_SETJUMP) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
Modified: brlcad/branches/bioh/src/conv/raw/g-raw.c
===================================================================
--- brlcad/branches/bioh/src/conv/raw/g-raw.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/raw/g-raw.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -143,7 +143,7 @@
fprintf(fp, "%s\n", (region_name+1));
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* Check triangles */
for (BU_LIST_FOR (s, shell, &r->s_hd))
@@ -249,7 +249,7 @@
/* make empty NMG model */
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "a:b8m:n:o:r:vx:D:X:i")) != -1) {
Modified: brlcad/branches/bioh/src/conv/stl/g-stl.c
===================================================================
--- brlcad/branches/bioh/src/conv/stl/g-stl.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/conv/stl/g-stl.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -177,7 +177,7 @@
fprintf(fp, "solid %s\n", (region_name+1));
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &tol);
/* Check triangles */
for (BU_LIST_FOR (s, shell, &r->s_hd))
@@ -340,7 +340,7 @@
/* make empty NMG model */
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Get command line arguments. */
while ((c = bu_getopt(argc, argv, "a:b8m:n:o:r:vx:D:X:ih?")) != -1) {
Modified: brlcad/branches/bioh/src/conv/tankill/tankill-g.c
===================================================================
--- brlcad/branches/bioh/src/conv/tankill/tankill-g.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/conv/tankill/tankill-g.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -342,7 +342,7 @@
NMG_CK_FACEUSE( fu );
if ( fu->orientation == OT_SAME )
{
- if ( nmg_calc_face_g( fu, &RTG.rtg_vlfree ) )
+ if ( nmg_calc_face_g( fu, &rtg_vlfree ) )
bu_log( "Failed to calculate plane eqn\n" );
/* save the face in a table */
@@ -365,7 +365,7 @@
nmg_break_long_edges( s, &tol );
/* glue all the faces together */
- nmg_gluefaces( (struct faceuse **)BU_PTBL_BASEADDR( &faces),
BU_PTBL_LEN( &faces ), &RTG.rtg_vlfree, &tol );
+ nmg_gluefaces( (struct faceuse **)BU_PTBL_BASEADDR( &faces),
BU_PTBL_LEN( &faces ), &rtg_vlfree, &tol );
/* re-initialize the face list */
bu_ptbl_reset( &faces );
@@ -376,7 +376,7 @@
/* fix the normals */
s = BU_LIST_FIRST( shell, &r->s_hd );
- nmg_fix_normals( s, &RTG.rtg_vlfree, &tol );
+ nmg_fix_normals( s, &rtg_vlfree, &tol );
/* make a name for this solid */
sprintf( name, "s.%d.%d", comp_code, Add_solid( comp_code ) );
Modified: brlcad/branches/bioh/src/gtools/gsh.cpp
===================================================================
--- brlcad/branches/bioh/src/gtools/gsh.cpp 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/gtools/gsh.cpp 2020-08-02 21:10:40 UTC (rev
76649)
@@ -92,7 +92,7 @@
}
/* FIXME: To draw, we need to init this LIBRT global */
- BU_LIST_INIT(&RTG.rtg_vlfree);
+ BU_LIST_INIT(&rtg_vlfree);
/* Need a view for commands that expect a view */
struct bview *gsh_view;
Modified: brlcad/branches/bioh/src/libdm/osgl/osg-test.cpp
===================================================================
--- brlcad/branches/bioh/src/libdm/osgl/osg-test.cpp 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libdm/osgl/osg-test.cpp 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -614,7 +614,7 @@
}
/* Need to initialize this for rt_obj_plot, which may call RT_ADD_VLIST */
- BU_LIST_INIT(&RTG.rtg_vlfree);
+ BU_LIST_INIT(&rtg_vlfree);
add_path_to_scene(&(osg_nodes), &path, dbip);
Modified: brlcad/branches/bioh/src/libgcv/bottess.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/bottess.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/libgcv/bottess.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -420,7 +420,7 @@
struct nmgregion *nmgr = BU_LIST_FIRST(nmgregion,
&tr->tr_d.td_r->m_p->r_hd);
/* the bot temporary format may be unnecessary if we can walk
* the nmg shells and generate soup from them directly. */
- struct rt_bot_internal *bot = nmg_bot(BU_LIST_FIRST(shell,
&nmgr->s_hd), &RTG.rtg_vlfree, tol);
+ struct rt_bot_internal *bot = nmg_bot(BU_LIST_FIRST(shell,
&nmgr->s_hd), &rtg_vlfree, tol);
/* causes a crash.
nmg_kr(nmgr);
Modified: brlcad/branches/bioh/src/libgcv/facetize.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/facetize.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/libgcv/facetize.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -178,7 +178,7 @@
/* Now, evaluate the boolean tree into ONE region */
if (!BU_SETJUMP) {
/* try */
- if (nmg_boolean(facetize_tree, nmg_model, &RTG.rtg_vlfree, tol,
&rt_uniresource)) {
+ if (nmg_boolean(facetize_tree, nmg_model, &rtg_vlfree, tol,
&rt_uniresource)) {
BU_UNSETJUMP;
return _gcv_facetize_cleanup(nmg_model, facetize_tree);
}
@@ -207,11 +207,11 @@
if (!BU_SETJUMP) {
/* try */
if (!result)
- result = nmg_bot(current_shell, &RTG.rtg_vlfree, tol);
+ result = nmg_bot(current_shell, &rtg_vlfree, tol);
else {
struct rt_bot_internal *bots[2];
bots[0] = result;
- bots[1] = nmg_bot(current_shell, &RTG.rtg_vlfree, tol);
+ bots[1] = nmg_bot(current_shell, &rtg_vlfree, tol);
result = rt_bot_merge(sizeof(bots) / sizeof(bots[0]),
(const struct rt_bot_internal * const
*)bots);
_gcv_facetize_free_bot(bots[0]);
Modified: brlcad/branches/bioh/src/libgcv/plugins/asc/asc_v5.cpp
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/asc/asc_v5.cpp 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libgcv/plugins/asc/asc_v5.cpp 2020-08-02
21:10:40 UTC (rev 76649)
@@ -64,7 +64,7 @@
rewind(ifp);
bu_vls_trunc(&line, 0);
-BU_LIST_INIT(&RTG.rtg_headwdb.l);
+BU_LIST_INIT(&rtg_headwdb.l);
interp = Tcl_CreateInterp();
Go_Init(interp);
Modified: brlcad/branches/bioh/src/libgcv/plugins/fastgen4/fastgen4_write.cpp
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/fastgen4/fastgen4_write.cpp
2020-08-02 20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libgcv/plugins/fastgen4/fastgen4_write.cpp
2020-08-02 21:10:40 UTC (rev 76649)
@@ -2433,7 +2433,7 @@
for (BU_LIST_FOR(current_shell, shell, &nmg_region->s_hd)) {
NMG_CK_SHELL(current_shell);
- rt_bot_internal * const bot = nmg_bot(current_shell, &RTG.rtg_vlfree,
+ rt_bot_internal * const bot = nmg_bot(current_shell, &rtg_vlfree,
&data.m_tol);
// fill in an rt_db_internal with our new bot so we can free it
Modified: brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -1276,7 +1276,7 @@
if (fu != NULL) {
/* do simple or robust triangulation based on whether face is concave
or convex */
- if (nmg_lu_is_convex(BU_LIST_FIRST(loopuse, &fu->lu_hd),
&RTG.rtg_vlfree, tol)) {
+ if (nmg_lu_is_convex(BU_LIST_FIRST(loopuse, &fu->lu_hd), &rtg_vlfree,
tol)) {
/* compute number of new triangles to create */
if (gfi->num_vertices_arr[face_idx] > 3) {
@@ -2815,7 +2815,7 @@
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Running nmg_model_fuse on (%ld) faces from obj file face
grouping name (%s), obj file face grouping index (%zu)\n", BU_PTBL_LEN(&faces),
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
- num_entities_fused = nmg_model_fuse(m, &RTG.rtg_vlfree, tol);
+ num_entities_fused = nmg_model_fuse(m, &rtg_vlfree, tol);
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Completed nmg_model_fuse for obj file face grouping name
(%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
bu_log("Fused (%d) entities in obj file face grouping name (%s),
obj file face grouping index (%zu)\n",
@@ -2826,7 +2826,7 @@
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Running nmg_gluefaces on (%ld) faces from obj file face
grouping name (%s), obj file face grouping index (%zu)\n", BU_PTBL_LEN(&faces),
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
- nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &RTG.rtg_vlfree, tol);
+ nmg_gluefaces((struct faceuse **)BU_PTBL_BASEADDR(&faces),
BU_PTBL_LEN(&faces), &rtg_vlfree, tol);
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Completed nmg_gluefaces for obj file face grouping name
(%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
@@ -2835,7 +2835,7 @@
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Running nmg_mark_edges_real with approx (%ld) faces from
obj file face grouping name (%s), obj file face grouping index (%zu)\n",
BU_PTBL_LEN(&faces), bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index +
1);
}
- (void)nmg_mark_edges_real(&s->l.magic,&RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&s->l.magic,&rtg_vlfree);
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Completed nmg_mark_edges_real for obj file face grouping
name (%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
@@ -2878,7 +2878,7 @@
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Running nmg_fix_normals with approx (%ld) faces
from obj file face grouping name (%s), obj file face grouping index (%zu)\n",
BU_PTBL_LEN(&faces), bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index +
1);
}
- nmg_fix_normals(s, &RTG.rtg_vlfree, tol);
+ nmg_fix_normals(s, &rtg_vlfree, tol);
if ((ga->gcv_options->verbosity_level > 1) ||
ga->gcv_options->debug_mode) {
bu_log("Completed nmg_fix_normals for obj file face
grouping name (%s), obj file face grouping index (%zu)\n",
bu_vls_addr(gfi->raw_grouping_name), gfi->grouping_index + 1);
}
Modified: brlcad/branches/bioh/src/libgcv/plugins/obj/obj_write.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/obj/obj_write.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libgcv/plugins/obj/obj_write.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -89,10 +89,10 @@
NMG_CK_MODEL(m);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree,
&pstate->gcv_options->calculational_tolerance);
+ nmg_triangulate_model(m, &rtg_vlfree,
&pstate->gcv_options->calculational_tolerance);
/* list all vertices in result */
- nmg_vertex_tabulate(&verts, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &r->l.magic, &rtg_vlfree);
/* Get number of vertices */
numverts = BU_PTBL_LEN(&verts);
@@ -99,7 +99,7 @@
/* get list of vertexuse normals */
if (pstate->obj_write_options->do_normals)
- nmg_vertexuse_normal_tabulate(&norms, &r->l.magic, &RTG.rtg_vlfree);
+ nmg_vertexuse_normal_tabulate(&norms, &r->l.magic, &rtg_vlfree);
/* BEGIN CHECK SECTION */
/* Check vertices */
@@ -332,8 +332,8 @@
if (!BU_SETJUMP) {
/* try */
- (void)nmg_model_fuse(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ (void)nmg_model_fuse(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
@@ -527,7 +527,7 @@
tree_state.ts_m = &the_model;
the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Write out header */
if (NEAR_EQUAL(state.gcv_options->scale_factor, 1.0 / 25.4, RT_LEN_TOL))
Modified: brlcad/branches/bioh/src/libgcv/plugins/obj/tri_face.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/obj/tri_face.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libgcv/plugins/obj/tri_face.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -137,7 +137,7 @@
/* add geometry to face */
fu = BU_LIST_FIRST(faceuse, &shell->fu_hd);
attach_face_g_plane(model, fu->f_p);
- if (nmg_calc_face_plane(fu, fu->f_p->g.plane_p->N, &RTG.rtg_vlfree)) {
+ if (nmg_calc_face_plane(fu, fu->f_p->g.plane_p->N, &rtg_vlfree)) {
nmg_km(model);
model = NULL;
} else {
@@ -230,7 +230,7 @@
}
/* triangulate face */
- if (nmg_triangulate_fu(fu, &RTG.rtg_vlfree, &tol)) {
+ if (nmg_triangulate_fu(fu, &rtg_vlfree, &tol)) {
*faces = NULL;
*numFaces = 0;
return;
Modified: brlcad/branches/bioh/src/libgcv/plugins/stl/stl_write.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/stl/stl_write.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libgcv/plugins/stl/stl_write.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -200,7 +200,7 @@
fprintf(pstate->fp, "solid %s\n", (region_name+1));
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree,
&pstate->gcv_options->calculational_tolerance);
+ nmg_triangulate_model(m, &rtg_vlfree,
&pstate->gcv_options->calculational_tolerance);
/* Check triangles */
for (BU_LIST_FOR (s, shell, &r->s_hd))
@@ -407,7 +407,7 @@
/* make empty NMG model */
state.the_model = nmg_mm();
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
/* Walk indicated tree(s). Each region will be output separately */
(void) db_walk_tree(state.dbip, gcv_options->num_objects, (const char
**)gcv_options->object_names,
Modified: brlcad/branches/bioh/src/libgcv/plugins/vrml/vrml_write.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/vrml/vrml_write.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libgcv/plugins/vrml/vrml_write.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -789,7 +789,7 @@
}
if (!is_light) {
- nmg_triangulate_model(m, &RTG.rtg_vlfree, tol2);
+ nmg_triangulate_model(m, &rtg_vlfree, tol2);
fprintf(pstate->fp_out, "\t\t\t}\n");
fprintf(pstate->fp_out, "\t\t\tgeometry IndexedFaceSet {\n");
fprintf(pstate->fp_out, "\t\t\t\tcoord Coordinate {\n");
@@ -796,7 +796,7 @@
}
/* get list of vertices */
- nmg_vertex_tabulate(&verts, &m->magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &m->magic, &rtg_vlfree);
if (!is_light) {
fprintf(pstate->fp_out, "\t\t\t\t\tpoint [");
} else {
@@ -1055,7 +1055,7 @@
/* Begin bomb protection */
if (!BU_SETJUMP) {
/* try */
- ret_tree = nmg_booltree_evaluate(curtree, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ ret_tree = nmg_booltree_evaluate(curtree, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
char *name = db_path_to_string(pathp);
@@ -1255,7 +1255,7 @@
nmg_eue_dist = 2.0;
}
- BU_LIST_INIT(&RTG.rtg_vlfree); /* for vlist macros */
+ BU_LIST_INIT(&rtg_vlfree); /* for vlist macros */
fprintf(state.fp_out, "#VRML V2.0 utf8\n");
fprintf(state.fp_out, "#Units are %s\n",
vrml_write_make_units_str(gcv_options->scale_factor));
Modified: brlcad/branches/bioh/src/libgcv/region_end.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/region_end.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libgcv/region_end.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -110,7 +110,7 @@
* curtree to an evaluated result and returns it if the evaluation
* is successful.
*/
- ret_tree = nmg_booltree_evaluate(tp, &RTG.rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
+ ret_tree = nmg_booltree_evaluate(tp, &rtg_vlfree, tsp->ts_tol,
&rt_uniresource);
} else {
/* catch */
/* Error, bail out */
Modified: brlcad/branches/bioh/src/libged/bev/bev.c
===================================================================
--- brlcad/branches/bioh/src/libged/bev/bev.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/libged/bev/bev.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -249,7 +249,7 @@
return GED_ERROR;
}
- failed = nmg_boolean(tmp_tree, bev_nmg_model, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol, &rt_uniresource);
+ failed = nmg_boolean(tmp_tree, bev_nmg_model, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol, &rt_uniresource);
BU_UNSETJUMP;
} else
failed = 1;
@@ -282,7 +282,7 @@
bev_nmg_model = (struct model *)NULL;
return GED_ERROR;
}
- nmg_triangulate_model(bev_nmg_model, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
+ nmg_triangulate_model(bev_nmg_model, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
BU_UNSETJUMP;
}
Modified: brlcad/branches/bioh/src/libged/bigE/bigE.c
===================================================================
--- brlcad/branches/bioh/src/libged/bigE/bigE.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/libged/bigE/bigE.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -182,7 +182,7 @@
if (solid_is_plate_mode_bot
|| !eptr->l.m
- || (bot = nmg_bot(s, &RTG.rtg_vlfree,
&dgcdp->gedp->ged_wdbp->wdb_tol)) == (struct rt_bot_internal *)NULL)
+ || (bot = nmg_bot(s, &rtg_vlfree,
&dgcdp->gedp->ged_wdbp->wdb_tol)) == (struct rt_bot_internal *)NULL)
{
eptr->l.stp->st_id = id;
eptr->l.stp->st_meth = &OBJ[id];
@@ -1330,7 +1330,7 @@
}
if (leaf_ptr->l.m)
- nmg_edge_tabulate(&leaf_ptr->l.edge_list, &leaf_ptr->l.m->magic,
&RTG.rtg_vlfree);
+ nmg_edge_tabulate(&leaf_ptr->l.edge_list, &leaf_ptr->l.m->magic,
&rtg_vlfree);
else
bu_ptbl_init(&leaf_ptr->l.edge_list, 1, "edge_list");
}
@@ -1775,7 +1775,7 @@
nmg_vertex_g(v[1], max[X], max[Y], min[Z]);
nmg_vertex_g(v[2], max[X], max[Y], max[Z]);
nmg_vertex_g(v[3], max[X], min[Y], max[Z]);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
vp[0] = &v[4];
vp[1] = &v[5];
@@ -1786,7 +1786,7 @@
nmg_vertex_g(v[5], min[X], min[Y], max[Z]);
nmg_vertex_g(v[6], min[X], max[Y], max[Z]);
nmg_vertex_g(v[7], min[X], max[Y], min[Z]);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
vp[0] = &v[0];
vp[1] = &v[3];
@@ -1793,7 +1793,7 @@
vp[2] = &v[5];
vp[3] = &v[4];
fu = nmg_cmface(s, vp, 4);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
vp[0] = &v[1];
vp[1] = &v[7];
@@ -1800,7 +1800,7 @@
vp[2] = &v[6];
vp[3] = &v[2];
fu = nmg_cmface(s, vp, 4);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
vp[0] = &v[3];
vp[1] = &v[2];
@@ -1807,7 +1807,7 @@
vp[2] = &v[6];
vp[3] = &v[5];
fu = nmg_cmface(s, vp, 4);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
vp[0] = &v[1];
vp[1] = &v[0];
@@ -1814,7 +1814,7 @@
vp[2] = &v[4];
vp[3] = &v[7];
fu = nmg_cmface(s, vp, 4);
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
nmg_region_a(r, tol);
@@ -1872,7 +1872,7 @@
vcut[1] = new_eu->vu_p;
nmg_vertex_gv(vcut[1]->v_p, pt[1]);
- new_lu = nmg_cut_loop(vcut[0], vcut[1], &RTG.rtg_vlfree);
+ new_lu = nmg_cut_loop(vcut[0], vcut[1], &rtg_vlfree);
nmg_lu_reorient(lu);
nmg_lu_reorient(new_lu);
@@ -1944,13 +1944,13 @@
}
nmg_rebound(tp->l.m, tol);
- nmg_model_fuse(tp->l.m, &RTG.rtg_vlfree, tol);
- nmg_close_shell(s, &RTG.rtg_vlfree, tol);
+ nmg_model_fuse(tp->l.m, &rtg_vlfree, tol);
+ nmg_close_shell(s, &rtg_vlfree, tol);
nmg_rebound(tp->l.m, tol);
BU_ALLOC(pg, struct rt_pg_internal);
- if (!nmg_to_poly(tp->l.m, pg, &RTG.rtg_vlfree, tol)) {
+ if (!nmg_to_poly(tp->l.m, pg, &rtg_vlfree, tol)) {
bu_free((char *)pg, "rt_pg_internal");
bu_vls_printf(dgcdp->gedp->ged_result_str, "Prep failure for solid
'%s'\n", tp->l.stp->st_dp->d_namep);
} else {
Modified: brlcad/branches/bioh/src/libged/bot/bot_fuse.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot/bot_fuse.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libged/bot/bot_fuse.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -68,7 +68,7 @@
}
bu_ptbl_init(&faces, 64, "faces buffer");
- nmg_face_tabulate(&faces, magic_p, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&faces, magic_p, &rtg_vlfree);
cnt = 0;
for (i = 0; i < (size_t)BU_PTBL_LEN(&faces) ; i++) {
@@ -235,13 +235,13 @@
/* Step 1 -- the vertices. */
bu_log("%s: running nmg_vertex_fuse\n", argv[0]);
- count = nmg_vertex_fuse(&m->magic, &RTG.rtg_vlfree, tol);
+ count = nmg_vertex_fuse(&m->magic, &rtg_vlfree, tol);
total += count;
bu_log("%s: %s, %d vertex fused\n", argv[0], argv[i+1], count);
/* Step 1.5 -- break edges on vertices, before fusing edges */
bu_log("%s: running nmg_break_e_on_v\n", argv[0]);
- count = nmg_break_e_on_v(&m->magic, &RTG.rtg_vlfree, tol);
+ count = nmg_break_e_on_v(&m->magic, &rtg_vlfree, tol);
total += count;
bu_log("%s: %s, %d broke 'e' on 'v'\n", argv[0], argv[i+1], count);
@@ -257,19 +257,19 @@
for (BU_LIST_FOR(r2, nmgregion, &m->r_hd)) {
for (BU_LIST_FOR(s, shell, &r2->s_hd))
- nmg_make_faces_within_tol(s, &RTG.rtg_vlfree, tol);
+ nmg_make_faces_within_tol(s, &rtg_vlfree, tol);
}
}
/* Step 2 -- the face geometry */
bu_log("%s: running nmg_model_face_fuse\n", argv[0]);
- count = nmg_model_face_fuse(m, &RTG.rtg_vlfree, tol);
+ count = nmg_model_face_fuse(m, &rtg_vlfree, tol);
total += count;
bu_log("%s: %s, %d faces fused\n", argv[0], argv[i+1], count);
/* Step 3 -- edges */
bu_log("%s: running nmg_edge_fuse\n", argv[0]);
- count = nmg_edge_fuse(&m->magic, &RTG.rtg_vlfree, tol);
+ count = nmg_edge_fuse(&m->magic, &rtg_vlfree, tol);
total += count;
bu_log("%s: %s, %d edges fused\n", argv[0], argv[i+1], count);
@@ -280,7 +280,7 @@
/* try */
/* convert the nmg model back into a bot */
- bot = nmg_bot(BU_LIST_FIRST(shell, &r->s_hd), &RTG.rtg_vlfree, tol);
+ bot = nmg_bot(BU_LIST_FIRST(shell, &r->s_hd), &rtg_vlfree, tol);
bu_vls_sprintf(&name_prefix, "open_edges.%s", argv[i]);
bu_log("%s: running show_dangling_edges\n", argv[0]);
Modified: brlcad/branches/bioh/src/libged/brep/plot.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/brep/plot.cpp 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libged/brep/plot.cpp 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -2459,7 +2459,7 @@
std::set<int>::iterator e_it;
for (e_it = elements.begin(); e_it != elements.end(); e_it++) {
- brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&RTG.rtg_vlfree, *e_it, 0, -1);
+ brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&rtg_vlfree, *e_it, 0, -1);
}
struct bu_vls sname = BU_VLS_INIT_ZERO;
@@ -2503,7 +2503,7 @@
std::set<int>::iterator e_it;
for (e_it = elements.begin(); e_it != elements.end(); e_it++) {
- brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&RTG.rtg_vlfree, *e_it, 2, -1);
+ brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&rtg_vlfree, *e_it, 2, -1);
}
struct bu_vls sname = BU_VLS_INIT_ZERO;
@@ -2547,7 +2547,7 @@
std::set<int>::iterator e_it;
for (e_it = elements.begin(); e_it != elements.end(); e_it++) {
- brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&RTG.rtg_vlfree, *e_it, 3, -1);
+ brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&rtg_vlfree, *e_it, 3, -1);
}
struct bu_vls sname = BU_VLS_INIT_ZERO;
@@ -2591,7 +2591,7 @@
std::set<int>::iterator e_it;
for (e_it = elements.begin(); e_it != elements.end(); e_it++) {
- brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&RTG.rtg_vlfree, *e_it, 4, -1);
+ brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&rtg_vlfree, *e_it, 4, -1);
}
struct bu_vls sname = BU_VLS_INIT_ZERO;
@@ -2635,7 +2635,7 @@
std::set<int>::iterator e_it;
for (e_it = elements.begin(); e_it != elements.end(); e_it++) {
- brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&RTG.rtg_vlfree, *e_it, 1, -1);
+ brep_facecdt_plot(gib->vls, solid_name, ttol, tol, brep, NULL, vbp,
&rtg_vlfree, *e_it, 1, -1);
}
struct bu_vls sname = BU_VLS_INIT_ZERO;
@@ -2696,7 +2696,7 @@
ON_Brep_CDT_Tessellate(s_cdt, 0, NULL);
}
- ON_Brep_CDT_VList(vbp, &RTG.rtg_vlfree, &c, 0, s_cdt);
+ ON_Brep_CDT_VList(vbp, &rtg_vlfree, &c, 0, s_cdt);
ON_Brep_CDT_Destroy(s_cdt);
struct bu_vls sname = BU_VLS_INIT_ZERO;
@@ -2755,7 +2755,7 @@
ON_Brep_CDT_Tol_Set(s_cdt, &cdttol);
ON_Brep_CDT_Tessellate(s_cdt, face_cnt, faces);
- ON_Brep_CDT_VList(vbp, &RTG.rtg_vlfree, &c, 2, s_cdt);
+ ON_Brep_CDT_VList(vbp, &rtg_vlfree, &c, 2, s_cdt);
ON_Brep_CDT_Destroy(s_cdt);
bu_free(faces, "free face array");
@@ -2815,7 +2815,7 @@
ON_Brep_CDT_Tol_Set(s_cdt, &cdttol);
ON_Brep_CDT_Tessellate(s_cdt, face_cnt, faces);
- ON_Brep_CDT_VList(vbp, &RTG.rtg_vlfree, &c, 1, s_cdt);
+ ON_Brep_CDT_VList(vbp, &rtg_vlfree, &c, 1, s_cdt);
ON_Brep_CDT_Destroy(s_cdt);
bu_free(faces, "free face array");
Modified: brlcad/branches/bioh/src/libged/decompose/decompose.c
===================================================================
--- brlcad/branches/bioh/src/libged/decompose/decompose.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libged/decompose/decompose.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -113,7 +113,7 @@
long **trans_tbl;
/* duplicate shell */
- tmp_s = (struct shell *)nmg_dup_shell(s, &trans_tbl,
&RTG.rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
+ tmp_s = (struct shell *)nmg_dup_shell(s, &trans_tbl, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
bu_free((char *)trans_tbl, "trans_tbl");
/* move duplicate to temp region */
@@ -120,7 +120,7 @@
(void) nmg_mv_shell_to_region(tmp_s, tmp_r);
/* decompose this shell */
- (void) nmg_decompose_shell(tmp_s, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
+ (void) nmg_decompose_shell(tmp_s, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
/* move each decomposed shell to yet another region */
decomp_s = BU_LIST_FIRST(shell, &tmp_r->s_hd);
@@ -139,11 +139,11 @@
kill_s = BU_LIST_FIRST(shell, &decomp_r->s_hd);
(void)nmg_ks(kill_s);
nmg_shell_a(decomp_s, &gedp->ged_wdbp->wdb_tol);
- new_s = (struct shell *)nmg_dup_shell(decomp_s, &trans_tbl,
&RTG.rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
+ new_s = (struct shell *)nmg_dup_shell(decomp_s, &trans_tbl,
&rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
(void)nmg_mv_shell_to_region(new_s, decomp_r);
/* move this region to a different model */
- new_m = (struct model *)nmg_mk_model_from_region(decomp_r, 1,
&RTG.rtg_vlfree);
+ new_m = (struct model *)nmg_mk_model_from_region(decomp_r, 1,
&rtg_vlfree);
(void)nmg_rebound(new_m, &gedp->ged_wdbp->wdb_tol);
/* create name for this shell */
Modified: brlcad/branches/bioh/src/libged/draw/draw.c
===================================================================
--- brlcad/branches/bioh/src/libged/draw/draw.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/libged/draw/draw.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -401,7 +401,7 @@
if (!BU_SETJUMP) {
/* try */
- result = nmg_boolean(curtree, *tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol,
tsp->ts_resp);
+ result = nmg_boolean(curtree, *tsp->ts_m, &rtg_vlfree, tsp->ts_tol,
tsp->ts_resp);
} else {
/* catch */
@@ -425,7 +425,7 @@
if (!BU_SETJUMP) {
/* try */
- nmg_triangulate_model(*tsp->ts_m, &RTG.rtg_vlfree, tsp->ts_tol);
+ nmg_triangulate_model(*tsp->ts_m, &rtg_vlfree, tsp->ts_tol);
result = 0;
} else {
@@ -525,12 +525,12 @@
if (dgcdp->draw_no_surfaces) {
style |= NMG_VLIST_STYLE_NO_SURFACES;
}
- nmg_r_to_vlist(&vhead, r, style, &RTG.rtg_vlfree);
+ nmg_r_to_vlist(&vhead, r, style, &rtg_vlfree);
_ged_drawH_part2(0, &vhead, pathp, tsp, dgcdp);
if (dgcdp->draw_edge_uses) {
- nmg_vlblock_r(dgcdp->draw_edge_uses_vbp, r, 1, &RTG.rtg_vlfree);
+ nmg_vlblock_r(dgcdp->draw_edge_uses_vbp, r, 1, &rtg_vlfree);
}
/* NMG region is no longer necessary, only vlist remains */
db_free_tree(curtree, tsp->ts_resp);
Modified: brlcad/branches/bioh/src/libged/facetize/facetize.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/facetize/facetize.cpp 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libged/facetize/facetize.cpp 2020-08-02
21:10:40 UTC (rev 76649)
@@ -570,7 +570,7 @@
if (facetize_tree) {
if (!BU_SETJUMP) {
/* try */
- failed = nmg_boolean(facetize_tree, nmg_model, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol, &rt_uniresource);
+ failed = nmg_boolean(facetize_tree, nmg_model, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol, &rt_uniresource);
} else {
/* catch */
BU_UNSETJUMP;
@@ -603,7 +603,7 @@
if (!BU_SETJUMP) {
/* try */
- nmg_triangulate_model(nmg_model, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
+ nmg_triangulate_model(nmg_model, &rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
} else {
/* catch */
BU_UNSETJUMP;
@@ -622,7 +622,7 @@
_ged_facetize_log_nmg(o);
if (!BU_SETJUMP) {
/* try */
- bot = (struct rt_bot_internal *)nmg_mdl_to_bot(nmg_model,
&RTG.rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
+ bot = (struct rt_bot_internal *)nmg_mdl_to_bot(nmg_model, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
} else {
/* catch */
BU_UNSETJUMP;
Modified: brlcad/branches/bioh/src/libged/inside.c
===================================================================
--- brlcad/branches/bioh/src/libged/inside.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/libged/inside.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -326,7 +326,7 @@
* This does all the vertices
*/
bu_ptbl_init(&vert_tab, 64, "vert_tab");
- nmg_vertex_tabulate(&vert_tab, &m->magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&vert_tab, &m->magic, &rtg_vlfree);
for (i = 0; i < BU_PTBL_LEN(&vert_tab); i++) {
struct vertex *v;
@@ -333,7 +333,7 @@
v = (struct vertex *)BU_PTBL_GET(&vert_tab, i);
NMG_CK_VERTEX(v);
- if (nmg_in_vert(v, 0, &RTG.rtg_vlfree, &gedp->ged_wdbp->wdb_tol)) {
+ if (nmg_in_vert(v, 0, &rtg_vlfree, &gedp->ged_wdbp->wdb_tol)) {
bu_vls_printf(gedp->ged_result_str, "Could not find coordinates
for inside arb7\n");
nmg_km(m);
bu_ptbl_free(&vert_tab);
@@ -345,13 +345,13 @@
/* rebound model */
nmg_rebound(m, &gedp->ged_wdbp->wdb_tol);
- nmg_extrude_cleanup(s, 0, &RTG.rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
+ nmg_extrude_cleanup(s, 0, &rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
/* free old ip pointer */
rt_db_free_internal(ip);
/* convert the NMG to a BOT */
- bot = (struct rt_bot_internal *)nmg_bot(s, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
+ bot = (struct rt_bot_internal *)nmg_bot(s, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
nmg_km(m);
/* put new solid in "ip" */
@@ -870,9 +870,9 @@
next_s = BU_LIST_PNEXT(shell, &s->l);
- nmg_shell_coplanar_face_merge(s, &gedp->ged_wdbp->wdb_tol, 1,
&RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(s, &gedp->ged_wdbp->wdb_tol, 1,
&rtg_vlfree);
if (!nmg_kill_cracks(s))
- (void)nmg_extrude_shell(s, thick, 0, 0, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
+ (void)nmg_extrude_shell(s, thick, 0, 0, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
s = next_s;
}
Modified: brlcad/branches/bioh/src/libged/nmg/nmg_cmface.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg/nmg_cmface.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libged/nmg/nmg_cmface.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -132,7 +132,7 @@
if (fu->orientation != OT_SAME) {
continue;
}
- nmg_calc_face_g(fu, &RTG.rtg_vlfree);
+ nmg_calc_face_g(fu, &rtg_vlfree);
}
}
Modified: brlcad/branches/bioh/src/libged/nmg/nmg_collapse.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg/nmg_collapse.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libged/nmg/nmg_collapse.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -116,7 +116,7 @@
NMG_CK_MODEL(m);
/* check that all faces are planar */
- nmg_face_tabulate(&faces, &m->magic, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&faces, &m->magic, &rtg_vlfree);
for (BU_PTBL_FOR(fp, (struct face *), &faces)) {
if (fp->g.magic_p != NULL && *(fp->g.magic_p) !=
NMG_FACE_G_PLANE_MAGIC) {
bu_log("\tnot planar\n");
@@ -129,9 +129,9 @@
bu_ptbl_free(&faces);
/* triangulate model */
- nmg_triangulate_model(m, &RTG.rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
+ nmg_triangulate_model(m, &rtg_vlfree, &gedp->ged_wdbp->wdb_tol);
- count = (size_t)nmg_edge_collapse(m, &gedp->ged_wdbp->wdb_tol, tol_coll,
min_angle, &RTG.rtg_vlfree);
+ count = (size_t)nmg_edge_collapse(m, &gedp->ged_wdbp->wdb_tol, tol_coll,
min_angle, &rtg_vlfree);
dp = db_diradd(gedp->ged_wdbp->dbip, new_name, RT_DIR_PHONY_ADDR, 0,
RT_DIR_SOLID, (void *)&intern.idb_type);
if (dp == RT_DIR_NULL) {
Modified: brlcad/branches/bioh/src/libged/nmg/nmg_fix_normals.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg/nmg_fix_normals.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/libged/nmg/nmg_fix_normals.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -88,7 +88,7 @@
/* hum, here we go */
for (BU_LIST_FOR(r, nmgregion, &m->r_hd))
for (BU_LIST_FOR(s, shell, &r->s_hd))
- nmg_fix_normals(s, &RTG.rtg_vlfree, &tol);
+ nmg_fix_normals(s, &rtg_vlfree, &tol);
return GED_OK;
}
Modified: brlcad/branches/bioh/src/libged/nmg/nmg_simplify.c
===================================================================
--- brlcad/branches/bioh/src/libged/nmg/nmg_simplify.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libged/nmg/nmg_simplify.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -128,7 +128,7 @@
NMG_CK_MODEL(m);
/* check that all faces are planar */
- nmg_face_tabulate(&faces, &m->magic, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&faces, &m->magic, &rtg_vlfree);
for (i = 0 ; i < BU_PTBL_LEN(&faces) ; i++) {
fp = (struct face *)BU_PTBL_GET(&faces, i);
@@ -172,8 +172,8 @@
r = BU_LIST_FIRST(nmgregion, &m->r_hd);
s = BU_LIST_FIRST(shell, &r->s_hd);
- nmg_shell_coplanar_face_merge(s, &gedp->ged_wdbp->wdb_tol, 0,
&RTG.rtg_vlfree);
- nmg_simplify_shell(s, &RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(s, &gedp->ged_wdbp->wdb_tol, 0,
&rtg_vlfree);
+ nmg_simplify_shell(s, &rtg_vlfree);
if (nmg_to_arb(m, arb_int)) {
success = 1;
@@ -225,7 +225,7 @@
new_intern.idb_type = ID_POLY;
new_intern.idb_meth = &OBJ[ID_POLY];
- if (nmg_to_poly(m, poly_int, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol)) {
+ if (nmg_to_poly(m, poly_int, &rtg_vlfree, &gedp->ged_wdbp->wdb_tol)) {
success = 1;
ret = GED_OK;
goto out1;
Modified: brlcad/branches/bioh/src/libged/shells/shells.c
===================================================================
--- brlcad/branches/bioh/src/libged/shells/shells.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/libged/shells/shells.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -81,7 +81,7 @@
for (BU_LIST_FOR(r, nmgregion, &m->r_hd)) {
for (BU_LIST_FOR(s, shell, &r->s_hd)) {
- s_tmp = nmg_dup_shell(s, &trans_tbl, &RTG.rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
+ s_tmp = nmg_dup_shell(s, &trans_tbl, &rtg_vlfree,
&gedp->ged_wdbp->wdb_tol);
bu_free((void *)trans_tbl, "trans_tbl");
m_tmp = nmg_mmr();
Modified: brlcad/branches/bioh/src/librt/globals.c
===================================================================
--- brlcad/branches/bioh/src/librt/globals.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/librt/globals.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -38,7 +38,7 @@
unsigned int rt_debug = 0;
-struct rt_g RTG = RT_G_INIT_ZERO;
+struct bu_list rtg_vlfree = BU_LIST_INIT_ZERO;
struct resource rt_uniresource = RT_RESOURCE_INIT_ZERO;
Modified: brlcad/branches/bioh/src/librt/prep.c
===================================================================
--- brlcad/branches/bioh/src/librt/prep.c 2020-08-02 20:58:40 UTC (rev
76648)
+++ brlcad/branches/bioh/src/librt/prep.c 2020-08-02 21:10:40 UTC (rev
76649)
@@ -75,7 +75,7 @@
RT_CK_DBI(dbip);
/* XXX Move to rt_global_init() ? */
- if (BU_LIST_FIRST(bu_list, &RTG.rtg_vlfree) == 0) {
+ if (BU_LIST_FIRST(bu_list, &rtg_vlfree) == 0) {
char *debug_flags;
debug_flags = getenv("LIBRT_DEBUG");
if (debug_flags) {
@@ -86,7 +86,7 @@
}
}
- BU_LIST_INIT(&RTG.rtg_vlfree);
+ BU_LIST_INIT(&rtg_vlfree);
}
BU_ALLOC(rtip, struct rt_i);
Modified: brlcad/branches/bioh/src/librt/primitives/annot/annot.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/annot/annot.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/annot/annot.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -151,7 +151,7 @@
VSET(bmin, INFINITY, INFINITY, INFINITY);
VSET(bmax, -INFINITY, -INFINITY, -INFINITY);
- bn_vlist_2string(&vhead, &RTG.rtg_vlfree, tsg->label.vls_str, ref_pt[0],
ref_pt[1], 5, 0);
+ bn_vlist_2string(&vhead, &rtg_vlfree, tsg->label.vls_str, ref_pt[0],
ref_pt[1], 5, 0);
bn_vlist_bbox(&vhead, &bmin, &bmax, NULL);
*length = bmax[0] - ref_pt[0];
@@ -453,7 +453,7 @@
}
ant_pos_adjs(tsg, annot_ip);
V2ADD2(pt, V, annot_ip->verts[tsg->ref_pt]);
- bn_vlist_2string(vhead, &RTG.rtg_vlfree, tsg->label.vls_str, pt[0],
pt[1], 5, 0);
+ bn_vlist_2string(vhead, &rtg_vlfree, tsg->label.vls_str, pt[0],
pt[1], 5, 0);
break;
case CURVE_CARC_MAGIC:
{
Modified: brlcad/branches/bioh/src/librt/primitives/arb8/arb8.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/arb8/arb8.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/arb8/arb8.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -1565,13 +1565,13 @@
}
/* Mark edges as real */
- (void)nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
/* Some arbs may not be within tolerance, so triangulate faces where
needed */
- nmg_make_faces_within_tol(s, &RTG.rtg_vlfree, tol);
+ nmg_make_faces_within_tol(s, &rtg_vlfree, tol);
return 0;
}
@@ -1746,7 +1746,7 @@
/* Mark edges as real */
- (void)nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
Modified: brlcad/branches/bioh/src/librt/primitives/arbn/arbn.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/arbn/arbn.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/arbn/arbn.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -777,9 +777,9 @@
bu_free((char *)fu, "rt_arbn_tess: fu");
- nmg_fix_normals(s, &RTG.rtg_vlfree, tol);
+ nmg_fix_normals(s, &rtg_vlfree, tol);
- (void)nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
Modified: brlcad/branches/bioh/src/librt/primitives/ars/ars.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/ars/ars.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/ars/ars.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -554,7 +554,7 @@
ASSOC_GEOM(0, 0, 0);
ASSOC_GEOM(1, 0, 1);
ASSOC_GEOM(2, 1, 1);
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
bu_log("Degenerate face created, will kill it later\n");
bu_ptbl_ins(&kill_fus, (long *)fu);
}
@@ -585,7 +585,7 @@
ASSOC_GEOM(0, 1, 0);
ASSOC_GEOM(1, 0, 0);
ASSOC_GEOM(2, 1, 1);
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
bu_log("Degenerate face created, will kill it later\n");
bu_ptbl_ins(&kill_fus, (long *)fu);
}
@@ -605,16 +605,16 @@
/* ARS solids are often built with incorrect face normals. Don't
* depend on them to be correct.
*/
- nmg_fix_normals(s, &RTG.rtg_vlfree, tol);
+ nmg_fix_normals(s, &rtg_vlfree, tol);
/* set edge's is_real flag */
- nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
- nmg_shell_coplanar_face_merge(s, tol, 0, &RTG.rtg_vlfree);
- nmg_simplify_shell(s,&RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(s, tol, 0, &rtg_vlfree);
+ nmg_simplify_shell(s,&rtg_vlfree);
return 0;
}
@@ -688,7 +688,7 @@
}
s = BU_LIST_FIRST(shell, &r->s_hd);
- bot = nmg_bot(s, &RTG.rtg_vlfree, &rtip->rti_tol);
+ bot = nmg_bot(s, &rtg_vlfree, &rtip->rti_tol);
if (!bot) {
bu_log("Failed to convert ARS to BOT (%s)\n", stp->st_dp->d_namep);
Modified: brlcad/branches/bioh/src/librt/primitives/bot/bot.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/bot/bot.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/bot/bot.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -1124,7 +1124,7 @@
if (!(*corners[2])->vg_p)
nmg_vertex_gv(*(corners[2]), pt[2]);
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree))
+ if (nmg_calc_face_g(fu,&rtg_vlfree))
nmg_kfu(fu);
else if (bot_ip->mode == RT_BOT_SURFACE) {
struct vertex **tmp;
@@ -1135,18 +1135,18 @@
if ((fu=nmg_cmface(s, corners, 3)) == (struct faceuse *)NULL)
bu_log("rt_bot_tess() nmg_cmface() failed for face #%zu\n", i);
else
- nmg_calc_face_g(fu,&RTG.rtg_vlfree);
+ nmg_calc_face_g(fu,&rtg_vlfree);
}
}
bu_free(verts, "rt_bot_tess *verts[]");
- nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
nmg_region_a(*r, tol);
if (bot_ip->mode == RT_BOT_SOLID && bot_ip->orientation ==
RT_BOT_UNORIENTED)
- nmg_fix_normals(s, &RTG.rtg_vlfree, tol);
+ nmg_fix_normals(s, &rtg_vlfree, tol);
return 0;
}
Modified: brlcad/branches/bioh/src/librt/primitives/brep/brep.cpp
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/brep/brep.cpp 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/brep/brep.cpp 2020-08-02
21:10:40 UTC (rev 76649)
@@ -2925,7 +2925,7 @@
ON_Brep* brep = bi->brep;
- if (brep_facecdt_plot(NULL, solid_name, ttol, tol, brep, vhead, NULL,
&RTG.rtg_vlfree, -1, 0, -1)) {
+ if (brep_facecdt_plot(NULL, solid_name, ttol, tol, brep, vhead, NULL,
&rtg_vlfree, -1, 0, -1)) {
return -1;
}
return 0;
Modified: brlcad/branches/bioh/src/librt/primitives/cline/cline.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/cline/cline.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/cline/cline.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -769,7 +769,7 @@
fu = (struct faceuse *)BU_PTBL_GET(&faces, i);
NMG_CK_FACEUSE(fu);
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
bu_log("rt_tess_cline: failed to calculate plane equation\n");
nmg_pr_fu_briefly(fu, "");
return -1;
Modified: brlcad/branches/bioh/src/librt/primitives/dsp/dsp.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/dsp/dsp.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/dsp/dsp.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -3952,13 +3952,13 @@
}
/* Mark edges as real */
- (void)nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
/* sanity check */
- nmg_make_faces_within_tol(s, &RTG.rtg_vlfree, tol);
+ nmg_make_faces_within_tol(s, &rtg_vlfree, tol);
return 0;
}
Modified: brlcad/branches/bioh/src/librt/primitives/ebm/ebm.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/ebm/ebm.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/ebm/ebm.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -1740,7 +1740,7 @@
}
/* all faces should merge into one */
- nmg_shell_coplanar_face_merge(s, tol, 1, &RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(s, tol, 1, &rtg_vlfree);
fu = BU_LIST_FIRST(faceuse, &s->fu_hd);
NMG_CK_FACEUSE(fu);
@@ -1748,11 +1748,11 @@
VSET(h, 0.0, 0.0, eip->tallness);
MAT4X3VEC(height, eip->mat, h);
- nmg_extrude_face(fu, height, &RTG.rtg_vlfree,tol);
+ nmg_extrude_face(fu, height, &rtg_vlfree,tol);
nmg_region_a(*r, tol);
- (void)nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
bu_free((char *)vertp, "rt_ebm_tess: vertp");
bu_free((char *)loop_verts, "rt_ebm_tess: loop_verts");
Modified: brlcad/branches/bioh/src/librt/primitives/ehy/ehy.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/ehy/ehy.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/ehy/ehy.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -1560,13 +1560,13 @@
}
/* Glue the edges of different outward pointing face uses together */
- nmg_gluefaces(outfaceuses, face, &RTG.rtg_vlfree, tol);
+ nmg_gluefaces(outfaceuses, face, &rtg_vlfree, tol);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
/* XXX just for testing, to make up for loads of triangles ... */
- nmg_shell_coplanar_face_merge(s, tol, 1, &RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(s, tol, 1, &rtg_vlfree);
/* free mem */
bu_free((char *)outfaceuses, "faceuse []");
@@ -1578,7 +1578,7 @@
bu_free((char *)vells, "vertex [][]");
/* Assign vertexuse normals */
- nmg_vertex_tabulate(&vert_tab, &s->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&vert_tab, &s->l.magic, &rtg_vlfree);
for (i = 0; i < BU_PTBL_LEN(&vert_tab); i++) {
point_t pt_prime, tmp_pt;
vect_t norm, rev_norm, tmp_vect;
Modified: brlcad/branches/bioh/src/librt/primitives/epa/epa.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/epa/epa.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/epa/epa.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -1421,7 +1421,7 @@
}
/* Mark the edges of this face as real, this is the only real edge */
- (void)nmg_mark_edges_real(&outfaceuses[0]->l.magic, &RTG.rtg_vlfree);
+ (void)nmg_mark_edges_real(&outfaceuses[0]->l.magic, &rtg_vlfree);
/* connect ellipses with triangles */
for (i = nell-2; i >= 0; i--) {
@@ -1575,13 +1575,13 @@
}
/* Glue the edges of different outward pointing face uses together */
- nmg_gluefaces(outfaceuses, face, &RTG.rtg_vlfree, tol);
+ nmg_gluefaces(outfaceuses, face, &rtg_vlfree, tol);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
/* XXX just for testing, to make up for loads of triangles ... */
- nmg_shell_coplanar_face_merge(s, tol, 1, &RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(s, tol, 1, &rtg_vlfree);
/* free mem */
bu_free((char *)outfaceuses, "faceuse []");
Modified: brlcad/branches/bioh/src/librt/primitives/extrude/extrude.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/extrude/extrude.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/extrude/extrude.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -2199,8 +2199,8 @@
}
BU_LIST_INIT(&vhead);
- if (!BU_LIST_IS_INITIALIZED(&RTG.rtg_vlfree)) {
- BU_LIST_INIT(&RTG.rtg_vlfree);
+ if (!BU_LIST_IS_INITIALIZED(&rtg_vlfree)) {
+ BU_LIST_INIT(&rtg_vlfree);
}
for (i = 0; outer_loop && i<(size_t)BU_PTBL_LEN(outer_loop); i++) {
void *seg;
@@ -2238,11 +2238,11 @@
}
}
}
- BN_FREE_VLIST(&RTG.rtg_vlfree, &vhead);
+ BN_FREE_VLIST(&rtg_vlfree, &vhead);
/* make sure face normal is in correct direction */
bu_free((char *)verts, "verts");
- if (nmg_calc_face_plane(fu, pl, &RTG.rtg_vlfree)) {
+ if (nmg_calc_face_plane(fu, pl, &rtg_vlfree)) {
bu_log("Failed to calculate face plane for extrusion\n");
return -1;
}
@@ -2330,7 +2330,7 @@
}
/* extrude this face */
- if (nmg_extrude_face(fu, extrude_ip->h, &RTG.rtg_vlfree, tol)) {
+ if (nmg_extrude_face(fu, extrude_ip->h, &rtg_vlfree, tol)) {
bu_log("Failed to extrude face sketch\n");
return -1;
}
Modified: brlcad/branches/bioh/src/librt/primitives/hyp/hyp.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/hyp/hyp.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/hyp/hyp.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -1088,13 +1088,13 @@
}
/* Glue the edges of different outward pointing face uses together */
- nmg_gluefaces(outfaceuses, face, &RTG.rtg_vlfree, tol);
+ nmg_gluefaces(outfaceuses, face, &rtg_vlfree, tol);
/* Compute "geometry" for region and shell */
nmg_region_a(*r, tol);
/* XXX just for testing, to make up for loads of triangles ... */
- nmg_shell_coplanar_face_merge(s, tol, 1, &RTG.rtg_vlfree);
+ nmg_shell_coplanar_face_merge(s, tol, 1, &rtg_vlfree);
/* free mem */
if (outfaceuses)
@@ -1111,7 +1111,7 @@
bu_free((char *)vells, "vertex [][]");
/* Assign vertexuse normals */
- nmg_vertex_tabulate(&vert_tab, &s->l.magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&vert_tab, &s->l.magic, &rtg_vlfree);
for (i = 0; i < BU_PTBL_LEN(&vert_tab); i++) {
point_t pt_prime, tmp_pt;
vect_t norm, rev_norm, tmp_vect;
Modified: brlcad/branches/bioh/src/librt/primitives/metaball/metaball_tri.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/metaball/metaball_tri.c
2020-08-02 20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/metaball/metaball_tri.c
2020-08-02 21:10:40 UTC (rev 76649)
@@ -162,10 +162,10 @@
}
}
- nmg_mark_edges_real(&s->l.magic, &RTG.rtg_vlfree);
+ nmg_mark_edges_real(&s->l.magic, &rtg_vlfree);
nmg_region_a(*r, tol);
- nmg_model_fuse(m, &RTG.rtg_vlfree, tol);
+ nmg_model_fuse(m, &rtg_vlfree, tol);
rt_get_timer(×, NULL);
bu_log("metaball tessellate (%d triangles): %s\n", numtri,
bu_vls_addr(×));
Modified: brlcad/branches/bioh/src/librt/primitives/nmg/nmg.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/nmg/nmg.c 2020-08-02 20:58:40 UTC
(rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/nmg/nmg.c 2020-08-02 21:10:40 UTC
(rev 76649)
@@ -1386,10 +1386,10 @@
rd.magic = NMG_RAY_DATA_MAGIC;
/* intersect the ray with the geometry (sets surfno) */
- nmg_isect_ray_model((struct nmg_ray_data *)&rd,&RTG.rtg_vlfree);
+ nmg_isect_ray_model((struct nmg_ray_data *)&rd,&rtg_vlfree);
/* build the sebgent lists */
- status = nmg_ray_segs(&rd,&RTG.rtg_vlfree);
+ status = nmg_ray_segs(&rd,&rtg_vlfree);
/* free the hitmiss table */
bu_free((char *)rd.hitmiss, "free nmg geom hit list");
@@ -1473,7 +1473,7 @@
m = (struct model *)ip->idb_ptr;
NMG_CK_MODEL(m);
- nmg_m_to_vlist(vhead, m, 0, &RTG.rtg_vlfree);
+ nmg_m_to_vlist(vhead, m, 0, &rtg_vlfree);
return 0;
}
@@ -3959,7 +3959,7 @@
if (attr == (char *)NULL) {
bu_vls_strcpy(logstr, "nmg");
bu_ptbl_init(&verts, 256, "nmg verts");
- nmg_vertex_tabulate(&verts, &m->magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &m->magic, &rtg_vlfree);
/* first list all the vertices */
bu_vls_strcat(logstr, " V {");
@@ -4025,7 +4025,7 @@
/* list of vertices */
bu_ptbl_init(&verts, 256, "nmg verts");
- nmg_vertex_tabulate(&verts, &m->magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&verts, &m->magic, &rtg_vlfree);
for (i=0; i<BU_PTBL_LEN(&verts); i++) {
v = (struct vertex *) BU_PTBL_GET(&verts, i);
NMG_CK_VERTEX(v);
@@ -4181,7 +4181,7 @@
for (BU_LIST_FOR (fu, faceuse, &s->fu_hd)) {
if (fu->orientation != OT_SAME)
continue;
- nmg_calc_face_g(fu,&RTG.rtg_vlfree);
+ nmg_calc_face_g(fu,&rtg_vlfree);
}
}
@@ -4241,7 +4241,7 @@
size_t *npts;
point_t **tmp_pts;
plane_t *eqs;
- nmg_face_tabulate(&nmg_faces, &s->l.magic, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&nmg_faces, &s->l.magic, &rtg_vlfree);
num_faces = BU_PTBL_LEN(&nmg_faces);
tmp_pts = (point_t **)bu_calloc(num_faces, sizeof(point_t *),
"rt_nmg_faces_area: tmp_pts");
npts = (size_t *)bu_calloc(num_faces, sizeof(size_t), "rt_nmg_faces_area:
npts");
@@ -4284,7 +4284,7 @@
struct poly_face *faces;
/*get faces of this shell*/
- nmg_face_tabulate(&nmg_faces, &s->l.magic, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&nmg_faces, &s->l.magic, &rtg_vlfree);
num_faces = BU_PTBL_LEN(&nmg_faces);
faces = (struct poly_face *)bu_calloc(num_faces, sizeof(struct
poly_face), "rt_nmg_surf_area: faces");
@@ -4325,7 +4325,7 @@
s = BU_LIST_FIRST(shell, &r->s_hd);
/*get faces*/
- nmg_face_tabulate(&nmg_faces, &s->l.magic, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&nmg_faces, &s->l.magic, &rtg_vlfree);
num_faces = BU_PTBL_LEN(&nmg_faces);
faces = (struct poly_face *)bu_calloc(num_faces, sizeof(struct poly_face),
"rt_nmg_centroid: faces");
@@ -4385,7 +4385,7 @@
struct poly_face *faces;
/*get faces of this shell*/
- nmg_face_tabulate(&nmg_faces, &s->l.magic, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&nmg_faces, &s->l.magic, &rtg_vlfree);
num_faces = BU_PTBL_LEN(&nmg_faces);
faces = (struct poly_face *)bu_calloc(num_faces, sizeof(struct
poly_face), "rt_nmg_volume: faces");
@@ -5213,7 +5213,7 @@
if (BU_LIST_NEXT_NOT_HEAD(&s->l, &r->s_hd))
return 0;
- switch (Shell_is_arb(s, &tab, &RTG.rtg_vlfree)) {
+ switch (Shell_is_arb(s, &tab, &rtg_vlfree)) {
case 0:
ret_val = 0;
break;
Modified: brlcad/branches/bioh/src/librt/primitives/nmg/nmg_mirror.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/nmg/nmg_mirror.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/nmg/nmg_mirror.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -89,7 +89,7 @@
mirmat[3 + Z*4] += mirror_pt[Z] * mirror_dir[Z];
/* move every vertex */
- nmg_vertex_tabulate(&table, &nmg->magic, &RTG.rtg_vlfree);
+ nmg_vertex_tabulate(&table, &nmg->magic, &rtg_vlfree);
for (i=0; i<BU_PTBL_LEN(&table); i++) {
point_t pt;
@@ -102,7 +102,7 @@
bu_ptbl_reset(&table);
- nmg_face_tabulate(&table, &nmg->magic, &RTG.rtg_vlfree);
+ nmg_face_tabulate(&table, &nmg->magic, &rtg_vlfree);
for (i=0; i<BU_PTBL_LEN(&table); i++) {
struct face *f;
@@ -143,7 +143,7 @@
return 2;
}
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
bu_log("ERROR: Unable to calculate NMG faces for mirroring\n");
bu_ptbl_free(&table);
return 3;
Modified: brlcad/branches/bioh/src/librt/primitives/nmg/nmg_tri_mc.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/nmg/nmg_tri_mc.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/nmg/nmg_tri_mc.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -434,7 +434,7 @@
nmg_vertex_gv(vertl[0], edges[vi[0]]);
nmg_vertex_gv(vertl[1], edges[vi[1]]);
nmg_vertex_gv(vertl[2], edges[vi[2]]);
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
/* this flips out and spins. */
bu_log("Face calc failed\n");
nmg_kfu(fu);
Modified: brlcad/branches/bioh/src/librt/primitives/pipe/pipe.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/pipe/pipe.c 2020-08-02
20:58:40 UTC (rev 76648)
+++ brlcad/branches/bioh/src/librt/primitives/pipe/pipe.c 2020-08-02
21:10:40 UTC (rev 76649)
@@ -2491,7 +2491,7 @@
nmg_vertex_gv(vu->v_p, pipe_pnt->pp_coord);
}
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
bu_bomb("tesselate_pipe_start: nmg_calc_face_g failed\n");
}
@@ -2587,7 +2587,7 @@
if (fu_prev) {
nmg_vertex_gv(new_outer_loop[i], pt);
- if (nmg_calc_face_g(fu_prev,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu_prev,&rtg_vlfree)) {
bu_log("tesselate_pipe_linear: nmg_calc_face_g failed\n");
nmg_kfu(fu_prev);
} else {
@@ -2645,7 +2645,7 @@
nmg_vertex_gv(new_outer_loop[i], pt);
}
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
bu_log("tesselate_pipe_linear: nmg_calc_face_g failed\n");
nmg_kfu(fu);
} else {
@@ -2698,7 +2698,7 @@
continue;
}
if (i == arc_segs - 1) {
- if (nmg_calc_face_g(fu_prev,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu_prev,&rtg_vlfree)) {
bu_log("tesselate_pipe_linear: nmg_calc_face_g failed\n");
nmg_kfu(fu_prev);
}
@@ -2737,7 +2737,7 @@
VUNITIZE(norms[j]);
}
- if (nmg_calc_face_g(fu,&RTG.rtg_vlfree)) {
+ if (nmg_calc_face_g(fu,&rtg_vlfree)) {
bu_log("tesselate_pipe_linear: nmg_calc_face_g failed\n");
nmg_kfu(fu);
} else {
@@ -2825,7 +2825,7 @@
@@ Diff output truncated at 100000 characters. @@
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
