Revision: 40547
http://brlcad.svn.sourceforge.net/brlcad/?rev=40547&view=rev
Author: erikgreenwald
Date: 2010-09-13 14:55:38 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
meh, more changes
Modified Paths:
--------------
brlcad/branches/bottie/src/librt/primitives/bot/bot.c
brlcad/branches/bottie/src/librt/primitives/bot/btg.h
brlcad/branches/bottie/src/librt/primitives/bot/btgf.c
Modified: brlcad/branches/bottie/src/librt/primitives/bot/bot.c
===================================================================
--- brlcad/branches/bottie/src/librt/primitives/bot/bot.c 2010-09-13
13:47:41 UTC (rev 40546)
+++ brlcad/branches/bottie/src/librt/primitives/bot/bot.c 2010-09-13
14:55:38 UTC (rev 40547)
@@ -204,13 +204,12 @@
bot_ip = (struct rt_bot_internal *)ip->idb_ptr;
RT_BOT_CK_MAGIC(bot_ip);
- if (bot_ip->tie != NULL) {
- return bottie_prep_double(bot_ip->tie);
- } else if (bot_ip->bot_flags & RT_BOT_USE_FLOATS) {
+ if (bot_ip->tie != NULL)
+ return bottie_prep_double(stp, bot_ip, rtip);
+ else if (bot_ip->bot_flags & RT_BOT_USE_FLOATS)
return rt_bot_prep_float(stp, bot_ip, rtip);
- } else {
+ else
return rt_bot_prep_double(stp, bot_ip, rtip);
- }
}
Modified: brlcad/branches/bottie/src/librt/primitives/bot/btg.h
===================================================================
--- brlcad/branches/bottie/src/librt/primitives/bot/btg.h 2010-09-13
13:47:41 UTC (rev 40546)
+++ brlcad/branches/bottie/src/librt/primitives/bot/btg.h 2010-09-13
14:55:38 UTC (rev 40547)
@@ -24,12 +24,12 @@
*/
void bottie_push_double(void *vtie, double **tri, unsigned int ntri, void
*usr, unsigned int pstride);
-int bottie_prep_double(void *vtie);
+int bottie_prep_double(struct soltab *stp, struct rt_bot_internal *bot, struct
rt_i *rtip);
int bottie_shot_double(struct soltab *stp, register struct xray *rp, struct
application *ap, struct seg *seghead);
void bottie_free_double(void *vtie);
void bottie_push_float(void *vtie, float **tri, unsigned int ntri, void *usr,
unsigned int pstride);
-int bottie_prep_float(void *vtie);
+int bottie_prep_float(struct soltab *stp, struct rt_bot_internal *bot, struct
rt_i *rtip);
int bottie_shot_float(struct soltab *stp, register struct xray *rp, struct
application *ap, struct seg *seghead);
void bottie_free_float(void *vtie);
Modified: brlcad/branches/bottie/src/librt/primitives/bot/btgf.c
===================================================================
--- brlcad/branches/bottie/src/librt/primitives/bot/btgf.c 2010-09-13
13:47:41 UTC (rev 40546)
+++ brlcad/branches/bottie/src/librt/primitives/bot/btgf.c 2010-09-13
14:55:38 UTC (rev 40547)
@@ -51,10 +51,19 @@
}
int
-bottie_prep_float(void *vtie)
+bottie_prep_float(struct soltab *stp,struct rt_bot_internal *bot, struct rt_i
*rtip)
{
- tie_prep((struct tie_s *)vtie);
- return -1;
+ struct tie_s *tie = (struct tie_s *)bot->tie;
+ point_t p;
+
+ tie_prep(tie);
+ VMOVE(stp->st_min, tie->min.v);
+ VMOVE(stp->st_max, tie->max.v);
+ VMOVE(stp->st_center, tie->mid);
+ stp->st_bradius = stp->st_aradius = tie->radius;
+ stp->st_specific = bot;
+
+ return 0;
}
static int
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
