Revision: 69026
http://sourceforge.net/p/brlcad/code/69026
Author: starseeker
Date: 2016-10-11 20:38:19 +0000 (Tue, 11 Oct 2016)
Log Message:
-----------
rename some of the old nurbs functions to use the nmg prefix. this covers the
ones used by the iges converter.
Modified Paths:
--------------
brlcad/trunk/CHANGES
brlcad/trunk/include/rt/nurb.h
brlcad/trunk/src/conv/dxf/dxf-g.c
brlcad/trunk/src/conv/iges/get_cnurb_curve.c
brlcad/trunk/src/conv/iges/make_nurb_face.c
brlcad/trunk/src/conv/iges/spline.c
brlcad/trunk/src/conv/iges/trimsurf.c
brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c
brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c
brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c
brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c
brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c
brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c
brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c
brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c
brlcad/trunk/src/librt/primitives/bspline/nurb_split.c
brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c
brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c
brlcad/trunk/src/librt/primitives/bspline/nurb_util.c
brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c
brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c
brlcad/trunk/src/librt/primitives/tgc/tgc.c
brlcad/trunk/src/proc-db/spltest.c
brlcad/trunk/src/proc-db/tea.c
brlcad/trunk/src/proc-db/tube.c
Modified: brlcad/trunk/CHANGES
===================================================================
--- brlcad/trunk/CHANGES 2016-10-11 20:03:54 UTC (rev 69025)
+++ brlcad/trunk/CHANGES 2016-10-11 20:38:19 UTC (rev 69026)
@@ -1218,7 +1218,16 @@
s/(#[[:space:]]*include[[:space:]]+["<])bu\/rb\.h/\1bu\/redblack.h/g
clearer header name [7.26]
s/rt_plot_vlblock/bn_plot_vlblock/g
- move function to libbn [7.26]
s/rt_vlist_to_uplot/bn_vlist_to_uplot/g
- move function to libbn [7.26]
-
+ move vlist functions to libbn [7.26]
+s/rt_nurb_bezier/nmg_nurb_bezier/g
+s/rt_nurb_c_split/nmg_nurb_c_split/g
+s/rt_nurb_free_cnurb/nmg_nurb_free_cnurb/g
+s/rt_nurb_free_snurb/nmg_nurb_free_snurb/g
+s/rt_nurb_intersect/nmg_nurb_intersect/g
+s/rt_nurb_new_cnurb/nmg_nurb_new_cnurb/g
+s/rt_nurb_new_snurb/nmg_nurb_new_snurb/g
+s/rt_nurb_s_eval/nmg_nurb_s_eval/g
+s/rt_nurb_s_norm/nmg_nurb_s_norm/g
+s/rt_nurb_uv_hit/nmg_nurb_uv_hit/g
+ rename old nurbs functions intertwined with nmg to use nmg prefix
[7.26]
Modified: brlcad/trunk/include/rt/nurb.h
===================================================================
--- brlcad/trunk/include/rt/nurb.h 2016-10-11 20:03:54 UTC (rev 69025)
+++ brlcad/trunk/include/rt/nurb.h 2016-10-11 20:38:19 UTC (rev 69026)
@@ -105,8 +105,8 @@
fastf_t uv[3][2]; /**< @brief U, V parametric values */
};
-struct rt_nurb_uv_hit {
- struct rt_nurb_uv_hit * next;
+struct nmg_nurb_uv_hit {
+ struct nmg_nurb_uv_hit * next;
int sub;
fastf_t u;
fastf_t v;
@@ -134,7 +134,7 @@
int order, fastf_t mu);
/* nurb_bezier.c */
-RT_EXPORT extern int rt_nurb_bezier(struct bu_list *bezier_hd, const struct
face_g_snurb * srf, struct resource *res);
+RT_EXPORT extern int nmg_nurb_bezier(struct bu_list *bezier_hd, const struct
face_g_snurb * srf, struct resource *res);
RT_EXPORT extern int rt_bez_check(const struct face_g_snurb * srf);
RT_EXPORT extern int nurb_crv_is_bezier(const struct edge_g_cnurb *crv);
RT_EXPORT extern void nurb_c_to_bezier(struct bu_list *clist, struct
edge_g_cnurb *crv);
@@ -158,7 +158,7 @@
int o_size, int pt_type);
/* nurb_eval.c */
-RT_EXPORT extern void rt_nurb_s_eval(const struct face_g_snurb *srf, fastf_t
u, fastf_t v, fastf_t * final_value);
+RT_EXPORT extern void nmg_nurb_s_eval(const struct face_g_snurb *srf, fastf_t
u, fastf_t v, fastf_t * final_value);
RT_EXPORT extern void rt_nurb_c_eval(const struct edge_g_cnurb *crv, fastf_t
param, fastf_t * final_value);
RT_EXPORT extern fastf_t *rt_nurb_eval_crv(fastf_t *crv, int order,
fastf_t param,
@@ -192,7 +192,7 @@
int order, fastf_t lower,
fastf_t upper, struct resource *res);
/* nurb_norm.c */
-RT_EXPORT extern void rt_nurb_s_norm(struct face_g_snurb *srf, fastf_t u,
fastf_t v, fastf_t * norm);
+RT_EXPORT extern void nmg_nurb_s_norm(struct face_g_snurb *srf, fastf_t u,
fastf_t v, fastf_t * norm);
/* nurb_c2.c */
RT_EXPORT extern void rt_nurb_curvature(struct curvature *cvp,
@@ -221,7 +221,7 @@
int dir, fastf_t *min, fastf_t
*max);
RT_EXPORT extern struct face_g_snurb *rt_nurb_region_from_srf(const struct
face_g_snurb *srf,
int dir,
fastf_t param1, fastf_t param2, struct resource *res);
-RT_EXPORT extern struct rt_nurb_uv_hit *rt_nurb_intersect(const struct
face_g_snurb * srf,
+RT_EXPORT extern struct nmg_nurb_uv_hit *nmg_nurb_intersect(const struct
face_g_snurb * srf,
plane_t plane1,
plane_t plane2, double uv_tol, struct resource *res, struct bu_list *plist);
/* nurb_refine.c */
@@ -244,19 +244,19 @@
/* nurb_split.c */
RT_EXPORT extern void rt_nurb_s_split(struct bu_list *split_hd, const struct
face_g_snurb *srf,
int dir, struct resource *res);
-RT_EXPORT extern void rt_nurb_c_split(struct bu_list *split_hd, const struct
edge_g_cnurb *crv);
+RT_EXPORT extern void nmg_nurb_c_split(struct bu_list *split_hd, const struct
edge_g_cnurb *crv);
/* nurb_trim.c */
RT_EXPORT extern int nmg_uv_in_lu(const fastf_t u, const fastf_t v, const
struct loopuse *lu);
/* nurb_util.c */
-RT_EXPORT extern struct face_g_snurb *rt_nurb_new_snurb(int u_order, int
v_order,
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_new_snurb(int u_order, int
v_order,
int n_u_knots, int
n_v_knots,
int n_rows, int
n_cols, int pt_type, struct resource *res);
-RT_EXPORT extern struct edge_g_cnurb *rt_nurb_new_cnurb(int order, int n_knots,
+RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_new_cnurb(int order, int
n_knots,
int n_pts, int
pt_type);
-RT_EXPORT extern void rt_nurb_free_snurb(struct face_g_snurb *srf, struct
resource *res);
-RT_EXPORT extern void rt_nurb_free_cnurb(struct edge_g_cnurb * crv);
+RT_EXPORT extern void nmg_nurb_free_snurb(struct face_g_snurb *srf, struct
resource *res);
+RT_EXPORT extern void nmg_nurb_free_cnurb(struct edge_g_cnurb * crv);
RT_EXPORT extern void rt_nurb_c_print(const struct edge_g_cnurb *crv);
RT_EXPORT extern void rt_nurb_s_print(char *c, const struct face_g_snurb *srf);
RT_EXPORT extern void rt_nurb_pr_kv(const struct knot_vector *kv);
Modified: brlcad/trunk/src/conv/dxf/dxf-g.c
===================================================================
--- brlcad/trunk/src/conv/dxf/dxf-g.c 2016-10-11 20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/conv/dxf/dxf-g.c 2016-10-11 20:38:19 UTC (rev 69026)
@@ -2824,7 +2824,7 @@
ncoords = 3;
pt_type = RT_NURB_MAKE_PT_TYPE(ncoords, RT_NURB_PT_XYZ,
RT_NURB_PT_NONRAT);
}
- crv = rt_nurb_new_cnurb(degree+1, numCtlPts+degree+1, numCtlPts,
pt_type);
+ crv = nmg_nurb_new_cnurb(degree+1, numCtlPts+degree+1, numCtlPts,
pt_type);
for (i = 0; i < numKnots; i++) {
crv->k.knots[i] = knots[i];
@@ -2859,7 +2859,7 @@
v2 = NULL;
}
- rt_nurb_free_cnurb(crv);
+ nmg_nurb_free_cnurb(crv);
if (knots != NULL) bu_free(knots, "spline knots");
if (weights != NULL) bu_free(weights, "spline weights");
Modified: brlcad/trunk/src/conv/iges/get_cnurb_curve.c
===================================================================
--- brlcad/trunk/src/conv/iges/get_cnurb_curve.c 2016-10-11 20:03:54 UTC
(rev 69025)
+++ brlcad/trunk/src/conv/iges/get_cnurb_curve.c 2016-10-11 20:38:19 UTC
(rev 69026)
@@ -66,7 +66,7 @@
pt_type = RT_NURB_MAKE_PT_TYPE(3, 3, 1);
/* make a linear edge_g_cnurb (order=2) */
- crv = rt_nurb_new_cnurb(2, 4, 2, pt_type);
+ crv = nmg_nurb_new_cnurb(2, 4, 2, pt_type);
/* insert control mesh */
VMOVE(crv->ctl_points, start_pt);
Modified: brlcad/trunk/src/conv/iges/make_nurb_face.c
===================================================================
--- brlcad/trunk/src/conv/iges/make_nurb_face.c 2016-10-11 20:03:54 UTC (rev
69025)
+++ brlcad/trunk/src/conv/iges/make_nurb_face.c 2016-10-11 20:38:19 UTC (rev
69026)
@@ -203,10 +203,10 @@
/* evaluate srf at the parameter values for v2 to get geometry
*/
if (RT_NURB_EXTRACT_PT_TYPE(crv->pt_type) == RT_NURB_PT_UV &&
RT_NURB_IS_PT_RATIONAL(crv->pt_type)) {
- rt_nurb_s_eval(srf, end_uv[0]/end_uv[2],
+ nmg_nurb_s_eval(srf, end_uv[0]/end_uv[2],
end_uv[1]/end_uv[2], pt_on_srf);
} else if (coords == 2)
- rt_nurb_s_eval(srf, end_uv[0], end_uv[1], pt_on_srf);
+ nmg_nurb_s_eval(srf, end_uv[0], end_uv[1], pt_on_srf);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
fastf_t sca;
@@ -230,7 +230,7 @@
new_eu = nmg_esplit(v2, eu, 0);
/* split the curve */
- rt_nurb_c_split(&split_hd, crv);
+ nmg_nurb_c_split(&split_hd, crv);
crv1 = BU_LIST_FIRST(edge_g_cnurb, &split_hd);
crv2 = BU_LIST_LAST(edge_g_cnurb, &split_hd);
@@ -240,12 +240,12 @@
VMOVE(end_uv, &crv1->ctl_points[(crv1->c_size-1)*coords]);
if (RT_NURB_EXTRACT_PT_TYPE(crv1->pt_type) == RT_NURB_PT_UV &&
RT_NURB_IS_PT_RATIONAL(crv1->pt_type)) {
- rt_nurb_s_eval(srf, end_uv[0]/end_uv[2],
+ nmg_nurb_s_eval(srf, end_uv[0]/end_uv[2],
end_uv[1]/end_uv[2], pt_on_srf);
} else {
start_uv[2] = 1.0;
end_uv[2] = 1.0;
- rt_nurb_s_eval(srf, end_uv[0], end_uv[1], pt_on_srf);
+ nmg_nurb_s_eval(srf, end_uv[0], end_uv[1], pt_on_srf);
}
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
@@ -270,12 +270,12 @@
VMOVE(end_uv, &crv2->ctl_points[(crv2->c_size-1)*coords]);
if (RT_NURB_EXTRACT_PT_TYPE(crv2->pt_type) == RT_NURB_PT_UV &&
RT_NURB_IS_PT_RATIONAL(crv2->pt_type)) {
- rt_nurb_s_eval(srf, start_uv[0]/start_uv[2],
+ nmg_nurb_s_eval(srf, start_uv[0]/start_uv[2],
start_uv[1]/start_uv[2], pt_on_srf);
} else {
start_uv[2] = 1.0;
end_uv[2] = 1.0;
- rt_nurb_s_eval(srf, start_uv[0], start_uv[1], pt_on_srf);
+ nmg_nurb_s_eval(srf, start_uv[0], start_uv[1], pt_on_srf);
}
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
Modified: brlcad/trunk/src/conv/iges/spline.c
===================================================================
--- brlcad/trunk/src/conv/iges/spline.c 2016-10-11 20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/conv/iges/spline.c 2016-10-11 20:38:19 UTC (rev 69026)
@@ -83,7 +83,7 @@
point_size = 3;
}
- (*b_patch) = rt_nurb_new_snurb(
+ (*b_patch) = nmg_nurb_new_snurb(
m1+1, m2+1,
n1+2*m1+1, n2+2*m2+1,
k2+1, k1+1,
Modified: brlcad/trunk/src/conv/iges/trimsurf.c
===================================================================
--- brlcad/trunk/src/conv/iges/trimsurf.c 2016-10-11 20:03:54 UTC (rev
69025)
+++ brlcad/trunk/src/conv/iges/trimsurf.c 2016-10-11 20:38:19 UTC (rev
69026)
@@ -97,7 +97,7 @@
n_u = n_cols+u_order;
n_v = n_rows+v_order;
if (!m) {
- srf = rt_nurb_new_snurb(u_order, v_order, n_u, n_v, n_rows, n_cols,
pt_type, (struct resource *)NULL);
+ srf = nmg_nurb_new_snurb(u_order, v_order, n_u, n_v, n_rows, n_cols,
pt_type, (struct resource *)NULL);
} else {
int pnum;
@@ -271,7 +271,7 @@
pt_type = RT_NURB_MAKE_PT_TYPE(ncoords, RT_NURB_PT_UV,
RT_NURB_PT_NONRAT);
}
- crv = rt_nurb_new_cnurb(degree+1, num_pts+degree+1, num_pts, pt_type);
+ crv = nmg_nurb_new_cnurb(degree+1, num_pts+degree+1, num_pts, pt_type);
/* knot vector */
for (i = 0; i < num_pts+degree+1; i++) {
Readdbl(&a, "");
@@ -336,7 +336,7 @@
moved = 1;
}
- rt_nurb_s_eval(srf, u, v, pt_on_srf);
+ nmg_nurb_s_eval(srf, u, v, pt_on_srf);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
fastf_t sca;
@@ -482,7 +482,7 @@
/* Assign edge geometry */
Assign_cnurb_to_eu(eu, crv);
- rt_nurb_free_cnurb(crv);
+ nmg_nurb_free_cnurb(crv);
}
break;
@@ -514,7 +514,7 @@
/* Assign edge geometry */
Assign_cnurb_to_eu(eu, crv);
- rt_nurb_free_cnurb(crv);
+ nmg_nurb_free_cnurb(crv);
break;
default:
bu_log("Curves of type %d are not yet handled for trimmed
surfaces\n", entity_type);
@@ -606,7 +606,7 @@
/* split circle into two pieces */
BU_LIST_INIT(&curv_hd);
- rt_nurb_c_split(&curv_hd, crv);
+ nmg_nurb_c_split(&curv_hd, crv);
crv1 = BU_LIST_FIRST(edge_g_cnurb, &curv_hd);
crv2 = BU_LIST_LAST(edge_g_cnurb, &curv_hd);
@@ -634,9 +634,9 @@
Assign_cnurb_to_eu(eu, crv1);
Assign_cnurb_to_eu(new_eu, crv2);
- rt_nurb_free_cnurb(crv);
- rt_nurb_free_cnurb(crv1);
- rt_nurb_free_cnurb(crv2);
+ nmg_nurb_free_cnurb(crv);
+ nmg_nurb_free_cnurb(crv1);
+ nmg_nurb_free_cnurb(crv2);
}
break;
@@ -657,7 +657,7 @@
/* split circle into two pieces */
BU_LIST_INIT(&curv_hd);
- rt_nurb_c_split(&curv_hd, crv);
+ nmg_nurb_c_split(&curv_hd, crv);
crv1 = BU_LIST_FIRST(edge_g_cnurb, &curv_hd);
crv2 = BU_LIST_LAST(edge_g_cnurb, &curv_hd);
/* Split last edge in loop */
@@ -695,9 +695,9 @@
Assign_cnurb_to_eu(eu, crv1);
Assign_cnurb_to_eu(new_eu, crv2);
- rt_nurb_free_cnurb(crv);
- rt_nurb_free_cnurb(crv1);
- rt_nurb_free_cnurb(crv2);
+ nmg_nurb_free_cnurb(crv);
+ nmg_nurb_free_cnurb(crv1);
+ nmg_nurb_free_cnurb(crv2);
}
break;
default:
@@ -1092,18 +1092,18 @@
BU_LIST_INIT(&bezier);
- rt_nurb_bezier(&bezier, fg, (struct resource *)NULL);
+ nmg_nurb_bezier(&bezier, fg, (struct resource *)NULL);
while (BU_LIST_NON_EMPTY(&bezier)) {
struct face_g_snurb *srf;
- struct rt_nurb_uv_hit *hp;
+ struct nmg_nurb_uv_hit *hp;
srf = BU_LIST_FIRST(face_g_snurb, &bezier);
BU_LIST_DEQUEUE(&srf->l);
- hp = rt_nurb_intersect(srf, pl1, pl2, UV_TOL, (struct resource *)NULL,
NULL);
+ hp = nmg_nurb_intersect(srf, pl1, pl2, UV_TOL, (struct resource *)NULL,
NULL);
/* process each hit point */
- while (hp != (struct rt_nurb_uv_hit *)NULL) {
- struct rt_nurb_uv_hit *next;
+ while (hp != (struct nmg_nurb_uv_hit *)NULL) {
+ struct nmg_nurb_uv_hit *next;
struct snurb_hit *myhit;
vect_t to_hit;
fastf_t homo_hit[4];
@@ -1130,7 +1130,7 @@
myhit->f = f;
/* calculate actual hit point (x y z) */
- rt_nurb_s_eval(srf, hp->u, hp->v, homo_hit);
+ nmg_nurb_s_eval(srf, hp->u, hp->v, homo_hit);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
fastf_t inv_homo;
@@ -1144,7 +1144,7 @@
myhit->dist = VDOT(to_hit, ray_dir);
/* get surface normal */
- rt_nurb_s_norm(srf, hp->u, hp->v, myhit->norm);
+ nmg_nurb_s_norm(srf, hp->u, hp->v, myhit->norm);
/* may need to reverse it */
if (f->flip) {
@@ -1171,7 +1171,7 @@
bu_free((char *)hp, "nurb_uv_hit");
hp = next;
}
- rt_nurb_free_snurb(srf, (struct resource *)NULL);
+ nmg_nurb_free_snurb(srf, (struct resource *)NULL);
}
}
@@ -1327,7 +1327,7 @@
return 1;
/* calculate actual hit point (x y z) */
- rt_nurb_s_eval(fg, u, v, homo_hit);
+ nmg_nurb_s_eval(fg, u, v, homo_hit);
if (RT_NURB_IS_PT_RATIONAL(fg->pt_type)) {
fastf_t inv_homo;
@@ -1338,7 +1338,7 @@
}
/* get surface normal */
- rt_nurb_s_norm(fg, u, v, norm);
+ nmg_nurb_s_norm(fg, u, v, norm);
/* may need to reverse it */
if (f->flip) {
Modified: brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/bspline.cpp 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/bspline.cpp 2016-10-11
20:38:19 UTC (rev 69026)
@@ -145,7 +145,7 @@
BU_LIST_INIT(&n->bez_hd);
/* Grind up the original surf into a list of Bezier face_g_snurbs */
- (void)rt_nurb_bezier(&n->bez_hd, sip->srfs[i], (struct resource *)NULL);
+ (void)nmg_nurb_bezier(&n->bez_hd, sip->srfs[i], (struct resource
*)NULL);
/* Compute bounds of each Bezier face_g_snurb */
for (BU_LIST_FOR(s, face_g_snurb, &n->bez_hd)) {
@@ -181,9 +181,9 @@
while (BU_LIST_WHILE (s, face_g_snurb, &nurbs->bez_hd)) {
NMG_CK_SNURB(s);
BU_LIST_DEQUEUE(&(s->l));
- rt_nurb_free_snurb(s, (struct resource *)NULL);
+ nmg_nurb_free_snurb(s, (struct resource *)NULL);
}
- rt_nurb_free_snurb(nurbs->srf, (struct resource *)NULL); /*
original surf */
+ nmg_nurb_free_snurb(nurbs->srf, (struct resource *)NULL); /*
original surf */
BU_PUT(nurbs, struct nurb_specific);
}
@@ -244,7 +244,7 @@
BU_LIST_INIT(&n->bez_hd);
/* Grind up the original surf into a list of Bezier face_g_snurbs */
- (void)rt_nurb_bezier(&n->bez_hd, sip->srfs[i], (struct resource *)NULL);
+ (void)nmg_nurb_bezier(&n->bez_hd, sip->srfs[i], (struct resource
*)NULL);
/* Compute bounds of each Bezier face_g_snurb */
for (BU_LIST_FOR(s, face_g_snurb, &n->bez_hd)) {
@@ -380,17 +380,17 @@
while (nurb != (struct nurb_specific *) 0) {
struct face_g_snurb * s;
- struct rt_nurb_uv_hit *hp;
+ struct nmg_nurb_uv_hit *hp;
for (BU_LIST_FOR (s, face_g_snurb, &nurb->bez_hd)) {
if (!rt_in_rpp(rp, invdir, s->min_pt, s->max_pt))
continue;
#define UV_TOL 1.0e-6 /* Paper says 1.0e-4 is reasonable for 1k images, not
close up */
- hp = rt_nurb_intersect(
+ hp = nmg_nurb_intersect(
s, plane1, plane2, UV_TOL, (struct resource *)ap->a_resource,
NULL);
- while (hp != (struct rt_nurb_uv_hit *)0) {
- struct rt_nurb_uv_hit * o;
+ while (hp != (struct nmg_nurb_uv_hit *)0) {
+ struct nmg_nurb_uv_hit * o;
if (RT_G_DEBUG & DEBUG_SPLINE)
bu_log("hit at %d %d sub = %d u = %f v = %f\n",
@@ -403,7 +403,7 @@
o = hp;
hp = hp->next;
bu_free((char *)o,
- "rt_nurb_shot:rt_nurb_uv_hit structure");
+ "rt_nurb_shot:nmg_nurb_uv_hit structure");
rt_nurb_add_hit(&hit_list, hit, tol);
}
@@ -487,7 +487,7 @@
fastf_t v = hitp->hit_vpriv[1];
fastf_t norm[4];
- rt_nurb_s_norm(n, u, v, norm);
+ nmg_nurb_s_norm(n, u, v, norm);
VMOVE(hitp->hit_normal, norm);
@@ -574,9 +574,9 @@
while (BU_LIST_WHILE (s, face_g_snurb, &nurb->bez_hd)) {
NMG_CK_SNURB(s);
BU_LIST_DEQUEUE(&(s->l));
- rt_nurb_free_snurb(s, (struct resource *)NULL);
+ nmg_nurb_free_snurb(s, (struct resource *)NULL);
}
- rt_nurb_free_snurb(nurb->srf, (struct resource *)NULL); /* original
surf */
+ nmg_nurb_free_snurb(nurb->srf, (struct resource *)NULL); /*
original surf */
BU_PUT(nurb, struct nurb_specific);
}
return;
@@ -691,10 +691,10 @@
}
}
if (refined_col) {
- rt_nurb_free_snurb(r, (struct resource *)NULL);
+ nmg_nurb_free_snurb(r, (struct resource *)NULL);
}
if (refined_row) {
- rt_nurb_free_snurb(c, (struct resource *)NULL);
+ nmg_nurb_free_snurb(c, (struct resource *)NULL);
}
bu_free((char *) tkv1.knots, "rt_nurb_plot:tkv1>knots");
bu_free((char *) tkv2.knots, "rt_nurb_plot:tkv2.knots");
@@ -803,7 +803,7 @@
d.d.d_nctls = rp->d.d_nctls;
}
- sip->srfs[s] = (struct face_g_snurb *) rt_nurb_new_snurb(
+ sip->srfs[s] = (struct face_g_snurb *) nmg_nurb_new_snurb(
d.d.d_order[0], d.d.d_order[1],
d.d.d_kv_size[0], d.d.d_kv_size[1],
d.d.d_ctl_size[0], d.d.d_ctl_size[1],
@@ -1146,7 +1146,7 @@
else
pt_type = RT_NURB_MAKE_PT_TYPE(4, RT_NURB_PT_XYZ,
RT_NURB_PT_RATIONAL);
- sip->srfs[s] = (struct face_g_snurb *) rt_nurb_new_snurb(
+ sip->srfs[s] = (struct face_g_snurb *) nmg_nurb_new_snurb(
order[0], order[1],
u_size, v_size,
s_size[0], s_size[1],
@@ -1225,7 +1225,7 @@
/* Free up storage for the nurb surfaces */
for (i = 0; i < sip->nsrf; i++) {
- rt_nurb_free_snurb(sip->srfs[i], (struct resource *)NULL);
+ nmg_nurb_free_snurb(sip->srfs[i], (struct resource *)NULL);
}
sip->magic = 0;
sip->nsrf = 0;
@@ -1377,7 +1377,7 @@
if (BU_STR_EQUAL(argv[0], "N")) {
if (nurb->srfs) {
for (i=0; i<nurb->nsrf; i++)
- rt_nurb_free_snurb(nurb->srfs[i], NULL);
+ nmg_nurb_free_snurb(nurb->srfs[i], NULL);
bu_free((char *)nurb->srfs, "nurb surfaces");
}
nurb->nsrf = atoi(argv[1]);
@@ -1425,7 +1425,7 @@
bu_free((char *)srf_param_array, "srf_param_array");
return BRLCAD_ERROR;
}
- nurb->srfs[srf_no] = (struct face_g_snurb *)
rt_nurb_new_snurb(
+ nurb->srfs[srf_no] = (struct face_g_snurb *)
nmg_nurb_new_snurb(
order[0], order[1],
u_size, v_size,
s_size[0], s_size[1],
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -50,7 +50,7 @@
* 1 Original surface was Bezier, only a copy was done.
*/
int
-rt_nurb_bezier(struct bu_list *bezier_hd, const struct face_g_snurb
*orig_surf, struct resource *res)
+nmg_nurb_bezier(struct bu_list *bezier_hd, const struct face_g_snurb
*orig_surf, struct resource *res)
{
struct face_g_snurb *s;
int dir;
@@ -76,7 +76,7 @@
/* Split, and keep going */
BU_LIST_DEQUEUE(&s->l);
rt_nurb_s_split(&todo, s, dir, res);
- rt_nurb_free_snurb(s, res);
+ nmg_nurb_free_snurb(s, res);
}
}
return 0; /* Bezier snurbs on bezier_hd list */
@@ -165,7 +165,7 @@
crv1 = rt_nurb_c_xsplit(crv_copy, split);
- rt_nurb_free_cnurb(crv_copy);
+ nmg_nurb_free_cnurb(crv_copy);
crv_copy = BU_LIST_PNEXT(edge_g_cnurb, &crv1->l);
BU_LIST_DEQUEUE(&crv_copy->l);
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c 2016-10-11 20:03:54 UTC
(rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c 2016-10-11 20:38:19 UTC
(rev 69026)
@@ -56,18 +56,18 @@
vvs = rt_nurb_s_diff(vs, RT_NURB_SPLIT_COL);
uvs = rt_nurb_s_diff(vs, RT_NURB_SPLIT_ROW);
- rt_nurb_s_eval(srf, u, v, se);
- rt_nurb_s_eval(us, u, v, ue);
- rt_nurb_s_eval(vs, u, v, ve);
- rt_nurb_s_eval(uus, u, v, uue);
- rt_nurb_s_eval(vvs, u, v, vve);
- rt_nurb_s_eval(uvs, u, v, uve);
+ nmg_nurb_s_eval(srf, u, v, se);
+ nmg_nurb_s_eval(us, u, v, ue);
+ nmg_nurb_s_eval(vs, u, v, ve);
+ nmg_nurb_s_eval(uus, u, v, uue);
+ nmg_nurb_s_eval(vvs, u, v, vve);
+ nmg_nurb_s_eval(uvs, u, v, uve);
- rt_nurb_free_snurb(us, (struct resource *)NULL);
- rt_nurb_free_snurb(vs, (struct resource *)NULL);
- rt_nurb_free_snurb(uus, (struct resource *)NULL);
- rt_nurb_free_snurb(vvs, (struct resource *)NULL);
- rt_nurb_free_snurb(uvs, (struct resource *)NULL);
+ nmg_nurb_free_snurb(us, (struct resource *)NULL);
+ nmg_nurb_free_snurb(vs, (struct resource *)NULL);
+ nmg_nurb_free_snurb(uus, (struct resource *)NULL);
+ nmg_nurb_free_snurb(vvs, (struct resource *)NULL);
+ nmg_nurb_free_snurb(uvs, (struct resource *)NULL);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
for (i = 0; i < 3; i++) {
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -43,7 +43,7 @@
NMG_CK_SNURB(srf);
- n = (struct face_g_snurb *) rt_nurb_new_snurb(srf->order[0], srf->order[1],
+ n = (struct face_g_snurb *) nmg_nurb_new_snurb(srf->order[0],
srf->order[1],
srf->u.k_size, srf->v.k_size,
srf->s_size[0],
srf->s_size[1],
srf->pt_type, res);
@@ -73,7 +73,7 @@
NMG_CK_CNURB(crv);
- n = (struct edge_g_cnurb *) rt_nurb_new_cnurb(crv->order,
+ n = (struct edge_g_cnurb *) nmg_nurb_new_cnurb(crv->order,
crv->k.k_size, crv->c_size,
crv->pt_type);
for (i = 0; i < crv->k.k_size; i++)
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -64,7 +64,7 @@
if (dir == RT_NURB_SPLIT_ROW) {
nsrf = (struct face_g_snurb *)
- rt_nurb_new_snurb(srf->order[0] - 1, srf->order[1],
+ nmg_nurb_new_snurb(srf->order[0] - 1, srf->order[1],
srf->u.k_size - 2, srf->v.k_size,
srf->s_size[0], srf->s_size[1] - 1,
srf->pt_type, (struct resource *)NULL);
@@ -93,7 +93,7 @@
for (i = 0; i < srf->v.k_size; i++)
nsrf->v.knots[i] = srf->v.knots[i];
} else {
- nsrf = (struct face_g_snurb *) rt_nurb_new_snurb(
+ nsrf = (struct face_g_snurb *) nmg_nurb_new_snurb(
srf->order[0], srf->order[1] - 1,
srf->u.k_size, srf->v.k_size - 2,
srf->s_size[0] - 1, srf->s_size[1],
@@ -139,7 +139,7 @@
NMG_CK_CNURB(crv);
- ncrv = (struct edge_g_cnurb *) rt_nurb_new_cnurb(crv->order - 1,
+ ncrv = (struct edge_g_cnurb *) nmg_nurb_new_cnurb(crv->order - 1,
crv->k.k_size - 2,
crv->c_size - 1,
crv->pt_type);
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -46,7 +46,7 @@
* parametric value on a curve. This is expanded to the surface.
*/
void
-rt_nurb_s_eval(const struct face_g_snurb *srf, fastf_t u, fastf_t v, fastf_t
*final_value)
+nmg_nurb_s_eval(const struct face_g_snurb *srf, fastf_t u, fastf_t v, fastf_t
*final_value)
{
fastf_t * mesh_ptr = srf->ctl_points;
fastf_t * curves;
@@ -74,14 +74,14 @@
k_index = rt_nurb_knot_index(&srf->u, u, srf->order[RT_NURB_SPLIT_ROW]);
if (k_index < 0) {
- bu_log("rt_nurb_s_eval: u value outside parameter range\n");
+ bu_log("nmg_nurb_s_eval: u value outside parameter range\n");
bu_log("\tUV = (%g %g)\n", u, v);
rt_nurb_s_print("", srf);
- bu_bomb("rt_nurb_s_eval: u value outside parameter range\n");
+ bu_bomb("nmg_nurb_s_eval: u value outside parameter range\n");
}
curves = (fastf_t *) bu_malloc(col_size * sizeof(fastf_t) * coords,
- "rt_nurb_s_eval:crv_ptr");
+ "nmg_nurb_s_eval:crv_ptr");
for (i = 0; i < row_size; i++) {
fastf_t * rtr_pt;
@@ -101,14 +101,14 @@
c_ptr += coords;
}
- bu_free((char *)curves, "rt_nurb_s_eval: curves");
+ bu_free((char *)curves, "nmg_nurb_s_eval: curves");
k_index = rt_nurb_knot_index(&srf->v, v, srf->order[RT_NURB_SPLIT_COL]);
if (k_index < 0) {
- bu_log("rt_nurb_s_eval: v value outside parameter range\n");
+ bu_log("nmg_nurb_s_eval: v value outside parameter range\n");
bu_log("\tUV = (%g %g)\n", u, v);
rt_nurb_s_print("", srf);
- bu_bomb("rt_nurb_s_eval: v value outside parameter range\n");
+ bu_bomb("nmg_nurb_s_eval: v value outside parameter range\n");
}
ev_pt = (fastf_t *) rt_nurb_eval_crv(diff_curve,
srf->order[RT_NURB_SPLIT_COL],
@@ -117,7 +117,7 @@
for (k = 0; k < coords; k++)
final_value[k] = ev_pt[k];
- bu_free ((char *)diff_curve, "rt_nurb_s_eval: diff curve");
+ bu_free ((char *)diff_curve, "nmg_nurb_s_eval: diff curve");
}
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -41,7 +41,7 @@
* approximate it.
*/
void
-rt_nurb_s_norm(struct face_g_snurb *srf, fastf_t u, fastf_t v, fastf_t *norm)
+nmg_nurb_s_norm(struct face_g_snurb *srf, fastf_t u, fastf_t v, fastf_t *norm)
{
struct face_g_snurb *usrf, *vsrf;
point_t uvec, vvec;
@@ -52,7 +52,7 @@
/* Case (linear, lienar) find the normal from the polygon */
if (srf->order[0] == 2 && srf->order[1] == 2) {
/* Find the correct span to get the normal */
- rt_nurb_s_eval(srf, u, v, se);
+ nmg_nurb_s_eval(srf, u, v, se);
p = 0.0;
for (i = 0; i < srf->u.k_size -1; i++) {
@@ -67,7 +67,7 @@
}
}
- rt_nurb_s_eval(srf, p, v, ue);
+ nmg_nurb_s_eval(srf, p, v, ue);
p = 0.0;
for (i = 0; i < srf->v.k_size -1; i++) {
@@ -81,7 +81,7 @@
}
}
- rt_nurb_s_eval(srf, u, p, ve);
+ nmg_nurb_s_eval(srf, u, p, ve);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
ue[0] = ue[0] / ue[3];
@@ -109,7 +109,7 @@
* the tangent to the surface
*/
if (srf->order[0] == 2 && srf->order[1] > 2) {
- rt_nurb_s_eval(srf, u, v, se);
+ nmg_nurb_s_eval(srf, u, v, se);
p = 0.0;
for (i = 0; i < srf->u.k_size -1; i++) {
@@ -124,11 +124,11 @@
}
}
- rt_nurb_s_eval(srf, p, v, ue);
+ nmg_nurb_s_eval(srf, p, v, ue);
vsrf = (struct face_g_snurb *) rt_nurb_s_diff(srf, RT_NURB_SPLIT_COL);
- rt_nurb_s_eval(vsrf, u, v, ve);
+ nmg_nurb_s_eval(vsrf, u, v, ve);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
fastf_t w, inv_w;
@@ -159,11 +159,11 @@
VCROSS(norm, uvec, ve);
VUNITIZE(norm);
- rt_nurb_free_snurb(vsrf, (struct resource *)NULL);
+ nmg_nurb_free_snurb(vsrf, (struct resource *)NULL);
return;
}
if (srf->order[1] == 2 && srf->order[0] > 2) {
- rt_nurb_s_eval(srf, u, v, se);
+ nmg_nurb_s_eval(srf, u, v, se);
p = 0.0;
for (i = 0; i < srf->v.k_size -1; i++) {
@@ -178,11 +178,11 @@
}
}
- rt_nurb_s_eval(srf, u, p, ve);
+ nmg_nurb_s_eval(srf, u, p, ve);
usrf = (struct face_g_snurb *) rt_nurb_s_diff(srf, RT_NURB_SPLIT_ROW);
- rt_nurb_s_eval(usrf, u, v, ue);
+ nmg_nurb_s_eval(usrf, u, v, ue);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
fastf_t w, inv_w;
@@ -213,7 +213,7 @@
VCROSS(norm, ue, vvec);
VUNITIZE(norm);
- rt_nurb_free_snurb(usrf, (struct resource *)NULL);
+ nmg_nurb_free_snurb(usrf, (struct resource *)NULL);
return;
}
@@ -223,14 +223,14 @@
usrf = (struct face_g_snurb *) rt_nurb_s_diff(srf, RT_NURB_SPLIT_ROW);
vsrf = (struct face_g_snurb *) rt_nurb_s_diff(srf, RT_NURB_SPLIT_COL);
- rt_nurb_s_eval(usrf, u, v, ue);
- rt_nurb_s_eval(vsrf, u, v, ve);
+ nmg_nurb_s_eval(usrf, u, v, ue);
+ nmg_nurb_s_eval(vsrf, u, v, ve);
VCROSS(norm, ue, ve);
VUNITIZE(norm);
- rt_nurb_free_snurb(usrf, (struct resource *)NULL);
- rt_nurb_free_snurb(vsrf, (struct resource *)NULL);
+ nmg_nurb_free_snurb(usrf, (struct resource *)NULL);
+ nmg_nurb_free_snurb(vsrf, (struct resource *)NULL);
return;
}
@@ -240,14 +240,14 @@
fastf_t w, inv_w;
vect_t unorm, vnorm;
- rt_nurb_s_eval(srf, u, v, se);
+ nmg_nurb_s_eval(srf, u, v, se);
usrf = (struct face_g_snurb *) rt_nurb_s_diff(srf, RT_NURB_SPLIT_ROW);
vsrf = (struct face_g_snurb *) rt_nurb_s_diff(srf, RT_NURB_SPLIT_COL);
- rt_nurb_s_eval(usrf, u, v, ue);
+ nmg_nurb_s_eval(usrf, u, v, ue);
- rt_nurb_s_eval(vsrf, u, v, ve);
+ nmg_nurb_s_eval(vsrf, u, v, ve);
w = se[3];
inv_w = 1.0 / w;
@@ -262,8 +262,8 @@
VCROSS(norm, unorm, vnorm);
VUNITIZE(norm);
- rt_nurb_free_snurb(usrf, (struct resource *)NULL);
- rt_nurb_free_snurb(vsrf, (struct resource *)NULL);
+ nmg_nurb_free_snurb(usrf, (struct resource *)NULL);
+ nmg_nurb_free_snurb(vsrf, (struct resource *)NULL);
return;
}
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -56,7 +56,7 @@
n_pt_type = RT_NURB_MAKE_PT_TYPE(2, RT_NURB_PT_PROJ, 0);
- psrf = (struct face_g_snurb *) rt_nurb_new_snurb(srf->order[0],
srf->order[1],
+ psrf = (struct face_g_snurb *) nmg_nurb_new_snurb(srf->order[0],
srf->order[1],
srf->u.k_size,
srf->v.k_size,
srf->s_size[0],
srf->s_size[1], n_pt_type, res);
@@ -318,10 +318,10 @@
}
-struct rt_nurb_uv_hit *
-rt_nurb_intersect(const struct face_g_snurb *srf, fastf_t *plane1, fastf_t
*plane2, double uv_tol, struct resource *res, struct bu_list *plist)
+struct nmg_nurb_uv_hit *
+nmg_nurb_intersect(const struct face_g_snurb *srf, fastf_t *plane1, fastf_t
*plane2, double uv_tol, struct resource *res, struct bu_list *plist)
{
- struct rt_nurb_uv_hit * h;
+ struct nmg_nurb_uv_hit * h;
struct face_g_snurb * psrf,
* osrf;
int dir,
@@ -335,7 +335,7 @@
NMG_CK_SNURB(srf);
- h = (struct rt_nurb_uv_hit *) 0;
+ h = (struct nmg_nurb_uv_hit *) 0;
if (plist == NULL) {
plist = &rni_plist;
BU_LIST_INIT(plist);
@@ -379,30 +379,30 @@
if (RT_G_DEBUG & DEBUG_SPLINE)
bu_log("this srf doesn't include the origin\n");
flat = 1;
- rt_nurb_free_snurb(psrf, res);
+ nmg_nurb_free_snurb(psrf, res);
continue;
}
rt_nurb_clip_srf(psrf, dir, &smin, &smax);
if ((smax - smin) > .8) {
- struct rt_nurb_uv_hit *hp;
+ struct nmg_nurb_uv_hit *hp;
/* Split surf, requeue both sub-surfs at head */
/* New surfs will have same dir as arg, here */
if (RT_G_DEBUG & DEBUG_SPLINE)
bu_log("splitting this surface\n");
rt_nurb_s_split(plist, psrf, dir, res);
- rt_nurb_free_snurb(psrf, res);
+ nmg_nurb_free_snurb(psrf, res);
- hp = rt_nurb_intersect(srf, plane1, plane2, uv_tol, res, plist);
+ hp = nmg_nurb_intersect(srf, plane1, plane2, uv_tol, res,
plist);
return hp;
}
if (smin > 1.0 || smax < 0.0) {
if (RT_G_DEBUG & DEBUG_SPLINE)
bu_log("eliminating this surface (smin=%g, smax=%g)\n",
smin, smax);
flat = 1;
- rt_nurb_free_snurb(psrf, res);
+ nmg_nurb_free_snurb(psrf, res);
continue;
}
if (dir == RT_NURB_SPLIT_ROW) {
@@ -426,7 +426,7 @@
osrf, dir, smin, smax, res);
psrf->dir = dir;
- rt_nurb_free_snurb(osrf, res);
+ nmg_nurb_free_snurb(osrf, res);
if (RT_G_DEBUG & DEBUG_SPLINE) {
bu_log("After call to rt_nurb_region_from_srf() (smin=%g,
smax=%g)\n", smin, smax);
@@ -440,7 +440,7 @@
v[1] = psrf->v.knots[psrf->v.k_size -1];
if ((u[1] - u[0]) < uv_tol && (v[1] - v[0]) < uv_tol) {
- struct rt_nurb_uv_hit * hit;
+ struct nmg_nurb_uv_hit * hit;
if (RT_G_DEBUG & DEBUG_SPLINE) {
fastf_t p1[4], p2[4];
@@ -448,8 +448,8 @@
vect_t diff;
coords = RT_NURB_EXTRACT_COORDS(srf->pt_type);
- rt_nurb_s_eval(srf, u[0], v[0], p1);
- rt_nurb_s_eval(srf, u[1], v[1], p2);
+ nmg_nurb_s_eval(srf, u[0], v[0], p1);
+ nmg_nurb_s_eval(srf, u[1], v[1], p2);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
fastf_t inv_w;
@@ -466,22 +466,22 @@
MAGNITUDE(diff), V3ARGS(p1), V3ARGS(p2));
}
- hit = (struct rt_nurb_uv_hit *) bu_malloc(
- sizeof(struct rt_nurb_uv_hit), "hit");
+ hit = (struct nmg_nurb_uv_hit *) bu_malloc(
+ sizeof(struct nmg_nurb_uv_hit), "hit");
- hit->next = (struct rt_nurb_uv_hit *)0;
+ hit->next = (struct nmg_nurb_uv_hit *)0;
hit->sub = sub;
hit->u = (u[0] + u[1])/2.0;
hit->v = (v[0] + v[1])/2.0;
- if (h == (struct rt_nurb_uv_hit *)0)
+ if (h == (struct nmg_nurb_uv_hit *)0)
h = hit;
else {
hit->next = h;
h = hit;
}
flat = 1;
- rt_nurb_free_snurb(psrf, res);
+ nmg_nurb_free_snurb(psrf, res);
}
if ((u[1] - u[0]) > (v[1] - v[0]))
dir = 1;
@@ -489,7 +489,7 @@
}
}
- return (struct rt_nurb_uv_hit *)h;
+ return (struct nmg_nurb_uv_hit *)h;
}
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -152,7 +152,7 @@
coords = RT_NURB_EXTRACT_COORDS(crv->pt_type);
- new_crv = (struct edge_g_cnurb *) rt_nurb_new_cnurb(
+ new_crv = (struct edge_g_cnurb *) nmg_nurb_new_cnurb(
crv->order, kv->k_size, kv->k_size - crv->order,
crv->pt_type);
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_split.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_split.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_split.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -255,7 +255,7 @@
* The original curve is undisturbed by this operation.
*/
void
-rt_nurb_c_split(struct bu_list *split_hd, const struct edge_g_cnurb *crv)
+nmg_nurb_c_split(struct bu_list *split_hd, const struct edge_g_cnurb *crv)
{
struct knot_vector new_kv;
fastf_t value;
@@ -296,7 +296,7 @@
crv1->ctl_points = (fastf_t *)
bu_malloc(sizeof(fastf_t) * crv1->c_size *
RT_NURB_EXTRACT_COORDS(crv1->pt_type),
- "rt_nurb_c_split: crv1 control points");
+ "nmg_nurb_c_split: crv1 control points");
GET_CNURB(crv2);
crv2->order = crv->order;
@@ -317,7 +317,7 @@
rt_nurb_free_oslo(oslo, (struct resource *)NULL);
- bu_free((char *) new_kv.knots, "rt_nurb_c_split; new_kv.knots");
+ bu_free((char *) new_kv.knots, "nmg_nurb_c_split; new_kv.knots");
/* Arrangement will be: head, crv1, crv2 */
BU_LIST_APPEND(split_hd, &crv2->l);
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -121,11 +121,11 @@
/* free up storage */
- rt_nurb_free_snurb(us, (struct resource *)NULL);
- rt_nurb_free_snurb(vs, (struct resource *)NULL);
- rt_nurb_free_snurb(uus, (struct resource *)NULL);
- rt_nurb_free_snurb(vvs, (struct resource *)NULL);
- rt_nurb_free_snurb(uvs, (struct resource *)NULL);
+ nmg_nurb_free_snurb(us, (struct resource *)NULL);
+ nmg_nurb_free_snurb(vs, (struct resource *)NULL);
+ nmg_nurb_free_snurb(uus, (struct resource *)NULL);
+ nmg_nurb_free_snurb(vvs, (struct resource *)NULL);
+ nmg_nurb_free_snurb(uvs, (struct resource *)NULL);
/* The paper uses the following to calculate the longest edge size
@@ -191,8 +191,8 @@
}
}
- rt_nurb_free_cnurb(d1);
- rt_nurb_free_cnurb(d2);
+ nmg_nurb_free_cnurb(d1);
+ nmg_nurb_free_cnurb(d2);
for (j=0; j<num_coords; j++) {
if (ZERO(der2[j]))
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -273,7 +273,7 @@
if (caset == CASE_C)
trim_flag = rt_process_casec(clip, u, v);
- rt_nurb_free_cnurb(clip);
+ nmg_nurb_free_cnurb(clip);
if (trim_flag == TRIM_IN) jordan_hit++;
if (trim_flag == TRIM_ON) break;
@@ -281,7 +281,7 @@
while (BU_LIST_WHILE(clip, edge_g_cnurb, &plist)) {
BU_LIST_DEQUEUE(&clip->l);
- rt_nurb_free_cnurb(clip);
+ nmg_nurb_free_cnurb(clip);
}
if (trim_flag == TRIM_ON)
@@ -485,7 +485,7 @@
tmp = (struct edge_g_cnurb *) c1->l.forw;
BU_LIST_DEQUEUE(&tmp->l);
- rt_nurb_free_cnurb(tmp);
+ nmg_nurb_free_cnurb(tmp);
BU_LIST_INIT(plist);
BU_LIST_INSERT(&c2->l, plist);
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_util.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_util.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_util.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -39,7 +39,7 @@
* Create a place holder for a nurb surface.
*/
struct face_g_snurb *
-rt_nurb_new_snurb(int u_order, int v_order, int n_u, int n_v, int n_rows, int
n_cols, int pt_type, struct resource *res)
+nmg_nurb_new_snurb(int u_order, int v_order, int n_u, int n_v, int n_rows, int
n_cols, int pt_type, struct resource *res)
{
register struct face_g_snurb * srf;
int pnum;
@@ -60,11 +60,11 @@
pnum = sizeof (fastf_t) * n_rows * n_cols *
RT_NURB_EXTRACT_COORDS(pt_type);
srf->u.knots = (fastf_t *) bu_malloc (
- n_u * sizeof (fastf_t), "rt_nurb_new_snurb: u kv knot values");
+ n_u * sizeof (fastf_t), "nmg_nurb_new_snurb: u kv knot values");
srf->v.knots = (fastf_t *) bu_malloc (
- n_v * sizeof (fastf_t), "rt_nurb_new_snurb: v kv knot values");
+ n_v * sizeof (fastf_t), "nmg_nurb_new_snurb: v kv knot values");
srf->ctl_points = (fastf_t *) bu_malloc(
- pnum, "rt_nurb_new_snurb: control mesh points");
+ pnum, "nmg_nurb_new_snurb: control mesh points");
return srf;
}
@@ -74,7 +74,7 @@
* Create a place holder for a new nurb curve.
*/
struct edge_g_cnurb *
-rt_nurb_new_cnurb(int order, int n_knots, int n_pts, int pt_type)
+nmg_nurb_new_cnurb(int order, int n_knots, int n_pts, int pt_type)
{
register struct edge_g_cnurb * crv;
@@ -84,7 +84,7 @@
crv->k.k_size = n_knots;
crv->k.knots = (fastf_t *)
bu_malloc(n_knots * sizeof(fastf_t),
- "rt_nurb_new_cnurb: knot values");
+ "nmg_nurb_new_cnurb: knot values");
crv->c_size = n_pts;
crv->pt_type = pt_type;
@@ -92,7 +92,7 @@
crv->ctl_points = (fastf_t *)
bu_malloc(sizeof(fastf_t) * RT_NURB_EXTRACT_COORDS(pt_type) *
n_pts,
- "rt_nurb_new_cnurb: mesh point values");
+ "nmg_nurb_new_cnurb: mesh point values");
return crv;
}
@@ -111,8 +111,8 @@
if (res) RT_CK_RESOURCE(res);
bu_free((char *)srf->u.knots, "rt_nurb_clean_snurb() u.knots");
- bu_free((char *)srf->v.knots, "rt_nurb_free_snurb() v.knots");
- bu_free((char *)srf->ctl_points, "rt_nurb_free_snurb() ctl_points");
+ bu_free((char *)srf->v.knots, "nmg_nurb_free_snurb() v.knots");
+ bu_free((char *)srf->ctl_points, "nmg_nurb_free_snurb() ctl_points");
/* Invalidate the structure */
srf->u.knots = (fastf_t *)NULL;
@@ -124,7 +124,7 @@
void
-rt_nurb_free_snurb(struct face_g_snurb *srf, struct resource *res)
+nmg_nurb_free_snurb(struct face_g_snurb *srf, struct resource *res)
{
NMG_CK_SNURB(srf);
@@ -134,12 +134,12 @@
* deleted.
*/
- bu_free((char *)srf->u.knots, "rt_nurb_free_snurb: u kv knots");
- bu_free((char *)srf->v.knots, "rt_nurb_free_snurb: v kv knots");
- bu_free((char *)srf->ctl_points, "rt_nurb_free_snurb: mesh points");
+ bu_free((char *)srf->u.knots, "nmg_nurb_free_snurb: u kv knots");
+ bu_free((char *)srf->v.knots, "nmg_nurb_free_snurb: v kv knots");
+ bu_free((char *)srf->ctl_points, "nmg_nurb_free_snurb: mesh points");
srf->l.magic = 0;
- bu_free((char *)srf, "rt_nurb_free_snurb: snurb struct");
+ bu_free((char *)srf, "nmg_nurb_free_snurb: snurb struct");
}
@@ -152,8 +152,8 @@
rt_nurb_clean_cnurb(struct edge_g_cnurb *crv)
{
NMG_CK_CNURB(crv);
- bu_free((char*)crv->k.knots, "rt_nurb_free_cnurb: knots");
- bu_free((char*)crv->ctl_points, "rt_nurb_free_cnurb: control points");
+ bu_free((char*)crv->k.knots, "nmg_nurb_free_cnurb: knots");
+ bu_free((char*)crv->ctl_points, "nmg_nurb_free_cnurb: control points");
/* Invalidate the structure */
crv->k.knots = (fastf_t *)NULL;
crv->ctl_points = (fastf_t *)NULL;
@@ -167,13 +167,13 @@
* Release a cnurb and all the storage that it references.
*/
void
-rt_nurb_free_cnurb(struct edge_g_cnurb *crv)
+nmg_nurb_free_cnurb(struct edge_g_cnurb *crv)
{
NMG_CK_CNURB(crv);
- bu_free((char*)crv->k.knots, "rt_nurb_free_cnurb: knots");
- bu_free((char*)crv->ctl_points, "rt_nurb_free_cnurb: control points");
+ bu_free((char*)crv->k.knots, "nmg_nurb_free_cnurb: knots");
+ bu_free((char*)crv->ctl_points, "nmg_nurb_free_cnurb: control points");
crv->l.magic = 0; /* sanity */
- bu_free((char*)crv, "rt_nurb_free_cnurb: cnurb struct");
+ bu_free((char*)crv, "nmg_nurb_free_cnurb: cnurb struct");
}
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-11 20:03:54 UTC
(rev 69025)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-11 20:38:19 UTC
(rev 69026)
@@ -568,7 +568,7 @@
if (snrb) {
NMG_CK_FACE_G_SNURB(snrb);
- rt_nurb_s_eval(snrb, uvw[0], uvw[1], xyz1);
+ nmg_nurb_s_eval(snrb, uvw[0], uvw[1], xyz1);
if (RT_NURB_IS_PT_RATIONAL(snrb->pt_type)) {
fastf_t inverse_weight;
@@ -610,7 +610,7 @@
}
if (snrb) {
- rt_nurb_s_eval(snrb, uvw[0], uvw[1], xyz1);
+ nmg_nurb_s_eval(snrb, uvw[0], uvw[1], xyz1);
if (RT_NURB_IS_PT_RATIONAL(snrb->pt_type)) {
fastf_t inverse_weight;
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2016-10-11 20:03:54 UTC
(rev 69025)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2016-10-11 20:38:19 UTC
(rev 69026)
@@ -175,7 +175,7 @@
bu_bomb("nmg_snurb_fu_get_norm: bad face\n");
}
- rt_nurb_s_eval(f->g.snurb_p, u, v, tmp_pt);
+ nmg_nurb_s_eval(f->g.snurb_p, u, v, tmp_pt);
if (RT_NURB_IS_PT_RATIONAL(f->g.snurb_p->pt_type)) {
double d;
@@ -206,7 +206,7 @@
bu_bomb("nmg_snurb_fu_get_norm: bad face\n");
}
- rt_nurb_s_norm(f->g.snurb_p, u, v, norm);
+ nmg_nurb_s_norm(f->g.snurb_p, u, v, norm);
if ((fu->orientation != OT_SAME) != (f->flip != 0))
VREVERSE(norm, norm);
@@ -8703,7 +8703,7 @@
}
knot_length++;
- new_crv = rt_nurb_new_cnurb(max_order, knot_length, ctl_points, pt_type);
+ new_crv = nmg_nurb_new_cnurb(max_order, knot_length, ctl_points, pt_type);
crv = BU_LIST_FIRST(edge_g_cnurb, crv_head);
@@ -8875,7 +8875,7 @@
}
/* Get memory for this curve (order=3, 6 knot values, 3 control points)
*/
- crv = rt_nurb_new_cnurb(3, 6, 3, pt_type);
+ crv = nmg_nurb_new_cnurb(3, 6, 3, pt_type);
/* Set knot values */
for (i=0; i<3; i++)
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c 2016-10-11 20:03:54 UTC
(rev 69025)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c 2016-10-11 20:38:19 UTC
(rev 69026)
@@ -2341,7 +2341,7 @@
* the pointers are NULL, then the necessary storage is allocated
* here.
*
- * This is the NMG parallel to rt_nurb_new_snurb().
+ * This is the NMG parallel to nmg_nurb_new_snurb().
*/
void
nmg_face_g_snurb(struct faceuse *fu, int u_order, int v_order, int n_u_knots,
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-11 20:03:54 UTC
(rev 69025)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-11 20:38:19 UTC
(rev 69026)
@@ -2228,8 +2228,8 @@
vp += stride;
}
}
- rt_nurb_free_snurb(c, (struct resource *)NULL);
- rt_nurb_free_snurb(r, (struct resource *)NULL);
+ nmg_nurb_free_snurb(c, (struct resource *)NULL);
+ nmg_nurb_free_snurb(r, (struct resource *)NULL);
bu_free((char *) tau1.knots, "rt_nurb_plot:tau1.knots");
bu_free((char *) tau2.knots, "rt_nurb_plot:tau2.knots");
@@ -2332,7 +2332,7 @@
/* This section uses rt_nurb_c_eval(), but rt_nurb_c_refine is likely
faster.
* XXXX Need a way to selectively and recursively refine curve to avoid
- * feeding rt_nurb_s_eval() parameters outside domain of surface.
+ * feeding nmg_nurb_s_eval() parameters outside domain of surface.
*/
param_delta = (c->k.knots[c->k.k_size-1] -
c->k.knots[0])/(fastf_t)(n_interior+1);
crv_param = c->k.knots[0];
@@ -2352,7 +2352,7 @@
}
/* convert 'uvw' from UV coord to XYZ coord via surf! */
- rt_nurb_s_eval(s, uvw[0], uvw[1], final);
+ nmg_nurb_s_eval(s, uvw[0], uvw[1], final);
if (RT_NURB_IS_PT_RATIONAL(s->pt_type)) {
/* divide out homogeneous coordinate */
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c 2016-10-11
20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c 2016-10-11
20:38:19 UTC (rev 69026)
@@ -1789,7 +1789,7 @@
isect_ray_snurb_face(struct ray_data *rd, struct faceuse *fu, struct
face_g_snurb *fg)
{
plane_t pl, pl1, pl2;
- struct rt_nurb_uv_hit *hp;
+ struct nmg_nurb_uv_hit *hp;
struct bu_list bezier;
struct bu_list hit_list;
struct face_g_snurb *srf;
@@ -1810,7 +1810,7 @@
BU_LIST_INIT(&bezier);
BU_LIST_INIT(&hit_list);
- rt_nurb_bezier(&bezier, fg, rd->ap->a_resource);
+ nmg_nurb_bezier(&bezier, fg, rd->ap->a_resource);
while (BU_LIST_NON_EMPTY(&bezier)) {
point_t srf_min, srf_max;
@@ -1875,12 +1875,12 @@
VCROSS(pl, u_dir, v_dir);
VUNITIZE(pl);
pl[W] = VDOT(pl, ctl_pt[0]);
- hp = (struct rt_nurb_uv_hit *)NULL;
+ hp = (struct nmg_nurb_uv_hit *)NULL;
if (bn_isect_line3_plane(&dist, rd->rp->r_pt, rd->rp->r_dir, pl,
rd->tol) <= 0) {
if (RTG.NMG_debug & DEBUG_RT_ISECT)
bu_log("\tNo intersection\n");
- rt_nurb_free_snurb(srf, rd->ap->a_resource);
+ nmg_nurb_free_snurb(srf, rd->ap->a_resource);
continue;
}
@@ -1892,8 +1892,8 @@
if (u >= srf->u.knots[0] && u <= srf->u.knots[srf->u.k_size-1] &&
v >= srf->v.knots[0] && v <= srf->v.knots[srf->v.k_size-1])
{
- BU_ALLOC(hp, struct rt_nurb_uv_hit);
- hp->next = (struct rt_nurb_uv_hit *)NULL;
+ BU_ALLOC(hp, struct nmg_nurb_uv_hit);
+ hp->next = (struct nmg_nurb_uv_hit *)NULL;
hp->sub = 0;
hp->u = u;
hp->v = v;
@@ -1907,15 +1907,15 @@
V4ARGS(pl1), V4ARGS(pl2));
(void)rt_nurb_s_bound(srf, srf_min, srf_max);
if (!rt_in_rpp(rd->rp, rd->rd_invdir, srf_min, srf_max)) {
- rt_nurb_free_snurb(srf, rd->ap->a_resource);
+ nmg_nurb_free_snurb(srf, rd->ap->a_resource);
continue;
}
- hp = rt_nurb_intersect(srf, pl1, pl2, UV_TOL, rd->ap->a_resource,
NULL);
+ hp = nmg_nurb_intersect(srf, pl1, pl2, UV_TOL, rd->ap->a_resource,
NULL);
}
/* process each hit point */
- while (hp != (struct rt_nurb_uv_hit *)NULL) {
- struct rt_nurb_uv_hit *next;
+ while (hp != (struct nmg_nurb_uv_hit *)NULL) {
+ struct nmg_nurb_uv_hit *next;
struct hitmiss *myhit;
vect_t to_hit;
fastf_t dot;
@@ -1969,7 +1969,7 @@
myhit->hit.hit_dist = dist;
VMOVE(myhit->hit.hit_normal, pl);
} else {
- rt_nurb_s_eval(srf, hp->u, hp->v, homo_hit);
+ nmg_nurb_s_eval(srf, hp->u, hp->v, homo_hit);
if (RT_NURB_IS_PT_RATIONAL(srf->pt_type)) {
fastf_t inv_homo;
@@ -1982,7 +1982,7 @@
myhit->hit.hit_dist = VDOT(to_hit, rd->rp->r_dir);
/* get surface normal */
- rt_nurb_s_norm(srf, hp->u, hp->v, myhit->hit.hit_normal);
+ nmg_nurb_s_norm(srf, hp->u, hp->v, myhit->hit.hit_normal);
}
/* may need to reverse it */
@@ -2050,7 +2050,7 @@
bu_free((char *)hp, "hit");
hp = next;
}
- rt_nurb_free_snurb(srf, rd->ap->a_resource);
+ nmg_nurb_free_snurb(srf, rd->ap->a_resource);
}
}
Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2016-10-11 20:03:54 UTC (rev
69025)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2016-10-11 20:38:19 UTC (rev
69026)
@@ -3102,11 +3102,11 @@
if (!flip) {
- rt_nurb_s_eval(fu->f_p->g.snurb_p,
+ nmg_nurb_s_eval(fu->f_p->g.snurb_p,
nmg_uv_unitcircle[0], nmg_uv_unitcircle[1], point);
nmg_vertex_gv(eu->vu_p->v_p, point);
} else {
- rt_nurb_s_eval(fu->f_p->g.snurb_p,
+ nmg_nurb_s_eval(fu->f_p->g.snurb_p,
nmg_uv_unitcircle[12], nmg_uv_unitcircle[13], point);
nmg_vertex_gv(eu->vu_p->v_p, point);
}
@@ -3224,7 +3224,7 @@
/* March around the fu's loop assigning uv parameter values */
- rt_nurb_s_eval(fg, 0.0, 0.0, hvect);
+ nmg_nurb_s_eval(fg, 0.0, 0.0, hvect);
HDIVIDE(point, hvect);
nmg_vertex_gv(eu->vu_p->v_p, point); /* 0, 0 vertex */
@@ -3245,7 +3245,7 @@
VSET(uvw, 0, 1, 0);
nmg_vertexuse_a_cnurb(eu->eumate_p->vu_p, uvw);
- rt_nurb_s_eval(fg, 1., 1., hvect);
+ nmg_nurb_s_eval(fg, 1., 1., hvect);
HDIVIDE(point, hvect);
nmg_vertex_gv(eu->vu_p->v_p, point); /* 4, 1 vertex */
Modified: brlcad/trunk/src/proc-db/spltest.c
===================================================================
--- brlcad/trunk/src/proc-db/spltest.c 2016-10-11 20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/proc-db/spltest.c 2016-10-11 20:38:19 UTC (rev 69026)
@@ -52,7 +52,7 @@
fastf_t *fp = NULL;
struct face_g_snurb *srf = NULL;
- srf = rt_nurb_new_snurb(order, order,
+ srf = nmg_nurb_new_snurb(order, order,
2*order+interior_pts, 2*order+interior_pts, /* #
knots */
2+interior_pts, 2+interior_pts,
RT_NURB_MAKE_PT_TYPE(3, RT_NURB_PT_XYZ,
RT_NURB_PT_NONRAT),
Modified: brlcad/trunk/src/proc-db/tea.c
===================================================================
--- brlcad/trunk/src/proc-db/tea.c 2016-10-11 20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/proc-db/tea.c 2016-10-11 20:38:19 UTC (rev 69026)
@@ -57,7 +57,7 @@
pt_type = RT_NURB_MAKE_PT_TYPE(3, 2, 0); /* see nurb.h for details */
- b_patch = (struct face_g_snurb *) rt_nurb_new_snurb(4, 4, 8, 8, 4, 4,
pt_type, &rt_uniresource);
+ b_patch = (struct face_g_snurb *) nmg_nurb_new_snurb(4, 4, 8, 8, 4, 4,
pt_type, &rt_uniresource);
*surfp = b_patch;
/* Now fill in the pieces */
Modified: brlcad/trunk/src/proc-db/tube.c
===================================================================
--- brlcad/trunk/src/proc-db/tube.c 2016-10-11 20:03:54 UTC (rev 69025)
+++ brlcad/trunk/src/proc-db/tube.c 2016-10-11 20:38:19 UTC (rev 69026)
@@ -264,7 +264,7 @@
* The V direction is down the first column,
* and has NROWS+order[V] positions.
*/
- bp = rt_nurb_new_snurb(3, 4, /* u, v order */
+ bp = nmg_nurb_new_snurb(3, 4, /* u, v order */
N_CIRCLE_KNOTS, npts+6, /* u, v knot
vector size */
npts+2, NCOLS, /* nrows, ncols
*/
RT_NURB_MAKE_PT_TYPE(4, 2, 1),
@@ -333,7 +333,7 @@
mk_bspline(outfp, name, surfp);
}
- rt_nurb_free_snurb(bp, &rt_uniresource);
+ nmg_nurb_free_snurb(bp, &rt_uniresource);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
