Revision: 73032
http://sourceforge.net/p/brlcad/code/73032
Author: brlcad
Date: 2019-05-09 14:51:42 +0000 (Thu, 09 May 2019)
Log Message:
-----------
doesn't need stp (we already unpacked the bot_specific), and should be
considered private API.
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 11:45:48 UTC (rev
73031)
+++ brlcad/trunk/src/librt/primitives/bot/bot.c 2019-05-09 14:51:42 UTC (rev
73032)
@@ -658,9 +658,9 @@
struct bot_specific *bot=(struct bot_specific *)stp->st_specific;
if (bot->bot_flags & RT_BOT_USE_FLOATS) {
- rt_bot_norm_float(bot, hitp, stp, rp);
+ bot_norm_float(bot, hitp, rp);
} else {
- rt_bot_norm_double(bot, hitp, stp, rp);
+ bot_norm_double(bot, hitp, rp);
}
}
Modified: brlcad/trunk/src/librt/primitives/bot/g_bot_include.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bot/g_bot_include.c 2019-05-09
11:45:48 UTC (rev 73031)
+++ brlcad/trunk/src/librt/primitives/bot/g_bot_include.c 2019-05-09
14:51:42 UTC (rev 73032)
@@ -1003,9 +1003,9 @@
* Intersect a ray with a bot. If an intersection occurs, a struct
* seg will be acquired and filled in.
*
- * Notes for rt_bot_norm(): hit_private contains pointer to the
- * tri_specific structure. hit_vpriv[X] contains dot product of ray
- * direction and unit normal from tri_specific.
+ * Notes for rt_bot_norm() and rt_bot_uv(): hit_private contains
+ * pointer to the tri_specific structure. hit_vpriv[X] contains dot
+ * product of ray direction and unit normal from tri_specific.
*
* Returns -
* 0 MISS
@@ -1264,13 +1264,11 @@
* Given ONE ray distance, return the normal and entry/exit point.
*/
void
-CPP_XGLUE(rt_bot_norm_, TRI_TYPE)(struct bot_specific *bot, struct hit *hitp,
struct soltab *stp, struct xray *rp)
+CPP_XGLUE(bot_norm_, TRI_TYPE)(struct bot_specific *bot, struct hit *hitp,
struct xray *rp)
{
vect_t old_norm;
CPP_XGLUE(tri_specific_, TRI_TYPE) *trip=(CPP_XGLUE(tri_specific_,
TRI_TYPE) *)hitp->hit_private;
- if (stp) RT_CK_SOLTAB(stp);
-
VJOIN1(hitp->hit_point, rp->r_pt, hitp->hit_dist, rp->r_dir);
VMOVE(old_norm, hitp->hit_normal);
@@ -1324,6 +1322,20 @@
}
+/* void */
+/* CPP_XGLUE(rt_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; */
+/* VJOIN1(hitp->hit_point, rp->r_pt, hitp->hit_dist, rp->r_dir); */
+/* if ((bot->bot_flags & RT_BOT_HAS_TEXTURE_UVS) /\* && trip->tri_uvs *\/)
{ */
+/* for (i = X; i <= Z; i++) { */
+/* /\* TODO: do stuff *\/ */
+/* } */
+/* } */
+/* } */
+
+
void
CPP_XGLUE(rt_bot_free_, TRI_TYPE)(struct bot_specific *bot)
{
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
