Revision: 52702
http://brlcad.svn.sourceforge.net/brlcad/?rev=52702&view=rev
Author: brlcad
Date: 2012-10-03 04:43:31 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
shouldn't scan into fastf_t, use doubles instead
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/metaball/metaball.c
Modified: brlcad/trunk/src/librt/primitives/metaball/metaball.c
===================================================================
--- brlcad/trunk/src/librt/primitives/metaball/metaball.c 2012-10-02
21:44:25 UTC (rev 52701)
+++ brlcad/trunk/src/librt/primitives/metaball/metaball.c 2012-10-03
04:43:31 UTC (rev 52702)
@@ -940,7 +940,9 @@
rt_metaball_adjust(struct bu_vls *logstr, struct rt_db_internal *intern, int
argc, const char **argv)
{
struct rt_metaball_internal *mb;
- const char *pts, *pend;;
+ const char *pts;
+ const char *pend;
+ double thresh;
if(argc != 3) {
bu_vls_printf(logstr, "Invalid number of arguments: %d\n", argc);
@@ -956,7 +958,8 @@
return BRLCAD_ERROR;
}
mb->method = *argv[0] - '0';
- sscanf(argv[1], "%lG", &mb->threshold);
+ sscanf(argv[1], "%lG", &thresh);
+ mb->threshold = thresh;
BU_LIST_INIT(&mb->metaball_ctrl_head);
pts = argv[2];
@@ -964,13 +967,16 @@
while(1) {
int len;
- fastf_t fldstr, goo;
+ double xyz[3];
+ double fldstr, goo;
point_t loc;
const point_t *locp = (const point_t *)&loc;
while( pts < pend && *pts != '{' ) ++pts;
if(pts >= pend) break;
- len = sscanf(pts, "{%lG %lG %lG %lG %lG}", loc+X, loc+Y, loc+Z,
&fldstr, &goo);
+ len = sscanf(pts, "{%lG %lG %lG %lG %lG}", &xyz[0], &xyz[1], &xyz[2],
&fldstr, &goo);
+ VMOVE(loc, xyz);
+
if(len == EOF) break;
if(len != 5) {
bu_vls_printf(logstr, "Failed to parse point information: \"%s\"",
pts);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
