Revision: 73033
http://sourceforge.net/p/brlcad/code/73033
Author: brlcad
Date: 2019-05-09 14:57:20 +0000 (Thu, 09 May 2019)
Log Message:
-----------
rename all of the float/double XGLUE with bot_ prefix as they do not need to be
and should not be public API. this also aligns with bottie_ as the alternative.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/bot/bot.c
brlcad/trunk/src/librt/primitives/bot/g_bot_include.c
Modified: brlcad/trunk/src/librt/primitives/bot/bot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bot/bot.c 2019-05-09 14:51:42 UTC (rev
73032)
+++ brlcad/trunk/src/librt/primitives/bot/bot.c 2019-05-09 14:57:20 UTC (rev
73033)
@@ -377,11 +377,11 @@
{
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- return rt_botface_w_normals_float(stp, bot, ap, bp, cp,
- vertex_normals, face_no, tol);
+ return bot_face_w_normals_float(stp, bot, ap, bp, cp,
+ vertex_normals, face_no, tol);
} else {
- return rt_botface_w_normals_double(stp, bot, ap, bp, cp,
- vertex_normals, face_no, tol);
+ return bot_face_w_normals_double(stp, bot, ap, bp, cp,
+ vertex_normals, face_no, tol);
}
}
@@ -409,9 +409,9 @@
const struct bn_tol *tol)
{
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- rt_bot_prep_pieces_float(bot, stp, ntri, tol);
+ bot_prep_pieces_float(bot, stp, ntri, tol);
} else {
- rt_bot_prep_pieces_double(bot, stp, ntri, tol);
+ bot_prep_pieces_double(bot, stp, ntri, tol);
}
}
@@ -496,9 +496,9 @@
if (rt_bot_mintie > 0 && bot_ip->num_faces >= rt_bot_mintie /* FIXME:
(necessary?) && (bot_ip->face_normals != NULL || bot_ip->orientation !=
RT_BOT_UNORIENTED) */)
ret = bottie_prep_double(stp, bot_ip, rtip);
else if (bot_ip->bot_flags & RT_BOT_USE_FLOATS)
- ret = rt_bot_prep_float(stp, bot_ip, rtip);
+ ret = bot_prep_float(stp, bot_ip, rtip);
else
- ret = rt_bot_prep_double(stp, bot_ip, rtip);
+ ret = bot_prep_double(stp, bot_ip, rtip);
#ifdef USE_OPENCL
clt_bot_prep(stp, bot_ip, rtip);
@@ -524,9 +524,9 @@
struct bot_specific *bot)
{
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- return rt_bot_plate_segs_float(hits, nhits, stp, rp, ap, seghead, bot);
+ return bot_plate_segs_float(hits, nhits, stp, rp, ap, seghead, bot);
} else {
- return rt_bot_plate_segs_double(hits, nhits, stp, rp, ap, seghead, bot);
+ return bot_plate_segs_double(hits, nhits, stp, rp, ap, seghead, bot);
}
}
@@ -541,9 +541,9 @@
struct bot_specific *bot)
{
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- return rt_bot_unoriented_segs_float(hits, nhits, stp, rp, ap, seghead);
+ return bot_unoriented_segs_float(hits, nhits, stp, rp, ap, seghead);
} else {
- return rt_bot_unoriented_segs_double(hits, nhits, stp, rp, ap, seghead);
+ return bot_unoriented_segs_double(hits, nhits, stp, rp, ap, seghead);
}
}
@@ -563,9 +563,9 @@
}
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- return rt_bot_makesegs_float(hits, nhits, stp, rp, ap, seghead, psp);
+ return bot_makesegs_float(hits, nhits, stp, rp, ap, seghead, psp);
} else {
- return rt_bot_makesegs_double(hits, nhits, stp, rp, ap, seghead, psp);
+ return bot_makesegs_double(hits, nhits, stp, rp, ap, seghead, psp);
}
}
@@ -597,9 +597,9 @@
if (bot->tie != NULL) {
return bottie_shot_double(stp, rp, ap, seghead);
} else if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- return rt_bot_shot_float(stp, rp, ap, seghead);
+ return bot_shot_float(stp, rp, ap, seghead);
} else {
- return rt_bot_shot_double(stp, rp, ap, seghead);
+ return bot_shot_double(stp, rp, ap, seghead);
}
}
@@ -627,9 +627,9 @@
bot = (struct bot_specific *)stp->st_specific;
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- return rt_bot_piece_shot_float(psp, plp, dist_corr, rp, ap, seghead);
+ return bot_piece_shot_float(psp, plp, dist_corr, rp, ap, seghead);
} else {
- return rt_bot_piece_shot_double(psp, plp, dist_corr, rp, ap, seghead);
+ return bot_piece_shot_double(psp, plp, dist_corr, rp, ap, seghead);
}
}
@@ -710,9 +710,9 @@
}
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- rt_bot_free_float(bot);
+ bot_free_float(bot);
} else {
- rt_bot_free_double(bot);
+ bot_free_double(bot);
}
#ifdef USE_OPENCL
Modified: brlcad/trunk/src/librt/primitives/bot/g_bot_include.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bot/g_bot_include.c 2019-05-09
14:51:42 UTC (rev 73032)
+++ brlcad/trunk/src/librt/primitives/bot/g_bot_include.c 2019-05-09
14:57:20 UTC (rev 73033)
@@ -40,14 +40,14 @@
* Returns # pts (3) if a valid plane resulted.
*/
int
-CPP_XGLUE(rt_botface_w_normals_, TRI_TYPE)(struct soltab *stp,
- struct bot_specific *bot,
- fastf_t *ap,
- fastf_t *bp,
- fastf_t *cp,
- fastf_t *vertex_normals, /* array of
nine values (three unit normals vectors) */
- size_t face_no,
- const struct bn_tol *tol)
+CPP_XGLUE(bot_face_w_normals_, TRI_TYPE)(struct soltab *stp,
+ struct bot_specific *bot,
+ fastf_t *ap,
+ fastf_t *bp,
+ fastf_t *cp,
+ fastf_t *vertex_normals, /* array of
nine values (three unit normals vectors) */
+ size_t face_no,
+ const struct bn_tol *tol)
{
register CPP_XGLUE(tri_specific_, TRI_TYPE) *trip;
vect_t work;
@@ -116,10 +116,10 @@
* Do the prep to support pieces for a BOT/ARS
*/
void
-CPP_XGLUE(rt_bot_prep_pieces_, TRI_TYPE)(struct bot_specific *bot,
- struct soltab *stp,
- size_t ntri,
- const struct bn_tol *tol)
+CPP_XGLUE(bot_prep_pieces_, TRI_TYPE)(struct bot_specific *bot,
+ struct soltab *stp,
+ size_t ntri,
+ const struct bn_tol *tol)
{
struct bound_rpp *minmax = (struct bound_rpp *)NULL;
CPP_XGLUE(tri_specific_, TRI_TYPE) **fap;
@@ -231,7 +231,7 @@
* stp->st_specific for use by bot_shot().
*/
int
-CPP_XGLUE(rt_bot_prep_, TRI_TYPE)(struct soltab *stp, struct rt_bot_internal
*bot_ip, struct rt_i *rtip)
+CPP_XGLUE(bot_prep_, TRI_TYPE)(struct soltab *stp, struct rt_bot_internal
*bot_ip, struct rt_i *rtip)
{
register struct bot_specific *bot;
const struct bn_tol *tol = &rtip->rti_tol;
@@ -362,13 +362,13 @@
static int
-CPP_XGLUE(rt_bot_plate_segs_, TRI_TYPE)(struct hit *hits,
- size_t nhits,
- struct soltab *stp,
- struct xray *rp,
- struct application *ap,
- struct seg *seghead,
- struct bot_specific *bot)
+CPP_XGLUE(bot_plate_segs_, TRI_TYPE)(struct hit *hits,
+ size_t nhits,
+ struct soltab *stp,
+ struct xray *rp,
+ struct application *ap,
+ struct seg *seghead,
+ struct bot_specific *bot)
{
register struct seg *segp;
register size_t i;
@@ -444,12 +444,12 @@
static int
-CPP_XGLUE(rt_bot_unoriented_segs_, TRI_TYPE)(struct hit *hits,
- size_t nhits,
- struct soltab *stp,
- struct xray *rp,
- struct application *ap,
- struct seg *seghead)
+CPP_XGLUE(bot_unoriented_segs_, TRI_TYPE)(struct hit *hits,
+ size_t nhits,
+ struct soltab *stp,
+ struct xray *rp,
+ struct application *ap,
+ struct seg *seghead)
{
register struct seg *segp;
register size_t i, j;
@@ -552,9 +552,9 @@
* this is to be done depends on the mode of the BoT.
*/
HIDDEN int
-CPP_XGLUE(rt_bot_makesegs_, TRI_TYPE)(struct hit *hits, size_t nhits, struct
soltab *stp,
- struct xray *rp, struct application *ap,
- struct seg *seghead, struct rt_piecestate
*psp)
+CPP_XGLUE(bot_makesegs_, TRI_TYPE)(struct hit *hits, size_t nhits, struct
soltab *stp,
+ struct xray *rp, struct application *ap,
+ struct seg *seghead, struct rt_piecestate
*psp)
{
struct bot_specific *bot = (struct bot_specific *)stp->st_specific;
register struct seg *segp;
@@ -1012,7 +1012,7 @@
* >0 HIT
*/
int
-CPP_XGLUE(rt_bot_shot_, TRI_TYPE)(struct soltab *stp, struct xray *rp, struct
application *ap, struct seg *seghead)
+CPP_XGLUE(bot_shot_, TRI_TYPE)(struct soltab *stp, struct xray *rp, struct
application *ap, struct seg *seghead)
{
struct bot_specific *bot = (struct bot_specific *)stp->st_specific;
register CPP_XGLUE(tri_specific_, TRI_TYPE) *trip =
(CPP_XGLUE(tri_specific_, TRI_TYPE) *)bot->bot_facelist;
@@ -1112,8 +1112,8 @@
* Generally the hits are stashed between invocations in psp.
*/
int
-CPP_XGLUE(rt_bot_piece_shot_, TRI_TYPE)(struct rt_piecestate *psp, struct
rt_piecelist *plp,
- double dist_corr, struct xray *rp, struct
application *ap, struct seg *seghead)
+CPP_XGLUE(bot_piece_shot_, TRI_TYPE)(struct rt_piecestate *psp, struct
rt_piecelist *plp,
+ double dist_corr, struct xray *rp, struct
application *ap, struct seg *seghead)
{
struct resource *resp;
long *sol_piece_subscr_p;
@@ -1323,7 +1323,7 @@
/* void */
-/* CPP_XGLUE(rt_bot_uv_, TRI_TYPE)(struct bot_specific *bot, struct hit *hitp,
struct xray *rp) */
+/* CPP_XGLUE(bot_uv_, TRI_TYPE)(struct bot_specific *bot, struct hit *hitp,
struct xray *rp) */
/* { */
/* size_t i; */
/* CPP_XGLUE(tri_specific_, TRI_TYPE) *trip = (CPP_XGLUE(tri_specific_,
TRI_TYPE) *)hitp->hit_private; */
@@ -1337,7 +1337,7 @@
void
-CPP_XGLUE(rt_bot_free_, TRI_TYPE)(struct bot_specific *bot)
+CPP_XGLUE(bot_free_, TRI_TYPE)(struct bot_specific *bot)
{
register CPP_XGLUE(tri_specific_, TRI_TYPE) *tri, *ptr;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
