Revision: 58832
http://sourceforge.net/p/brlcad/code/58832
Author: starseeker
Date: 2013-12-05 20:49:57 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Strip bn_ prefix off of coplanar functions, since they turned out to be private
after all.
Modified Paths:
--------------
brlcad/trunk/src/libbn/bn_private.h
brlcad/trunk/src/libbn/chull.c
brlcad/trunk/src/libbn/obr.c
brlcad/trunk/src/libbn/util.c
Modified: brlcad/trunk/src/libbn/bn_private.h
===================================================================
--- brlcad/trunk/src/libbn/bn_private.h 2013-12-05 19:00:46 UTC (rev 58831)
+++ brlcad/trunk/src/libbn/bn_private.h 2013-12-05 20:49:57 UTC (rev 58832)
@@ -41,7 +41,7 @@
* @return 0 if successful
*/
int
-bn_coplanar_2d_coord_sys(point_t *origin_pnt, vect_t *u_axis, vect_t *v_axis,
const point_t *points_3d, int n);
+coplanar_2d_coord_sys(point_t *origin_pnt, vect_t *u_axis, vect_t *v_axis,
const point_t *points_3d, int n);
/**
* @brief
@@ -56,7 +56,7 @@
* @return 0 if successful
*/
int
-bn_coplanar_3d_to_2d(point2d_t **points_2d, const point_t *origin_pnt,
+coplanar_3d_to_2d(point2d_t **points_2d, const point_t *origin_pnt,
const vect_t *u_axis, const vect_t *v_axis,
const point_t *points_3d, int n);
@@ -73,7 +73,7 @@
* @return 0 if successful
*/
int
-bn_coplanar_2d_to_3d(point_t **points_3d, const point_t *origin_pnt,
+coplanar_2d_to_3d(point_t **points_3d, const point_t *origin_pnt,
const vect_t *u_axis, const vect_t *v_axis,
const point2d_t *points_2d, int n);
Modified: brlcad/trunk/src/libbn/chull.c
===================================================================
--- brlcad/trunk/src/libbn/chull.c 2013-12-05 19:00:46 UTC (rev 58831)
+++ brlcad/trunk/src/libbn/chull.c 2013-12-05 20:49:57 UTC (rev 58832)
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include "bn.h"
-#include "bn_private.h"
+#include "./bn_private.h"
/* isLeft(): test if a point is Left|On|Right of an infinite line.
* Input: three points L0, L1, and p
@@ -146,12 +146,12 @@
point2d_t *hull_2d = (point2d_t *)bu_malloc(sizeof(point2d_t *), "hull
pointer");
point2d_t *points_tmp = (point2d_t *)bu_calloc(n + 1, sizeof(point2d_t),
"points_2d");
- ret += bn_coplanar_2d_coord_sys(&origin_pnt, &u_axis, &v_axis, points_3d,
n);
- ret += bn_coplanar_3d_to_2d(&points_tmp, (const point_t *)&origin_pnt,
(const vect_t *)&u_axis, (const vect_t *)&v_axis, points_3d, n);
+ ret += coplanar_2d_coord_sys(&origin_pnt, &u_axis, &v_axis, points_3d, n);
+ ret += coplanar_3d_to_2d(&points_tmp, (const point_t *)&origin_pnt, (const
vect_t *)&u_axis, (const vect_t *)&v_axis, points_3d, n);
if (ret) return 0;
hull_cnt = bn_2d_chull(&hull_2d, (const point2d_t *)points_tmp, n);
(*hull) = (point_t *)bu_calloc(hull_cnt + 1, sizeof(point_t), "hull
array");
- ret = bn_coplanar_2d_to_3d(hull, (const point_t *)&origin_pnt, (const
vect_t *)&u_axis, (const vect_t *)&v_axis, (const point2d_t *)hull_2d,
hull_cnt);
+ ret = coplanar_2d_to_3d(hull, (const point_t *)&origin_pnt, (const vect_t
*)&u_axis, (const vect_t *)&v_axis, (const point2d_t *)hull_2d, hull_cnt);
if (ret) return 0;
return hull_cnt;
}
Modified: brlcad/trunk/src/libbn/obr.c
===================================================================
--- brlcad/trunk/src/libbn/obr.c 2013-12-05 19:00:46 UTC (rev 58831)
+++ brlcad/trunk/src/libbn/obr.c 2013-12-05 20:49:57 UTC (rev 58832)
@@ -56,7 +56,7 @@
#include <stdlib.h>
#include "bn.h"
-#include "bn_private.h"
+#include "./bn_private.h"
#define F_NONE -1
#define F_BOTTOM 0
@@ -507,8 +507,8 @@
points_obr_3d = (point_t *)bu_calloc(3 + 1, sizeof(point_t), "points_3d");
points_tmp = (point2d_t *)bu_calloc(pnt_cnt + 1, sizeof(point2d_t),
"points_2d");
- ret += bn_coplanar_2d_coord_sys(&origin_pnt, &u_axis, &v_axis, pnts,
pnt_cnt);
- ret += bn_coplanar_3d_to_2d(&points_tmp, (const point_t *)&origin_pnt,
(const vect_t *)&u_axis, (const vect_t *)&v_axis, pnts, pnt_cnt);
+ ret += coplanar_2d_coord_sys(&origin_pnt, &u_axis, &v_axis, pnts, pnt_cnt);
+ ret += coplanar_3d_to_2d(&points_tmp, (const point_t *)&origin_pnt, (const
vect_t *)&u_axis, (const vect_t *)&v_axis, pnts, pnt_cnt);
if (ret) return 0;
ret = bn_2d_obr(&obr_2d_center, &obr_2d_v1, &obr_2d_v2, (const point2d_t
*)points_tmp, pnt_cnt);
@@ -517,7 +517,7 @@
V2ADD2(points_obr[1], obr_2d_v1, obr_2d_center);
V2ADD2(points_obr[2], obr_2d_v2, obr_2d_center);
- ret = bn_coplanar_2d_to_3d(&points_obr_3d, (const point_t *)&origin_pnt,
(const vect_t *)&u_axis, (const vect_t *)&v_axis, (const point2d_t
*)points_obr, 3);
+ ret = coplanar_2d_to_3d(&points_obr_3d, (const point_t *)&origin_pnt,
(const vect_t *)&u_axis, (const vect_t *)&v_axis, (const point2d_t
*)points_obr, 3);
VMOVE(*center, points_obr_3d[0]);
Modified: brlcad/trunk/src/libbn/util.c
===================================================================
--- brlcad/trunk/src/libbn/util.c 2013-12-05 19:00:46 UTC (rev 58831)
+++ brlcad/trunk/src/libbn/util.c 2013-12-05 20:49:57 UTC (rev 58832)
@@ -23,7 +23,7 @@
#include "bn.h"
int
-bn_coplanar_2d_coord_sys(point_t *origin_pnt, vect_t *u_axis, vect_t *v_axis,
const point_t *points_3d, int n)
+coplanar_2d_coord_sys(point_t *origin_pnt, vect_t *u_axis, vect_t *v_axis,
const point_t *points_3d, int n)
{
int i = 0;
int have_normal = 0;
@@ -87,7 +87,7 @@
int
-bn_coplanar_3d_to_2d(point2d_t **points_2d, const point_t *origin_pnt,
+coplanar_3d_to_2d(point2d_t **points_2d, const point_t *origin_pnt,
const vect_t *u_axis, const vect_t *v_axis,
const point_t *points_3d, int n)
{
@@ -108,7 +108,7 @@
int
-bn_coplanar_2d_to_3d(point_t **points_3d, const point_t *origin_pnt,
+coplanar_2d_to_3d(point_t **points_3d, const point_t *origin_pnt,
const vect_t *u_axis, const vect_t *v_axis,
const point2d_t *points_2d, int n)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
