Revision: 52711
http://brlcad.svn.sourceforge.net/brlcad/?rev=52711&view=rev
Author: brlcad
Date: 2012-10-03 05:44:33 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
more scanning into doubles instead of fastf_t and other fastf_t cleanup
Modified Paths:
--------------
brlcad/trunk/src/libged/adc.c
brlcad/trunk/src/libged/ae2dir.c
brlcad/trunk/src/libged/aet.c
brlcad/trunk/src/libged/arb.c
brlcad/trunk/src/libged/arot.c
Modified: brlcad/trunk/src/libged/adc.c
===================================================================
--- brlcad/trunk/src/libged/adc.c 2012-10-03 05:34:37 UTC (rev 52710)
+++ brlcad/trunk/src/libged/adc.c 2012-10-03 05:44:33 UTC (rev 52711)
@@ -174,6 +174,7 @@
char *command;
char *parameter;
char **argp = (char **)argv;
+ double scanval;
point_t user_pt; /* Value(s) provided by user */
point_t scaled_pos;
int incr_flag;
@@ -210,11 +211,13 @@
argp += 2;
}
- for (i = 0; i < argc; ++i)
- if (sscanf(argp[i], "%lf", &user_pt[i]) != 1) {
+ for (i = 0; i < argc; ++i) {
+ if (sscanf(argp[i], "%lf", &scanval) != 1) {
adc_usage(gedp->ged_result_str, command);
return GED_ERROR;
}
+ user_pt[i] = scanval;
+ }
if (BU_STR_EQUAL(parameter, "draw")) {
if (argc == 0) {
Modified: brlcad/trunk/src/libged/ae2dir.c
===================================================================
--- brlcad/trunk/src/libged/ae2dir.c 2012-10-03 05:34:37 UTC (rev 52710)
+++ brlcad/trunk/src/libged/ae2dir.c 2012-10-03 05:44:33 UTC (rev 52711)
@@ -36,7 +36,7 @@
int
ged_ae2dir(struct ged *gedp, int argc, const char *argv[])
{
- fastf_t az, el;
+ double az, el;
vect_t dir;
int iflag;
static const char *usage = "[-i] az el";
Modified: brlcad/trunk/src/libged/aet.c
===================================================================
--- brlcad/trunk/src/libged/aet.c 2012-10-03 05:34:37 UTC (rev 52710)
+++ brlcad/trunk/src/libged/aet.c 2012-10-03 05:44:33 UTC (rev 52711)
@@ -83,24 +83,28 @@
}
if (argc == 3 || argc == 4) {
- if (sscanf(argv[1], "%lf", &aet[X]) != 1) {
+ double aetscan[3];
+
+ if (sscanf(argv[1], "%lf", &aetscan[X]) != 1) {
bu_vls_printf(gedp->ged_result_str, "%s: bad azimuth - %s\n",
argv[0], argv[1]);
return GED_ERROR;
}
- if (sscanf(argv[2], "%lf", &aet[Y]) != 1) {
+ if (sscanf(argv[2], "%lf", &aetscan[Y]) != 1) {
bu_vls_printf(gedp->ged_result_str, "%s: bad elevation - %s\n",
argv[0], argv[2]);
return GED_ERROR;
}
if (argc == 4) {
- if (sscanf(argv[3], "%lf", &aet[Z]) != 1) {
+ if (sscanf(argv[3], "%lf", &aetscan[Z]) != 1) {
bu_vls_printf(gedp->ged_result_str, "%s: bad twist - %s\n",
argv[0], argv[3]);
return GED_ERROR;
}
} else
- aet[Z] = 0.0;
+ aetscan[Z] = 0.0;
+ VMOVE(aet, aetscan);
+
if (iflag) {
VADD2(gedp->ged_gvp->gv_aet, gedp->ged_gvp->gv_aet, aet);
} else {
Modified: brlcad/trunk/src/libged/arb.c
===================================================================
--- brlcad/trunk/src/libged/arb.c 2012-10-03 05:34:37 UTC (rev 52710)
+++ brlcad/trunk/src/libged/arb.c 2012-10-03 05:44:33 UTC (rev 52711)
@@ -42,7 +42,7 @@
struct rt_db_internal internal;
struct rt_arb_internal *arb;
int i, j;
- fastf_t rota, fb;
+ double rota, fb;
vect_t norm1, norm2, norm3;
static const char *usage = "name rot fb";
Modified: brlcad/trunk/src/libged/arot.c
===================================================================
--- brlcad/trunk/src/libged/arot.c 2012-10-03 05:34:37 UTC (rev 52710)
+++ brlcad/trunk/src/libged/arot.c 2012-10-03 05:44:33 UTC (rev 52711)
@@ -36,8 +36,9 @@
ged_arot_args(struct ged *gedp, int argc, const char *argv[], mat_t rmat)
{
point_t pt;
- vect_t axis;
- fastf_t angle;
+ vect_t axisv;
+ double axis[3]; /* not fastf_t due to sscanf */
+ double angle; /* not fastf_t due to sscanf */
static const char *usage = "x y z angle";
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
@@ -80,7 +81,8 @@
VSETALL(pt, 0.0);
VUNITIZE(axis);
- bn_mat_arb_rot(rmat, pt, axis, angle*bn_degtorad);
+ VMOVE(axisv, axis);
+ bn_mat_arb_rot(rmat, pt, axisv, angle*bn_degtorad);
return GED_OK;
}
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
