Revision: 53749
http://brlcad.svn.sourceforge.net/brlcad/?rev=53749&view=rev
Author: r_weiss
Date: 2012-11-19 17:45:54 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Renamed function "nmg_model_break_e_on_v" to "nmg_break_e_on_v" and changed the
function to process any NMG object, not just an model structure. Changed all
references to this function. Updated files "raytrace.h", "bot_fuse.c",
"euclid-g.c", "jack-g.c", "nmg_fuse.c" and "nmg_bool.c".
Modified Paths:
--------------
brlcad/trunk/include/raytrace.h
brlcad/trunk/src/conv/euclid/euclid-g.c
brlcad/trunk/src/conv/jack/jack-g.c
brlcad/trunk/src/libged/bot_fuse.c
brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c
brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
Modified: brlcad/trunk/include/raytrace.h
===================================================================
--- brlcad/trunk/include/raytrace.h 2012-11-19 17:35:27 UTC (rev 53748)
+++ brlcad/trunk/include/raytrace.h 2012-11-19 17:45:54 UTC (rev 53749)
@@ -5167,8 +5167,8 @@
RT_EXPORT extern int nmg_break_all_es_on_v(uint32_t *magic_p,
struct vertex *v,
const struct bn_tol *tol);
-RT_EXPORT extern int nmg_model_break_e_on_v(struct model *m,
- const struct bn_tol *tol);
+RT_EXPORT extern int nmg_break_e_on_v(const uint32_t *magic_p,
+ const struct bn_tol *tol);
RT_EXPORT extern int nmg_model_fuse(struct model *m,
const struct bn_tol *tol);
Modified: brlcad/trunk/src/conv/euclid/euclid-g.c
===================================================================
--- brlcad/trunk/src/conv/euclid/euclid-g.c 2012-11-19 17:35:27 UTC (rev
53748)
+++ brlcad/trunk/src/conv/euclid/euclid-g.c 2012-11-19 17:45:54 UTC (rev
53749)
@@ -560,8 +560,8 @@
/* Break edges on vertices */
if ( debug )
- bu_log( "Calling nmg_model_break_e_on_v()\n" );
- (void)nmg_model_break_e_on_v( m, &tol );
+ bu_log( "Calling nmg_break_e_on_v()\n" );
+ (void)nmg_break_e_on_v( &m->magic, &tol );
/* kill zero length edgeuses */
if ( nmg_kill_zero_length_edgeuses( m ) )
Modified: brlcad/trunk/src/conv/jack/jack-g.c
===================================================================
--- brlcad/trunk/src/conv/jack/jack-g.c 2012-11-19 17:35:27 UTC (rev 53748)
+++ brlcad/trunk/src/conv/jack/jack-g.c 2012-11-19 17:45:54 UTC (rev 53749)
@@ -301,7 +301,7 @@
/* Compute "geometry" for region and shell */
nmg_region_a(r, &tol);
- nmg_model_break_e_on_v(m, &tol);
+ nmg_break_e_on_v(&m->magic, &tol);
empty_model = nmg_kill_zero_length_edgeuses(m);
/* Glue edges of outward pointing face uses together. */
Modified: brlcad/trunk/src/libged/bot_fuse.c
===================================================================
--- brlcad/trunk/src/libged/bot_fuse.c 2012-11-19 17:35:27 UTC (rev 53748)
+++ brlcad/trunk/src/libged/bot_fuse.c 2012-11-19 17:45:54 UTC (rev 53749)
@@ -238,8 +238,8 @@
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_model_break_e_on_v\n", argv[0]);
- count = nmg_model_break_e_on_v(m, tol);
+ bu_log("%s: running nmg_break_e_on_v\n", argv[0]);
+ count = nmg_break_e_on_v(&m->magic, tol);
total += count;
bu_log("%s: %s, %d broke 'e' on 'v'\n", argv[0], argv[i+1], count);
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c 2012-11-19 17:35:27 UTC
(rev 53748)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c 2012-11-19 17:45:54 UTC
(rev 53749)
@@ -851,7 +851,7 @@
(void)nmg_simplify_shell_edges(sA, tol);
(void)nmg_simplify_shell_edges(sB, tol);
- (void)nmg_model_break_e_on_v(m, tol);
+ (void)nmg_break_e_on_v(&m->magic, tol);
(void)nmg_edge_fuse(&m->magic, tol);
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2012-11-19 17:35:27 UTC
(rev 53748)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2012-11-19 17:45:54 UTC
(rev 53749)
@@ -1820,7 +1820,7 @@
/**
- * N M G _ M O D E L _ B R E A K _ E _ O N _ V
+ * N M G _ B R E A K _ E _ O N _ V
*
* As the first step in evaluating a boolean formula,
* before starting to do face/face intersections, compare every
@@ -1837,7 +1837,7 @@
* Number of edges broken.
*/
int
-nmg_model_break_e_on_v(struct model *m, const struct bn_tol *tol)
+nmg_break_e_on_v(const uint32_t *magic_p, const struct bn_tol *tol)
{
int count = 0;
struct bu_ptbl verts;
@@ -1846,10 +1846,9 @@
register struct edgeuse **eup;
vect_t e_min_pt, e_max_pt;
- NMG_CK_MODEL(m);
BN_CK_TOL(tol);
- nmg_e_and_v_tabulate(&edgeuses, &verts, &m->magic);
+ nmg_e_and_v_tabulate(&edgeuses, &verts, magic_p);
/* Repeat the process until no new edgeuses are created */
while (BU_PTBL_LEN(&edgeuses) > 0) {
@@ -1901,12 +1900,12 @@
if (code < 1) continue; /* missed */
if (code == 1 || code == 2) {
- bu_log("nmg_model_break_e_on_v() code=%d, why wasn't this
vertex fused?\n", code);
+ bu_log("nmg_break_e_on_v() code=%d, why wasn't this vertex
fused?\n", code);
continue;
}
if (rt_g.NMG_debug & (DEBUG_BOOL|DEBUG_BASIC))
- bu_log("nmg_model_break_e_on_v(): breaking eu x%x (e=x%x)
at vertex x%x\n", eu, eu->e_p, v);
+ bu_log("nmg_break_e_on_v(): breaking eu x%x (e=x%x) at
vertex x%x\n", eu, eu->e_p, v);
/* Break edge on vertex, but don't fuse yet. */
new_eu = nmg_ebreak(v, eu);
@@ -1924,7 +1923,7 @@
bu_ptbl_free(&edgeuses);
bu_ptbl_free(&verts);
if (rt_g.NMG_debug & (DEBUG_BOOL|DEBUG_BASIC))
- bu_log("nmg_model_break_e_on_v() broke %d edges\n", count);
+ bu_log("nmg_break_e_on_v() broke %d edges\n", count);
return count;
}
@@ -1973,7 +1972,7 @@
/* Step 1.5 -- break edges on vertices, before fusing edges */
if (rt_g.NMG_debug & DEBUG_BASIC)
bu_log("nmg_model_fuse: break edges\n");
- total += nmg_model_break_e_on_v(m, tol);
+ total += nmg_break_e_on_v(&m->magic, tol);
if (total) {
struct nmgregion *r;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
