[brlcad-commits] SF.net SVN: brlcad:[44870] brlcad/trunk/src/librt

[<br...@us...>]

Revision: 44870
          http://brlcad.svn.sourceforge.net/brlcad/?rev=44870&view=rev
Author:   brlcad
Date:     2011-06-09 12:43:06 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
rename rt_ell_ang() to ell_angle().  it's not public librt API, so it shouldn't have the rt_ prefix.  ell_ prefix is appropriate living in ell.c and given what it does.

Modified Paths:
--------------
    brlcad/trunk/src/librt/librt_private.h
    brlcad/trunk/src/librt/primitives/ehy/ehy.c
    brlcad/trunk/src/librt/primitives/ell/ell.c
    brlcad/trunk/src/librt/primitives/epa/epa.c
    brlcad/trunk/src/librt/primitives/hyp/hyp.c

Modified: brlcad/trunk/src/librt/librt_private.h
===================================================================
--- brlcad/trunk/src/librt/librt_private.h	2011-06-09 12:34:21 UTC (rev 44869)
+++ brlcad/trunk/src/librt/librt_private.h	2011-06-09 12:43:06 UTC (rev 44870)
@@ -69,7 +69,7 @@
  * for ellipse.  Smallest side is a side with an endpoint at (a, 0, 0)
  * where a is the semi-major axis.
  */
-extern fastf_t rt_ell_ang(fastf_t *p1, fastf_t a, fastf_t b, fastf_t dtol, fastf_t ntol);
+extern fastf_t ell_angle(fastf_t *p1, fastf_t a, fastf_t b, fastf_t dtol, fastf_t ntol);
 
 
 __END_DECLS

Modified: brlcad/trunk/src/librt/primitives/ehy/ehy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ehy/ehy.c	2011-06-09 12:34:21 UTC (rev 44869)
+++ brlcad/trunk/src/librt/primitives/ehy/ehy.c	2011-06-09 12:43:06 UTC (rev 44870)
@@ -821,7 +821,7 @@
 	VJOIN1(V, xip->ehy_V, -pos_a->p[Z], Hu);
 
 	VSET(p1, 0., pos_b->p[Y], 0.);
-	theta_new = rt_ell_ang(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
+	theta_new = ell_angle(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
 	if (nseg == 0) {
 	    nseg = (int)(bn_twopi / theta_new) + 1;
 	    pts_dbl[i] = 0;
@@ -1123,7 +1123,7 @@
 	VJOIN1(V, xip->ehy_V, -pos_a->p[Z], Hu);
 
 	VSET(p1, 0., pos_b->p[Y], 0.);
-	theta_new = rt_ell_ang(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
+	theta_new = ell_angle(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
 	if (nseg == 0) {
 	    nseg = (int)(bn_twopi / theta_new) + 1;
 	    pts_dbl[i] = 0;

Modified: brlcad/trunk/src/librt/primitives/ell/ell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ell/ell.c	2011-06-09 12:34:21 UTC (rev 44869)
+++ brlcad/trunk/src/librt/primitives/ell/ell.c	2011-06-09 12:43:06 UTC (rev 44870)
@@ -1680,7 +1680,7 @@
  * Used by EHY, EPA, HYP.  See librt_private.h for details.
  */
 fastf_t
-rt_ell_ang(fastf_t *p1, fastf_t a, fastf_t b, fastf_t dtol, fastf_t ntol)
+ell_angle(fastf_t *p1, fastf_t a, fastf_t b, fastf_t dtol, fastf_t ntol)
 {
     fastf_t dist, intr, m, theta0, theta1;
     point_t mpt, p0;
@@ -1708,7 +1708,7 @@
     /* split segment at widest point if not within error tolerances */
     if (dist > dtol || theta0 > ntol || theta1 > ntol) {
 	/* split segment */
-	return rt_ell_ang(mpt, a, b, dtol, ntol);
+	return ell_angle(mpt, a, b, dtol, ntol);
     } else
 	return(acos(VDOT(p0, p1)
 		    / (MAGNITUDE(p0) * MAGNITUDE(p1))));

Modified: brlcad/trunk/src/librt/primitives/epa/epa.c
===================================================================
--- brlcad/trunk/src/librt/primitives/epa/epa.c	2011-06-09 12:34:21 UTC (rev 44869)
+++ brlcad/trunk/src/librt/primitives/epa/epa.c	2011-06-09 12:43:06 UTC (rev 44870)
@@ -161,9 +161,6 @@
 #include "../../librt_private.h"
 
 
-extern fastf_t rt_ell_ang(fastf_t *, fastf_t, fastf_t, fastf_t, fastf_t);
-
-
 struct epa_specific {
     point_t epa_V;		/* vector to epa origin */
     vect_t epa_Hunit;		/* unit H vector */
@@ -798,7 +795,7 @@
 	VJOIN1(V, xip->epa_V, -pos_a->p[Z], Hu);
 
 	VSET(p1, 0., pos_b->p[Y], 0.);
-	theta_new = rt_ell_ang(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
+	theta_new = ell_angle(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
 	if (nseg == 0) {
 	    nseg = (int)(bn_twopi / theta_new) + 1;
 	    pts_dbl[i] = 0;
@@ -1139,7 +1136,7 @@
 	VJOIN1(V, xip->epa_V, -pos_a->p[Z], Hu);
 
 	VSET(p1, 0., pos_b->p[Y], 0.);
-	theta_new = rt_ell_ang(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
+	theta_new = ell_angle(p1, pos_a->p[Y], pos_b->p[Y], dtol, ntol);
 	if (nseg == 0) {
 	    nseg = (int)(bn_twopi / theta_new) + 1;
 	    pts_dbl[i] = 0;

Modified: brlcad/trunk/src/librt/primitives/hyp/hyp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hyp/hyp.c	2011-06-09 12:34:21 UTC (rev 44869)
+++ brlcad/trunk/src/librt/primitives/hyp/hyp.c	2011-06-09 12:43:06 UTC (rev 44870)
@@ -883,7 +883,7 @@
 	VJOIN1(V, xip->hyp_V, -pos_a->p[Z], Hu);
 
 	VSET(p1, 0., pos_b->p[Y], 0.);
-	theta_new = rt_ell_ang(p1, pos_a->p[X], pos_b->p[Y], dtol, ntol);
+	theta_new = ell_angle(p1, pos_a->p[X], pos_b->p[Y], dtol, ntol);
 	if (nseg == 0) {
 	    nseg = (int)(bn_twopi / theta_new) + 1;
 	    pts_dbl[i] = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.