Revision: 69027
http://sourceforge.net/p/brlcad/code/69027
Author: starseeker
Date: 2016-10-11 21:04:01 +0000 (Tue, 11 Oct 2016)
Log Message:
-----------
second pass - get the uses in primitives/nmg
Modified Paths:
--------------
brlcad/trunk/CHANGES
brlcad/trunk/include/rt/nmg.h
brlcad/trunk/include/rt/nurb.h
brlcad/trunk/src/conv/dxf/dxf-g.c
brlcad/trunk/src/conv/iges/trimsurf.c
brlcad/trunk/src/librt/nurb_example.c
brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c
brlcad/trunk/src/librt/primitives/bspline/nurb_knot.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_util.c
brlcad/trunk/src/librt/primitives/extrude/extrude.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_plot.c
brlcad/trunk/src/librt/primitives/sketch/sketch.c
Modified: brlcad/trunk/CHANGES
===================================================================
--- brlcad/trunk/CHANGES 2016-10-11 20:38:19 UTC (rev 69026)
+++ brlcad/trunk/CHANGES 2016-10-11 21:04:01 UTC (rev 69027)
@@ -1230,4 +1230,13 @@
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
+s/rt_arc2d_to_cnurb/nmg_arc2d_to_cnurb/g
+s/rt_join_cnurbs/nmg_join_cnurbs/g
+s/rt_nurb_c_eval/nmg_nurb_c_eval/g
+s/rt_nurb_c_print/nmg_nurb_c_print/g
+s/rt_nurb_kvgen/nmg_nurb_kvgen/g
+s/rt_nurb_kvmerge/nmg_nurb_kvmerge/g
+s/rt_nurb_s_print/nmg_nurb_s_print/g
+s/rt_nurb_s_refine/nmg_nurb_s_refine/g
rename old nurbs functions intertwined with nmg to use nmg prefix
[7.26]
+
Modified: brlcad/trunk/include/rt/nmg.h
===================================================================
--- brlcad/trunk/include/rt/nmg.h 2016-10-11 20:38:19 UTC (rev 69026)
+++ brlcad/trunk/include/rt/nmg.h 2016-10-11 21:04:01 UTC (rev 69027)
@@ -1507,8 +1507,8 @@
const struct bn_tol *tol);
RT_EXPORT extern void nmg_intersect_loops_self(struct shell *s,
const struct bn_tol *tol);
-RT_EXPORT extern struct edge_g_cnurb *rt_join_cnurbs(struct bu_list *crv_head);
-RT_EXPORT extern struct edge_g_cnurb *rt_arc2d_to_cnurb(point_t i_center,
+RT_EXPORT extern struct edge_g_cnurb *nmg_join_cnurbs(struct bu_list
*crv_head);
+RT_EXPORT extern struct edge_g_cnurb *nmg_arc2d_to_cnurb(point_t i_center,
point_t i_start,
point_t i_end,
int point_type,
Modified: brlcad/trunk/include/rt/nurb.h
===================================================================
--- brlcad/trunk/include/rt/nurb.h 2016-10-11 20:38:19 UTC (rev 69026)
+++ brlcad/trunk/include/rt/nurb.h 2016-10-11 21:04:01 UTC (rev 69027)
@@ -159,7 +159,7 @@
/* nurb_eval.c */
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 void nmg_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,
const struct knot_vector
*k_vec, int k_index, int coords);
@@ -175,9 +175,9 @@
RT_EXPORT extern void rt_nurb_kvmult(struct knot_vector *new_kv,
const struct knot_vector *kv,
int num, fastf_t val, struct resource
*res);
-RT_EXPORT extern void rt_nurb_kvgen(struct knot_vector *kv,
+RT_EXPORT extern void nmg_nurb_kvgen(struct knot_vector *kv,
fastf_t lower, fastf_t upper, int num,
struct resource *res);
-RT_EXPORT extern void rt_nurb_kvmerge(struct knot_vector *new_knots,
+RT_EXPORT extern void nmg_nurb_kvmerge(struct knot_vector *new_knots,
const struct knot_vector *kv1,
const struct knot_vector *kv2,
struct resource *res);
RT_EXPORT extern int rt_nurb_kvcheck(fastf_t val, const struct knot_vector
*kv);
@@ -225,7 +225,7 @@
plane_t plane1,
plane_t plane2, double uv_tol, struct resource *res, struct bu_list *plist);
/* nurb_refine.c */
-RT_EXPORT extern struct face_g_snurb *rt_nurb_s_refine(const struct
face_g_snurb *srf,
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_s_refine(const struct
face_g_snurb *srf,
int dir, struct
knot_vector *kv, struct resource *res);
RT_EXPORT extern struct edge_g_cnurb *rt_nurb_c_refine(const struct
edge_g_cnurb * crv,
struct knot_vector
*kv);
@@ -257,8 +257,8 @@
int n_pts, int
pt_type);
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 nmg_nurb_c_print(const struct edge_g_cnurb *crv);
+RT_EXPORT extern void nmg_nurb_s_print(char *c, const struct face_g_snurb
*srf);
RT_EXPORT extern void rt_nurb_pr_kv(const struct knot_vector *kv);
RT_EXPORT extern void rt_nurb_pr_mesh(const struct face_g_snurb *m);
RT_EXPORT extern void rt_nurb_print_pt_type(int c);
Modified: brlcad/trunk/src/conv/dxf/dxf-g.c
===================================================================
--- brlcad/trunk/src/conv/dxf/dxf-g.c 2016-10-11 20:38:19 UTC (rev 69026)
+++ brlcad/trunk/src/conv/dxf/dxf-g.c 2016-10-11 21:04:01 UTC (rev 69027)
@@ -2843,7 +2843,7 @@
startParam = knots[0];
stopParam = knots[numKnots-1];
paramDelta = (stopParam - startParam) / (double)splineSegs;
- rt_nurb_c_eval(crv, startParam, pt);
+ nmg_nurb_c_eval(crv, startParam, pt);
for (i = 0; i < splineSegs; i++) {
fastf_t param = startParam + paramDelta * (i+1);
eu = nmg_me(v1, v2, layers[curr_layer]->s);
@@ -2851,7 +2851,7 @@
if (i == 0) {
nmg_vertex_gv(v1, pt);
}
- rt_nurb_c_eval(crv, param, pt);
+ nmg_nurb_c_eval(crv, param, pt);
v2 = eu->eumate_p->vu_p->v_p;
nmg_vertex_gv(v2, pt);
Modified: brlcad/trunk/src/conv/iges/trimsurf.c
===================================================================
--- brlcad/trunk/src/conv/iges/trimsurf.c 2016-10-11 20:38:19 UTC (rev
69026)
+++ brlcad/trunk/src/conv/iges/trimsurf.c 2016-10-11 21:04:01 UTC (rev
69027)
@@ -453,7 +453,7 @@
VSET(end, y+u_translation, x+v_translation, z);
/* build edge_g_cnurb arc */
- crv = rt_arc2d_to_cnurb(center, start, end, RT_NURB_PT_UV, &tol);
+ crv = nmg_arc2d_to_cnurb(center, start, end, RT_NURB_PT_UV, &tol);
/* apply transformation to control points */
for (i = 0; i < crv->c_size; i++) {
@@ -602,7 +602,7 @@
VSET(end, x+u_translation, y+v_translation, z);
/* build edge_g_cnurb circle */
- crv = rt_arc2d_to_cnurb(center, start, end, RT_NURB_PT_UV, &tol);
+ crv = nmg_arc2d_to_cnurb(center, start, end, RT_NURB_PT_UV, &tol);
/* split circle into two pieces */
BU_LIST_INIT(&curv_hd);
Modified: brlcad/trunk/src/librt/nurb_example.c
===================================================================
--- brlcad/trunk/src/librt/nurb_example.c 2016-10-11 20:38:19 UTC (rev
69026)
+++ brlcad/trunk/src/librt/nurb_example.c 2016-10-11 21:04:01 UTC (rev
69027)
@@ -53,8 +53,8 @@
/* lets take a look at it. Refine to 100 points in both directions. */
rt_nurb_kvknot(&new_kv, srf.order[0], 0.0, 1.0, 100, (struct resource
*)NULL);
- srf2 = (struct face_g_snurb *) rt_nurb_s_refine(&srf, 0, &new_kv, (struct
resource *)NULL);
- srf3 = (struct face_g_snurb *) rt_nurb_s_refine(srf2, 1, &new_kv, (struct
resource *)NULL);
+ srf2 = (struct face_g_snurb *) nmg_nurb_s_refine(&srf, 0, &new_kv, (struct
resource *)NULL);
+ srf3 = (struct face_g_snurb *) nmg_nurb_s_refine(srf2, 1, &new_kv, (struct
resource *)NULL);
/* Draw refined mesh in yellow */
pl_color(stdout, 200, 200, 50);
Modified: brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/bspline.cpp 2016-10-11
20:38:19 UTC (rev 69026)
+++ brlcad/trunk/src/librt/primitives/bspline/bspline.cpp 2016-10-11
21:04:01 UTC (rev 69027)
@@ -308,7 +308,7 @@
for (; nurb != (struct nurb_specific *)0; nurb = nurb->next) {
/* XXX There is a linked list of Bezier surfaces to print here too */
- rt_nurb_s_print("NURB", nurb->srf);
+ nmg_nurb_s_print("NURB", nurb->srf);
}
#endif /* CONVERT_TO_BREP */
}
@@ -643,13 +643,13 @@
if (tkv2.k_size > n->v.k_size) {
- r = (struct face_g_snurb *) rt_nurb_s_refine(n, RT_NURB_SPLIT_COL,
&tkv2, (struct resource *)NULL);
+ r = (struct face_g_snurb *) nmg_nurb_s_refine(n, RT_NURB_SPLIT_COL,
&tkv2, (struct resource *)NULL);
refined_col = 1;
} else {
r = n;
}
if (tkv1.k_size > r->u.k_size) {
- c = (struct face_g_snurb *) rt_nurb_s_refine(r, RT_NURB_SPLIT_ROW,
&tkv1, (struct resource *)NULL);
+ c = (struct face_g_snurb *) nmg_nurb_s_refine(r, RT_NURB_SPLIT_ROW,
&tkv1, (struct resource *)NULL);
refined_row = 1;
} else {
c = r;
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c 2016-10-11
20:38:19 UTC (rev 69026)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c 2016-10-11
21:04:01 UTC (rev 69027)
@@ -76,7 +76,7 @@
if (k_index < 0) {
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);
+ nmg_nurb_s_print("", srf);
bu_bomb("nmg_nurb_s_eval: u value outside parameter range\n");
}
@@ -107,7 +107,7 @@
if (k_index < 0) {
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);
+ nmg_nurb_s_print("", srf);
bu_bomb("nmg_nurb_s_eval: v value outside parameter range\n");
}
@@ -122,7 +122,7 @@
void
-rt_nurb_c_eval(const struct edge_g_cnurb *crv, fastf_t param, fastf_t
*final_value)
+nmg_nurb_c_eval(const struct edge_g_cnurb *crv, fastf_t param, fastf_t
*final_value)
{
fastf_t * pnts;
fastf_t * ev_pt;
@@ -135,14 +135,14 @@
k_index = rt_nurb_knot_index(&crv->k, param, crv->order);
if (k_index < 0) {
- bu_log("rt_nurb_c_eval: param value outside parameter range\n");
+ bu_log("nmg_nurb_c_eval: param value outside parameter range\n");
bu_log("\tparam = (%g)\n", param);
- rt_nurb_c_print(crv);
- bu_bomb("rt_nurb_c_eval: param value outside parameter range\n");
+ nmg_nurb_c_print(crv);
+ bu_bomb("nmg_nurb_c_eval: param value outside parameter range\n");
}
pnts = (fastf_t *) bu_malloc(coords * sizeof(fastf_t) *
- crv->c_size, "diff: rt_nurb_c_eval");
+ crv->c_size, "diff: nmg_nurb_c_eval");
for (i = 0; i < coords * crv->c_size; i++)
pnts[i] = crv->ctl_points[i];
@@ -153,7 +153,7 @@
for (i = 0; i < coords; i++)
final_value[i] = ev_pt[i];
- bu_free((char *) pnts, "rt_nurb_c_eval");
+ bu_free((char *) pnts, "nmg_nurb_c_eval");
}
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_knot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_knot.c 2016-10-11
20:38:19 UTC (rev 69026)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_knot.c 2016-10-11
21:04:01 UTC (rev 69027)
@@ -104,7 +104,7 @@
for (i = 0; i < num - n; i++)
check.knots[i] = val;
- rt_nurb_kvmerge(new_kv, &check, kv, res);
+ nmg_nurb_kvmerge(new_kv, &check, kv, res);
/* free up old knot values */
bu_free((char *)check.knots, "rt_nurb_kvmult:check knots");
@@ -112,13 +112,13 @@
/**
- * rt_nurb_kvgen()
+ * nmg_nurb_kvgen()
*
* Generate a knot vector with num knots from lower value to the upper
* value.
*/
void
-rt_nurb_kvgen(register struct knot_vector *kv, fastf_t lower, fastf_t upper,
int num, struct resource *res)
+nmg_nurb_kvgen(register struct knot_vector *kv, fastf_t lower, fastf_t upper,
int num, struct resource *res)
{
register int i;
register fastf_t inc;
@@ -130,7 +130,7 @@
kv->k_size = num;
kv->knots = (fastf_t *) bu_malloc (sizeof(fastf_t) * num,
- "rt_nurb_kvgen: kv knots");
+ "nmg_nurb_kvgen: kv knots");
for (i = 1; i <= num; i++)
kv->knots[i-1] = lower + i * inc;
@@ -138,13 +138,13 @@
/**
- * rt_nurb_kvmerge()
+ * nmg_nurb_kvmerge()
*
* Merge two knot vectors together and return the new resulting knot
* vector.
*/
void
-rt_nurb_kvmerge(struct knot_vector *new_knots, const struct knot_vector *kv1,
const struct knot_vector *kv2, struct resource *res)
+nmg_nurb_kvmerge(struct knot_vector *new_knots, const struct knot_vector *kv1,
const struct knot_vector *kv2, struct resource *res)
{
int kv1_ptr = 0;
int kv2_ptr = 0;
@@ -156,7 +156,7 @@
new_knots->knots = (fastf_t *) bu_malloc(
sizeof (fastf_t) * new_knots->k_size,
- "rt_nurb_kvmerge: new knot values");
+ "nmg_nurb_kvmerge: new knot values");
for (new_ptr = 0; new_ptr < new_knots->k_size; new_ptr++) {
if (kv1_ptr >= kv1->k_size)
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c 2016-10-11
20:38:19 UTC (rev 69026)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c 2016-10-11
21:04:01 UTC (rev 69027)
@@ -292,7 +292,7 @@
knot_vec = (fastf_t *)bu_calloc(maxorder * 2, sizeof(fastf_t), "knot
vector");
/* Build the new knot vector in a local array, which gets copied
- * later in rt_nurb_s_refine(). */
+ * later in nmg_nurb_s_refine(). */
new_knots.knots = &knot_vec[0];
if (dir == RT_NURB_SPLIT_ROW) {
@@ -311,7 +311,7 @@
}
}
- region = rt_nurb_s_refine(srf, dir, &new_knots, res);
+ region = nmg_nurb_s_refine(srf, dir, &new_knots, res);
bu_free(knot_vec, "knot vector");
return region;
@@ -348,7 +348,7 @@
BU_LIST_APPEND(plist, &psrf->l);
if (RT_G_DEBUG & DEBUG_SPLINE)
- rt_nurb_s_print("srf", psrf);
+ nmg_nurb_s_print("srf", psrf);
/* This list starts out with only a single snurb, but more may be
* added on as work progresses.
@@ -369,7 +369,7 @@
dir = (dir == 0)?1:0; /* change direction */
if (RT_G_DEBUG & DEBUG_SPLINE)
- rt_nurb_s_print("psrf", psrf);
+ nmg_nurb_s_print("psrf", psrf);
rt_nurb_pbound(psrf, vmin, vmax);
@@ -430,7 +430,7 @@
if (RT_G_DEBUG & DEBUG_SPLINE) {
bu_log("After call to rt_nurb_region_from_srf() (smin=%g,
smax=%g)\n", smin, smax);
- rt_nurb_s_print("psrf", psrf);
+ nmg_nurb_s_print("psrf", psrf);
}
u[0] = psrf->u.knots[0];
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c 2016-10-11
20:38:19 UTC (rev 69026)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c 2016-10-11
21:04:01 UTC (rev 69027)
@@ -42,7 +42,7 @@
* Returns a refined surface. The original surface is unmodified.
*/
struct face_g_snurb *
-rt_nurb_s_refine(const struct face_g_snurb *srf, int dir, struct knot_vector
*kv, struct resource *res)
+nmg_nurb_s_refine(const struct face_g_snurb *srf, int dir, struct knot_vector
*kv, struct resource *res)
/* Old surface to be refined */
/* Direction to refine */
/* Row = 0, Col = 1 */
@@ -72,7 +72,7 @@
nurb_srf->s_size[0] *
nurb_srf->s_size[1] *
RT_NURB_EXTRACT_COORDS(nurb_srf->pt_type),
- "rt_nurb_s_refine: row mesh control points");
+ "nmg_nurb_s_refine: row mesh control points");
oslo = (struct oslo_mat *)
rt_nurb_calc_oslo (srf -> order[RT_NURB_SPLIT_ROW], &srf->u, kv,
res);
@@ -114,7 +114,7 @@
nurb_srf->s_size[0] *
nurb_srf->s_size[1] *
RT_NURB_EXTRACT_COORDS(nurb_srf->pt_type),
- "rt_nurb_s_refine: row mesh control points");
+ "nmg_nurb_s_refine: row mesh control points");
oslo = (struct oslo_mat *)
rt_nurb_calc_oslo (srf->order[RT_NURB_SPLIT_COL], &srf->v, kv, res);
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_util.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_util.c 2016-10-11
20:38:19 UTC (rev 69026)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_util.c 2016-10-11
21:04:01 UTC (rev 69027)
@@ -178,7 +178,7 @@
void
-rt_nurb_c_print(const struct edge_g_cnurb *crv)
+nmg_nurb_c_print(const struct edge_g_cnurb *crv)
{
register fastf_t * ptr;
int i, j;
@@ -211,7 +211,7 @@
void
-rt_nurb_s_print(char *c, const struct face_g_snurb *srf)
+nmg_nurb_s_print(char *c, const struct face_g_snurb *srf)
{
bu_log("%s\n", c);
Modified: brlcad/trunk/src/librt/primitives/extrude/extrude.c
===================================================================
--- brlcad/trunk/src/librt/primitives/extrude/extrude.c 2016-10-11 20:38:19 UTC
(rev 69026)
+++ brlcad/trunk/src/librt/primitives/extrude/extrude.c 2016-10-11 21:04:01 UTC
(rev 69027)
@@ -1642,7 +1642,7 @@
V2MOVE(&eg.ctl_points[i*coords],
skt->verts[nsg->ctl_points[i]]);
}
}
- rt_nurb_c_eval(&eg, (nsg->k.knots[nsg->k.k_size-1] -
nsg->k.knots[0]) * 0.5, tmp_pt);
+ nmg_nurb_c_eval(&eg, (nsg->k.knots[nsg->k.k_size-1] -
nsg->k.knots[0]) * 0.5, tmp_pt);
if (RT_NURB_IS_PT_RATIONAL(nsg->pt_type)) {
int j;
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-11 20:38:19 UTC
(rev 69026)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2016-10-11 21:04:01 UTC
(rev 69027)
@@ -371,7 +371,7 @@
if (RTG.NMG_debug & DEBUG_MESH) {
bu_log("nmg_cnurb_is_linear(%p)\n", (void *)cnrb);
- rt_nurb_c_print(cnrb);
+ nmg_nurb_c_print(cnrb);
}
if (cnrb->order <= 0) {
@@ -435,7 +435,7 @@
if (RTG.NMG_debug & DEBUG_MESH) {
bu_log("nmg_snurb_is_planar(%p)\n", (void *)srf);
- rt_nurb_s_print("", srf);
+ nmg_nurb_s_print("", srf);
}
if (srf->order[0] == 2 && srf->order[1] == 2) {
@@ -533,7 +533,7 @@
} else {
bu_log("nmg_snurb_is_plana: Cannot calculate plane for snurb %p\n",
(void *)srf);
- rt_nurb_s_print("", srf);
+ nmg_nurb_s_print("", srf);
bu_bomb("nmg_snurb_is_plana: Cannot calculate plane for snurb\n");
}
}
@@ -598,7 +598,7 @@
NMG_CK_FACE_G_SNURB(snrb);
}
- rt_nurb_c_eval(cnrb, t, uvw);
+ nmg_nurb_c_eval(cnrb, t, uvw);
if (RT_NURB_IS_PT_RATIONAL(cnrb->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:38:19 UTC
(rev 69026)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2016-10-11 21:04:01 UTC
(rev 69027)
@@ -119,7 +119,7 @@
t = t1 + (t2 - t1) * 0.2 * (fastf_t)i;
VSETALLN(crv_pt, 0.0, coords);
- rt_nurb_c_eval(eg, t, crv_pt);
+ nmg_nurb_c_eval(eg, t, crv_pt);
if (RT_NURB_IS_PT_RATIONAL(eg->pt_type)) {
VSCALE(pts[edge_no], crv_pt, crv_pt[coords-1]);
} else {
@@ -8589,7 +8589,7 @@
* list.
*/
struct edge_g_cnurb *
-rt_join_cnurbs(struct bu_list *crv_head)
+nmg_join_cnurbs(struct bu_list *crv_head)
{
struct edge_g_cnurb *crv, *next_crv;
struct edge_g_cnurb *new_crv=(struct edge_g_cnurb *)NULL;
@@ -8612,7 +8612,7 @@
*/
for (BU_LIST_FOR (crv, edge_g_cnurb, crv_head)) {
curve_count++;
- rt_nurb_c_print(crv);
+ nmg_nurb_c_print(crv);
if (crv->order > max_order)
max_order = crv->order;
@@ -8620,7 +8620,7 @@
while (ZERO(crv->k.knots[++i] - crv->k.knots[0]));
if (i != crv->order) {
bu_log("Curve does not have multiplicity equal to order at
start:\n");
- rt_nurb_c_print(crv);
+ nmg_nurb_c_print(crv);
return new_crv;
}
@@ -8628,7 +8628,7 @@
while (ZERO(crv->k.knots[--i] - crv->k.knots[crv->k.k_size - 1]));
if (crv->k.k_size - i - 1 != crv->order) {
bu_log("Curve does not have multiplicity equal to order at end:\n");
- rt_nurb_c_print(crv);
+ nmg_nurb_c_print(crv);
return new_crv;
}
@@ -8636,7 +8636,7 @@
pt_type = crv->pt_type;
else {
if (crv->pt_type != pt_type) {
- bu_log("rt_join_cnurbs: curves are not the same pt_type (%d vs
%d)\n",
+ bu_log("nmg_join_cnurbs: curves are not the same pt_type (%d vs
%d)\n",
pt_type, crv->pt_type);
return new_crv;
}
@@ -8657,7 +8657,7 @@
/* This curve must have its order raised to max_order */
/* XXXX Need a routine to raise order of a curve */
- bu_bomb("rt_join_cnurbs: Need to raise order of curve\n");
+ bu_bomb("nmg_join_cnurbs: Need to raise order of curve\n");
}
/* Check that endpoints match */
@@ -8687,9 +8687,9 @@
continue;
}
- bu_log("rt_join_cnurbs: Curve endpoints do not match:\n");
- rt_nurb_c_print(crv);
- rt_nurb_c_print(next_crv);
+ bu_log("nmg_join_cnurbs: Curve endpoints do not match:\n");
+ nmg_nurb_c_print(crv);
+ nmg_nurb_c_print(next_crv);
return new_crv;
}
@@ -8756,7 +8756,7 @@
* the +Z direction).
*/
struct edge_g_cnurb *
-rt_arc2d_to_cnurb(fastf_t *i_center, fastf_t *i_start, fastf_t *i_end, int
point_type, const struct bn_tol *tol)
+nmg_arc2d_to_cnurb(fastf_t *i_center, fastf_t *i_start, fastf_t *i_end, int
point_type, const struct bn_tol *tol)
{
struct edge_g_cnurb *crv;
struct bu_list crv_head;
@@ -8802,19 +8802,19 @@
if (point_type == RT_NURB_PT_XYZ) {
/* check for points at same Z-coordinate value */
if (center[Z] - start[Z] > tol->dist) {
- bu_log("rt_arc2d_to_cnurb: center and start points not at same Z
value (%g vs %g)\n",
+ bu_log("nmg_arc2d_to_cnurb: center and start points not at same Z
value (%g vs %g)\n",
center[Z], start[Z]);
return (struct edge_g_cnurb *)NULL;
}
if (end[Z] - start[Z] > tol->dist) {
- bu_log("rt_arc2d_to_cnurb: end and start points not at same Z value
(%g vs %g)\n",
+ bu_log("nmg_arc2d_to_cnurb: end and start points not at same Z
value (%g vs %g)\n",
end[Z], start[Z]);
return (struct edge_g_cnurb *)NULL;
}
if (end[Z] - center[Z] > tol->dist) {
- bu_log("rt_arc2d_to_cnurb: end and center points not at same Z
value (%g vs %g)\n",
+ bu_log("nmg_arc2d_to_cnurb: end and center points not at same Z
value (%g vs %g)\n",
end[Z], center[Z]);
return (struct edge_g_cnurb *)NULL;
}
@@ -8838,7 +8838,7 @@
/* make sure radii are consistent */
if (!NEAR_EQUAL(radius, tmp_radius, tol->dist)) {
- bu_log("rt_arc2d_to_cnurb: distances from center to start and center to
end are different\n");
+ bu_log("nmg_arc2d_to_cnurb: distances from center to start and center
to end are different\n");
bu_log(" (%g and %g)\n", radius, tmp_radius);
return (struct edge_g_cnurb *)NULL;
}
@@ -8869,7 +8869,7 @@
if (VDOT(t2, v1) > 0.0)
VREVERSE(t2, t2);
if ((ret_val=bn_isect_line3_line3(&dist1, &dist2, start, t1, end, t2,
tol)) < 1) {
- bu_log("rt_arc2d_to_cnurb: Cannot calculate second control
point\n");
+ bu_log("nmg_arc2d_to_cnurb: Cannot calculate second control
point\n");
bu_log(" bn_isect_line3_line3 returns %d\n",
ret_val);
return (struct edge_g_cnurb *)NULL;
}
@@ -8933,12 +8933,12 @@
VJOIN2(end1, center, radius*cos(angles[i]), ref1,
radius*sin(angles[i]), ref2);
}
- crv = rt_arc2d_to_cnurb(center, start1, end1, point_type, tol);
+ crv = nmg_arc2d_to_cnurb(center, start1, end1, point_type, tol);
BU_LIST_INSERT(&crv_head, &crv->l);
}
/* join the arc segments into one edge_g_cnurb */
- crv = rt_join_cnurbs(&crv_head);
+ crv = nmg_join_cnurbs(&crv_head);
return crv;
}
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-11 20:38:19 UTC
(rev 69026)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c 2016-10-11 21:04:01 UTC
(rev 69027)
@@ -2174,22 +2174,22 @@
BU_CK_LIST_HEAD(vhead);
NMG_CK_FACE_G_SNURB(fg);
- rt_nurb_kvgen(&tkv1,
+ nmg_nurb_kvgen(&tkv1,
fg->u.knots[0],
fg->u.knots[fg->u.k_size-1], n_interior, (struct resource
*)NULL);
- rt_nurb_kvgen(&tkv2,
+ nmg_nurb_kvgen(&tkv2,
fg->v.knots[0],
fg->v.knots[fg->v.k_size-1], n_interior, (struct resource
*)NULL);
- rt_nurb_kvmerge(&tau1, &tkv1, &fg->u, (struct resource *)NULL);
- rt_nurb_kvmerge(&tau2, &tkv2, &fg->v, (struct resource *)NULL);
+ nmg_nurb_kvmerge(&tau1, &tkv1, &fg->u, (struct resource *)NULL);
+ nmg_nurb_kvmerge(&tau2, &tkv2, &fg->v, (struct resource *)NULL);
/** nmg_hack_snurb(&n, fg); / XXX */
- r = rt_nurb_s_refine(fg, RT_NURB_SPLIT_COL, &tau2, (struct resource
*)NULL);
+ r = nmg_nurb_s_refine(fg, RT_NURB_SPLIT_COL, &tau2, (struct resource
*)NULL);
NMG_CK_SNURB(r);
- c = rt_nurb_s_refine(r, RT_NURB_SPLIT_ROW, &tau1, (struct resource *)NULL);
+ c = nmg_nurb_s_refine(r, RT_NURB_SPLIT_ROW, &tau1, (struct resource
*)NULL);
NMG_CK_SNURB(c);
coords = RT_NURB_EXTRACT_COORDS(c->pt_type);
@@ -2330,7 +2330,7 @@
if (coords != 2 && !RT_NURB_IS_PT_RATIONAL(c->pt_type))
bu_log("nmg_cnurb_to_vlist() coords=%d\n", coords);
s = fu->f_p->g.snurb_p;
- /* This section uses rt_nurb_c_eval(), but rt_nurb_c_refine is likely
faster.
+ /* This section uses nmg_nurb_c_eval(), but rt_nurb_c_refine is likely
faster.
* XXXX Need a way to selectively and recursively refine curve to avoid
* feeding nmg_nurb_s_eval() parameters outside domain of surface.
*/
@@ -2344,7 +2344,7 @@
VSETALL(uvw, 0);
- rt_nurb_c_eval(c, crv_param, uvw);
+ nmg_nurb_c_eval(c, crv_param, uvw);
if (RT_NURB_IS_PT_RATIONAL(c->pt_type)) {
uvw[0] = uvw[0]/uvw[2];
Modified: brlcad/trunk/src/librt/primitives/sketch/sketch.c
===================================================================
--- brlcad/trunk/src/librt/primitives/sketch/sketch.c 2016-10-11 20:38:19 UTC
(rev 69026)
+++ brlcad/trunk/src/librt/primitives/sketch/sketch.c 2016-10-11 21:04:01 UTC
(rev 69027)
@@ -737,7 +737,7 @@
int j;
t = nsg->k.knots[0] + i*param_delta;
- rt_nurb_c_eval(&eg, t, pt);
+ nmg_nurb_c_eval(&eg, t, pt);
if (RT_NURB_IS_PT_RATIONAL(nsg->pt_type)) {
for (j=0; j<coords-1; j++)
pt[j] /= pt[coords-1];
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
