Revision: 54994
http://brlcad.svn.sourceforge.net/brlcad/?rev=54994&view=rev
Author: brlcad
Date: 2013-04-01 05:48:49 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
more explicit .0 expansions to indicate type intent better
Modified Paths:
--------------
brlcad/trunk/src/shapes/bolt.c
brlcad/trunk/src/shapes/gastank.c
brlcad/trunk/src/shapes/handle.c
brlcad/trunk/src/shapes/window.c
brlcad/trunk/src/shapes/window_frame.c
Modified: brlcad/trunk/src/shapes/bolt.c
===================================================================
--- brlcad/trunk/src/shapes/bolt.c 2013-04-01 05:40:18 UTC (rev 54993)
+++ brlcad/trunk/src/shapes/bolt.c 2013-04-01 05:48:49 UTC (rev 54994)
@@ -335,88 +335,88 @@
/* Create all solids needed. */
/* Create solids of bolt head. */
- leg = tan(M_PI / 6.) * hd / 2.;
- hyp = leg * leg + (hd / 2.) * (hd / 2.);
+ leg = tan(M_PI / 6.0) * hd / 2.0;
+ hyp = leg * leg + (hd / 2.0) * (hd / 2.0);
hyp = sqrt(hyp);
/* Bolt head is two solids, create first solid. */
- pts[0][0] = (fastf_t) ((-hd) / 2.);
+ pts[0][0] = (fastf_t) ((-hd) / 2.0);
pts[0][1] = (fastf_t)leg;
pts[0][2] = (fastf_t)hh;
- pts[1][0] = (fastf_t)0.;
+ pts[1][0] = (fastf_t)0.0;
pts[1][1] = (fastf_t)hyp;
pts[1][2] = (fastf_t)hh;
- pts[2][0] = (fastf_t)0.;
+ pts[2][0] = (fastf_t)0.0;
pts[2][1] = (fastf_t)(-hyp);
pts[2][2] = (fastf_t)hh;
- pts[3][0] = (fastf_t) ((-hd) / 2.);
+ pts[3][0] = (fastf_t) ((-hd) / 2.0);
pts[3][1] = (fastf_t)(-leg);
pts[3][2] = (fastf_t)hh;
- pts[4][0] = (fastf_t) ((-hd) / 2.);
+ pts[4][0] = (fastf_t) ((-hd) / 2.0);
pts[4][1] = (fastf_t)leg;
- pts[4][2] = (fastf_t)0.;
- pts[5][0] = (fastf_t)0.;
+ pts[4][2] = (fastf_t)0.0;
+ pts[5][0] = (fastf_t)0.0;
pts[5][1] = (fastf_t)hyp;
- pts[5][2] = (fastf_t)0.;
- pts[6][0] = (fastf_t)0.;
+ pts[5][2] = (fastf_t)0.0;
+ pts[6][0] = (fastf_t)0.0;
pts[6][1] = (fastf_t)(-hyp);
- pts[6][2] = (fastf_t)0.;
- pts[7][0] = (fastf_t) ((-hd) / 2.);
+ pts[6][2] = (fastf_t)0.0;
+ pts[7][0] = (fastf_t) ((-hd) / 2.0);
pts[7][1] = (fastf_t)(-leg);
- pts[7][2] = (fastf_t)0.;
+ pts[7][2] = (fastf_t)0.0;
solnam[6] = 97 + i;
solnam[7] = '1';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create second solid. */
- pts[0][0] = (fastf_t) (hd / 2.);
+ pts[0][0] = (fastf_t) (hd / 2.0);
pts[0][1] = (fastf_t)leg;
pts[0][2] = (fastf_t)hh;
- pts[1][0] = (fastf_t)0.;
+ pts[1][0] = (fastf_t)0.0;
pts[1][1] = (fastf_t)hyp;
pts[1][2] = (fastf_t)hh;
- pts[2][0] = (fastf_t)0.;
+ pts[2][0] = (fastf_t)0.0;
pts[2][1] = (fastf_t)(-hyp);
pts[2][2] = (fastf_t)hh;
- pts[3][0] = (fastf_t) (hd / 2.);
+ pts[3][0] = (fastf_t) (hd / 2.0);
pts[3][1] = (fastf_t)(-leg);
pts[3][2] = (fastf_t)hh;
- pts[4][0] = (fastf_t) (hd / 2.);
+ pts[4][0] = (fastf_t) (hd / 2.0);
pts[4][1] = (fastf_t)leg;
- pts[4][2] = (fastf_t)0.;
- pts[5][0] = (fastf_t)0.;
+ pts[4][2] = (fastf_t)0.0;
+ pts[5][0] = (fastf_t)0.0;
pts[5][1] = (fastf_t)hyp;
- pts[5][2] = (fastf_t)0.;
- pts[6][0] = (fastf_t)0.;
+ pts[5][2] = (fastf_t)0.0;
+ pts[6][0] = (fastf_t)0.0;
pts[6][1] = (fastf_t)(-hyp);
- pts[6][2] = (fastf_t)0.;
- pts[7][0] = (fastf_t) (hd / 2.);
+ pts[6][2] = (fastf_t)0.0;
+ pts[7][0] = (fastf_t) (hd / 2.0);
pts[7][1] = (fastf_t)(-leg);
- pts[7][2] = (fastf_t)0.;
+ pts[7][2] = (fastf_t)0.0;
solnam[7] = '2';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create washer if necessary. */
if ((iopt == 2) || (iopt == 3)) {
- bs[0] = (fastf_t)0.;
- bs[1] = (fastf_t)0.;
- bs[2] = (fastf_t)0.;
- ht[0] = (fastf_t)0.;
- ht[1] = (fastf_t)0.;
+ bs[0] = (fastf_t)0.0;
+ bs[1] = (fastf_t)0.0;
+ bs[2] = (fastf_t)0.0;
+ ht[0] = (fastf_t)0.0;
+ ht[1] = (fastf_t)0.0;
ht[2] = (fastf_t)(-wh);
- rad = (fastf_t) (wd / 2.);
+ rad = (fastf_t) (wd / 2.0);
solnam[7] = '3';
mk_rcc(fpw, solnam, bs, ht, rad);
}
/* Create bolt stem if necessary. */
if ((iopt == 3) || (iopt == 4)) {
- bs[0] = (fastf_t)0.;
- bs[1] = (fastf_t)0.;
- bs[2] = (fastf_t)0.;
- ht[0] = (fastf_t)0.;
- ht[1] = (fastf_t)0.;
+ bs[0] = (fastf_t)0.0;
+ bs[1] = (fastf_t)0.0;
+ bs[2] = (fastf_t)0.0;
+ ht[0] = (fastf_t)0.0;
+ ht[1] = (fastf_t)0.0;
ht[2] = (fastf_t)(-sh);
- rad = (fastf_t) (sd / 2.);
+ rad = (fastf_t) (sd / 2.0);
solnam[7] = '4';
mk_rcc(fpw, solnam, bs, ht, rad);
}
Modified: brlcad/trunk/src/shapes/gastank.c
===================================================================
--- brlcad/trunk/src/shapes/gastank.c 2013-04-01 05:40:18 UTC (rev 54993)
+++ brlcad/trunk/src/shapes/gastank.c 2013-04-01 05:48:49 UTC (rev 54994)
@@ -237,9 +237,9 @@
/* Create the 3 arb8s. */
- pts[0][0] = (fastf_t)(dpt / 2.);
- pts[0][1] = (fastf_t)(wid / 2. - rds);
- pts[0][2] = (fastf_t)(hgt / 2. - rds);
+ pts[0][0] = (fastf_t)(dpt / 2.0);
+ pts[0][1] = (fastf_t)(wid / 2.0 - rds);
+ pts[0][2] = (fastf_t)(hgt / 2.0 - rds);
pts[1][0] = pts[0][0];
pts[1][1] = pts[0][1];
pts[1][2] = (-pts[0][2]);
@@ -266,8 +266,8 @@
solnam[7] = '1';
mk_arb8(fpw, solnam, &pts[0][X]);
- pts[0][0] = (fastf_t)(dpt / 2. - rds);
- pts[0][1] = (fastf_t)(wid / 2.);
+ pts[0][0] = (fastf_t)(dpt / 2.0 - rds);
+ pts[0][1] = (fastf_t)(wid / 2.0);
pts[1][0] = pts[0][0];
pts[1][1] = pts[0][1];
pts[2][0] = pts[0][0];
@@ -285,8 +285,8 @@
solnam[7] = '2';
mk_arb8(fpw, solnam, &pts[0][X]);
- pts[0][1] = (fastf_t)(wid / 2. - rds);
- pts[0][2] = (fastf_t)(hgt / 2.);
+ pts[0][1] = (fastf_t)(wid / 2.0 - rds);
+ pts[0][2] = (fastf_t)(hgt / 2.0);
pts[1][1] = pts[0][1];
pts[1][2] = (-pts[0][2]);
pts[2][1] = (-pts[0][1]);
@@ -306,9 +306,9 @@
/* Make 8 spheres. */
- cent[0] = (fastf_t)(dpt / 2. - rds);
- cent[1] = (fastf_t)(wid / 2. - rds);
- cent[2] = (fastf_t)(hgt / 2. - rds);
+ cent[0] = (fastf_t)(dpt / 2.0 - rds);
+ cent[1] = (fastf_t)(wid / 2.0 - rds);
+ cent[2] = (fastf_t)(hgt / 2.0 - rds);
rad = (fastf_t)(rds);
solnam[7] = '4';
mk_sph(fpw, solnam, cent, rad);
@@ -345,12 +345,12 @@
/* Make 12 cylinders. */
- bs[0] = (fastf_t)(dpt / 2. - rds);
- bs[1] = (fastf_t)(wid / 2. - rds);
- bs[2] = (fastf_t)(hgt / 2. - rds);
- ht[0] = (fastf_t)(0.);
+ bs[0] = (fastf_t)(dpt / 2.0 - rds);
+ bs[1] = (fastf_t)(wid / 2.0 - rds);
+ bs[2] = (fastf_t)(hgt / 2.0 - rds);
+ ht[0] = (fastf_t)(0.0);
ht[1] = (fastf_t)(-wid + 2 * rds);
- ht[2] = (fastf_t)(0.);
+ ht[2] = (fastf_t)(0.0);
solnam[7] = '2';
mk_rcc(fpw, solnam, bs, ht, rad);
@@ -366,11 +366,11 @@
solnam[7] = '5';
mk_rcc(fpw, solnam, bs, ht, rad);
- bs[0] = (fastf_t)(dpt / 2. - rds);
- bs[1] = (fastf_t)(wid / 2. - rds);
- bs[2] = (fastf_t)(hgt / 2. - rds);
- ht[0] = (fastf_t)(0.);
- ht[1] = (fastf_t)(0.);
+ bs[0] = (fastf_t)(dpt / 2.0 - rds);
+ bs[1] = (fastf_t)(wid / 2.0 - rds);
+ bs[2] = (fastf_t)(hgt / 2.0 - rds);
+ ht[0] = (fastf_t)(0.0);
+ ht[1] = (fastf_t)(0.0);
ht[2] = (fastf_t)(-hgt + 2 * rds);
solnam[7] = '6';
mk_rcc(fpw, solnam, bs, ht, rad);
@@ -387,12 +387,12 @@
solnam[7] = '9';
mk_rcc(fpw, solnam, bs, ht, rad);
- bs[0] = (fastf_t)(dpt / 2. - rds);
- bs[1] = (fastf_t)(wid / 2. - rds);
- bs[2] = (fastf_t)(hgt / 2. - rds);
+ bs[0] = (fastf_t)(dpt / 2.0 - rds);
+ bs[1] = (fastf_t)(wid / 2.0 - rds);
+ bs[2] = (fastf_t)(hgt / 2.0 - rds);
ht[0] = (fastf_t)(-dpt + 2 * rds);
- ht[1] = (fastf_t)(0.);
- ht[2] = (fastf_t)(0.);
+ ht[1] = (fastf_t)(0.0);
+ ht[2] = (fastf_t)(0.0);
solnam[6] = '2';
solnam[7] = '0';
mk_rcc(fpw, solnam, bs, ht, rad);
Modified: brlcad/trunk/src/shapes/handle.c
===================================================================
--- brlcad/trunk/src/shapes/handle.c 2013-04-01 05:40:18 UTC (rev 54993)
+++ brlcad/trunk/src/shapes/handle.c 2013-04-01 05:48:49 UTC (rev 54994)
@@ -268,23 +268,23 @@
/* Create solids for handle. */
/* Create top cylinder. */
- bs[0] = (fastf_t)0.;
- bs[1] = (fastf_t) (len / 2. - r1 - r2);
+ bs[0] = (fastf_t)0.0;
+ bs[1] = (fastf_t) (len / 2.0 - r1 - r2);
bs[2] = (fastf_t) (hgt - r2);
- ht[0] = (fastf_t)0.;
+ ht[0] = (fastf_t)0.0;
ht[1] = (fastf_t) (r1 + r1 + r2 + r2 - len);
- ht[2] = (fastf_t)0.;
+ ht[2] = (fastf_t)0.0;
rad = (fastf_t)r2;
solnam[5] = 97 + i;
solnam[6] = '1';
mk_rcc(fpw, solnam, bs, ht, rad);
/* Create right cylinder. */
- bs[0] = (fastf_t)0.;
- bs[1] = (fastf_t) (len / 2. - r2);
- bs[2] = (fastf_t)0.;
- ht[0] = (fastf_t)0.;
- ht[1] = (fastf_t)0.;
+ bs[0] = (fastf_t)0.0;
+ bs[1] = (fastf_t) (len / 2.0 - r2);
+ bs[2] = (fastf_t)0.0;
+ ht[0] = (fastf_t)0.0;
+ ht[1] = (fastf_t)0.0;
ht[2] = (fastf_t) (hgt - r1 - r2);
rad = (fastf_t)r2;
solnam[6] = '2';
@@ -296,12 +296,12 @@
mk_rcc(fpw, solnam, bs, ht, rad);
/* Create right torus. */
- cent[0] = (fastf_t)0.;
- cent[1] = (fastf_t) (len / 2. -r1 - r2);
+ cent[0] = (fastf_t)0.0;
+ cent[1] = (fastf_t) (len / 2.0 -r1 - r2);
cent[2] = (fastf_t) (hgt - r1 -r2);
- norm[0] = (fastf_t)1.;
- norm[1] = (fastf_t)0.;
- norm[2] = (fastf_t)0.;
+ norm[0] = (fastf_t)1.0;
+ norm[1] = (fastf_t)0.0;
+ norm[2] = (fastf_t)0.0;
rad1 = r1;
rad2 = r2;
solnam[6] = '4';
@@ -314,28 +314,28 @@
/* Create right arb8. */
pts[0][0] = (fastf_t)r2;
- pts[0][1] = (fastf_t) (len / 2. - r1 - r2);
+ pts[0][1] = (fastf_t) (len / 2.0 - r1 - r2);
pts[0][2] = (fastf_t)hgt;
pts[1][0] = (fastf_t)r2;
- pts[1][1] = (fastf_t) (len / 2.);
+ pts[1][1] = (fastf_t) (len / 2.0);
pts[1][2] = (fastf_t)hgt;
pts[2][0] = (fastf_t)r2;
- pts[2][1] = (fastf_t) (len / 2.);
+ pts[2][1] = (fastf_t) (len / 2.0);
pts[2][2] = (fastf_t) (hgt -r1 - r2);
pts[3][0] = (fastf_t)r2;
- pts[3][1] = (fastf_t) (len / 2. - r1 - r2);
+ pts[3][1] = (fastf_t) (len / 2.0 - r1 - r2);
pts[3][2] = (fastf_t) (hgt -r1 - r2);
pts[4][0] = (fastf_t)(-r2);
- pts[4][1] = (fastf_t) (len / 2. - r1 - r2);
+ pts[4][1] = (fastf_t) (len / 2.0 - r1 - r2);
pts[4][2] = (fastf_t)hgt;
pts[5][0] = (fastf_t)(-r2);
- pts[5][1] = (fastf_t) (len / 2.);
+ pts[5][1] = (fastf_t) (len / 2.0);
pts[5][2] = (fastf_t)hgt;
pts[6][0] = (fastf_t)(-r2);
- pts[6][1] = (fastf_t) (len / 2.);
+ pts[6][1] = (fastf_t) (len / 2.0);
pts[6][2] = (fastf_t) (hgt -r1 - r2);
pts[7][0] = (fastf_t)(-r2);
- pts[7][1] = (fastf_t) (len / 2. - r1 - r2);
+ pts[7][1] = (fastf_t) (len / 2.0 - r1 - r2);
pts[7][2] = (fastf_t) (hgt -r1 - r2);
solnam[6] ='6';
mk_arb8(fpw, solnam, &pts[0][X]);
Modified: brlcad/trunk/src/shapes/window.c
===================================================================
--- brlcad/trunk/src/shapes/window.c 2013-04-01 05:40:18 UTC (rev 54993)
+++ brlcad/trunk/src/shapes/window.c 2013-04-01 05:48:49 UTC (rev 54994)
@@ -229,61 +229,61 @@
for (i=0; i<numwin; i++) {
/* START # 2 */
/* Create first arb8. */
- pts[0][0] = (fastf_t)0.;
- pts[0][1] = (fastf_t) (wid / 2. - rds);
- pts[0][2] = (fastf_t) (hgt / 2.);
- pts[1][0] = (fastf_t)0.;
- pts[1][1] = (fastf_t) (wid / 2. - rds);
- pts[1][2] = (fastf_t) ((-hgt) / 2.);
- pts[2][0] = (fastf_t)0.;
- pts[2][1] = (fastf_t) (rds - wid / 2.);
- pts[2][2] = (fastf_t) ((-hgt) / 2.);
- pts[3][0] = (fastf_t)0.;
- pts[3][1] = (fastf_t) (rds - wid / 2.);
- pts[3][2] = (fastf_t) (hgt / 2.);
+ pts[0][0] = (fastf_t)0.0;
+ pts[0][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[0][2] = (fastf_t) (hgt / 2.0);
+ pts[1][0] = (fastf_t)0.0;
+ pts[1][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[1][2] = (fastf_t) ((-hgt) / 2.0);
+ pts[2][0] = (fastf_t)0.0;
+ pts[2][1] = (fastf_t) (rds - wid / 2.0);
+ pts[2][2] = (fastf_t) ((-hgt) / 2.0);
+ pts[3][0] = (fastf_t)0.0;
+ pts[3][1] = (fastf_t) (rds - wid / 2.0);
+ pts[3][2] = (fastf_t) (hgt / 2.0);
pts[4][0] = (fastf_t)(-dpt);
- pts[4][1] = (fastf_t) (wid / 2. - rds);
- pts[4][2] = (fastf_t) (hgt / 2.);
+ pts[4][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[4][2] = (fastf_t) (hgt / 2.0);
pts[5][0] = (fastf_t)(-dpt);
- pts[5][1] = (fastf_t) (wid / 2. - rds);
- pts[5][2] = (fastf_t) ((-hgt) / 2.);
+ pts[5][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[5][2] = (fastf_t) ((-hgt) / 2.0);
pts[6][0] = (fastf_t)(-dpt);
- pts[6][1] = (fastf_t) (rds - wid / 2.);
- pts[6][2] = (fastf_t) ((-hgt) / 2.);
+ pts[6][1] = (fastf_t) (rds - wid / 2.0);
+ pts[6][2] = (fastf_t) ((-hgt) / 2.0);
pts[7][0] = (fastf_t)(-dpt);
- pts[7][1] = (fastf_t) (rds - wid / 2.);
- pts[7][2] = (fastf_t) (hgt / 2.);
+ pts[7][1] = (fastf_t) (rds - wid / 2.0);
+ pts[7][2] = (fastf_t) (hgt / 2.0);
solnam[5] = 97 + i;
solnam[6] = '1';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create second arb8. */
- pts[0][1] = (fastf_t) (wid / 2.);
- pts[0][2] = (fastf_t) (hgt / 2. - rds);
- pts[1][1] = (fastf_t) (wid / 2.);
- pts[1][2] = (fastf_t) (rds - hgt / 2.);
- pts[2][1] = (fastf_t) ((-wid) / 2.);
- pts[2][2] = (fastf_t) (rds - hgt / 2.);
- pts[3][1] = (fastf_t) ((-wid) / 2.);
- pts[3][2] = (fastf_t) (hgt / 2. - rds);
- pts[4][1] = (fastf_t) (wid / 2.);
- pts[4][2] = (fastf_t) (hgt / 2. - rds);
- pts[5][1] = (fastf_t) (wid / 2.);
- pts[5][2] = (fastf_t) (rds - hgt / 2.);
- pts[6][1] = (fastf_t) ((-wid) / 2.);
- pts[6][2] = (fastf_t) (rds - hgt / 2.);
- pts[7][1] = (fastf_t) ((-wid) / 2.);
- pts[7][2] = (fastf_t) (hgt / 2. - rds);
+ pts[0][1] = (fastf_t) (wid / 2.0);
+ pts[0][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[1][1] = (fastf_t) (wid / 2.0);
+ pts[1][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[2][1] = (fastf_t) ((-wid) / 2.0);
+ pts[2][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[3][1] = (fastf_t) ((-wid) / 2.0);
+ pts[3][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[4][1] = (fastf_t) (wid / 2.0);
+ pts[4][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[5][1] = (fastf_t) (wid / 2.0);
+ pts[5][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[6][1] = (fastf_t) ((-wid) / 2.0);
+ pts[6][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[7][1] = (fastf_t) ((-wid) / 2.0);
+ pts[7][2] = (fastf_t) (hgt / 2.0 - rds);
solnam[6] = '2';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create cylinder 1. */
- bs[0] = (fastf_t)0.;
- bs[1] = (fastf_t) (wid / 2. - rds);
- bs[2] = (fastf_t) (hgt / 2. - rds);
+ bs[0] = (fastf_t)0.0;
+ bs[1] = (fastf_t) (wid / 2.0 - rds);
+ bs[2] = (fastf_t) (hgt / 2.0 - rds);
ht[0] = (fastf_t)(-dpt);
- ht[1] = (fastf_t)0.;
- ht[2] = (fastf_t)0.;
+ ht[1] = (fastf_t)0.0;
+ ht[2] = (fastf_t)0.0;
rad = (fastf_t)rds;
solnam[6] = '3';
mk_rcc(fpw, solnam, bs, ht, rad);
Modified: brlcad/trunk/src/shapes/window_frame.c
===================================================================
--- brlcad/trunk/src/shapes/window_frame.c 2013-04-01 05:40:18 UTC (rev
54993)
+++ brlcad/trunk/src/shapes/window_frame.c 2013-04-01 05:48:49 UTC (rev
54994)
@@ -245,62 +245,62 @@
for (i=0; i<numwin; i++) {
/* START # 2 */
/* Create first arb8. */
- pts[0][0] = (fastf_t)0.;
- pts[0][1] = (fastf_t) (wid / 2. - rds);
- pts[0][2] = (fastf_t) (hgt / 2.);
- pts[1][0] = (fastf_t)0.;
- pts[1][1] = (fastf_t) (wid / 2. - rds);
- pts[1][2] = (fastf_t) ((-hgt) / 2.);
- pts[2][0] = (fastf_t)0.;
- pts[2][1] = (fastf_t) (rds - wid / 2.);
- pts[2][2] = (fastf_t) ((-hgt) / 2.);
- pts[3][0] = (fastf_t)0.;
- pts[3][1] = (fastf_t) (rds - wid / 2.);
- pts[3][2] = (fastf_t) (hgt / 2.);
+ pts[0][0] = (fastf_t)0.0;
+ pts[0][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[0][2] = (fastf_t) (hgt / 2.0);
+ pts[1][0] = (fastf_t)0.0;
+ pts[1][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[1][2] = (fastf_t) ((-hgt) / 2.0);
+ pts[2][0] = (fastf_t)0.0;
+ pts[2][1] = (fastf_t) (rds - wid / 2.0);
+ pts[2][2] = (fastf_t) ((-hgt) / 2.0);
+ pts[3][0] = (fastf_t)0.0;
+ pts[3][1] = (fastf_t) (rds - wid / 2.0);
+ pts[3][2] = (fastf_t) (hgt / 2.0);
pts[4][0] = (fastf_t)(-dpt);
- pts[4][1] = (fastf_t) (wid / 2. - rds);
- pts[4][2] = (fastf_t) (hgt / 2.);
+ pts[4][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[4][2] = (fastf_t) (hgt / 2.0);
pts[5][0] = (fastf_t)(-dpt);
- pts[5][1] = (fastf_t) (wid / 2. - rds);
- pts[5][2] = (fastf_t) ((-hgt) / 2.);
+ pts[5][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[5][2] = (fastf_t) ((-hgt) / 2.0);
pts[6][0] = (fastf_t)(-dpt);
- pts[6][1] = (fastf_t) (rds - wid / 2.);
- pts[6][2] = (fastf_t) ((-hgt) / 2.);
+ pts[6][1] = (fastf_t) (rds - wid / 2.0);
+ pts[6][2] = (fastf_t) ((-hgt) / 2.0);
pts[7][0] = (fastf_t)(-dpt);
- pts[7][1] = (fastf_t) (rds - wid / 2.);
- pts[7][2] = (fastf_t) (hgt / 2.);
+ pts[7][1] = (fastf_t) (rds - wid / 2.0);
+ pts[7][2] = (fastf_t) (hgt / 2.0);
solnam[5] = 97 + i;
solnam[6] = '0';
solnam[7] = '1';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create second arb8. */
- pts[0][1] = (fastf_t) (wid / 2.);
- pts[0][2] = (fastf_t) (hgt / 2. - rds);
- pts[1][1] = (fastf_t) (wid / 2.);
- pts[1][2] = (fastf_t) (rds - hgt / 2.);
- pts[2][1] = (fastf_t) ((-wid) / 2.);
- pts[2][2] = (fastf_t) (rds - hgt / 2.);
- pts[3][1] = (fastf_t) ((-wid) / 2.);
- pts[3][2] = (fastf_t) (hgt / 2. - rds);
- pts[4][1] = (fastf_t) (wid / 2.);
- pts[4][2] = (fastf_t) (hgt / 2. - rds);
- pts[5][1] = (fastf_t) (wid / 2.);
- pts[5][2] = (fastf_t) (rds - hgt / 2.);
- pts[6][1] = (fastf_t) ((-wid) / 2.);
- pts[6][2] = (fastf_t) (rds - hgt / 2.);
- pts[7][1] = (fastf_t) ((-wid) / 2.);
- pts[7][2] = (fastf_t) (hgt / 2. - rds);
+ pts[0][1] = (fastf_t) (wid / 2.0);
+ pts[0][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[1][1] = (fastf_t) (wid / 2.0);
+ pts[1][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[2][1] = (fastf_t) ((-wid) / 2.0);
+ pts[2][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[3][1] = (fastf_t) ((-wid) / 2.0);
+ pts[3][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[4][1] = (fastf_t) (wid / 2.0);
+ pts[4][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[5][1] = (fastf_t) (wid / 2.0);
+ pts[5][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[6][1] = (fastf_t) ((-wid) / 2.0);
+ pts[6][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[7][1] = (fastf_t) ((-wid) / 2.0);
+ pts[7][2] = (fastf_t) (hgt / 2.0 - rds);
solnam[7] = '2';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create cylinder 1. */
- bs[0] = (fastf_t)0.;
- bs[1] = (fastf_t) (wid / 2. - rds);
- bs[2] = (fastf_t) (hgt / 2. - rds);
+ bs[0] = (fastf_t)0.0;
+ bs[1] = (fastf_t) (wid / 2.0 - rds);
+ bs[2] = (fastf_t) (hgt / 2.0 - rds);
ht[0] = (fastf_t)(-dpt);
- ht[1] = (fastf_t)0.;
- ht[2] = (fastf_t)0.;
+ ht[1] = (fastf_t)0.0;
+ ht[2] = (fastf_t)0.0;
rad = (fastf_t)rds;
solnam[7] = '3';
mk_rcc(fpw, solnam, bs, ht, rad);
@@ -322,60 +322,60 @@
/* Create all inside solids. */
/* Create arb8 3. */
- pts[0][0] = (fastf_t)0.;
- pts[0][1] = (fastf_t) (wid / 2. - rds);
- pts[0][2] = (fastf_t) (hgt / 2. - isw);
- pts[1][0] = (fastf_t)0.;
- pts[1][1] = (fastf_t) (wid / 2. - rds);
- pts[1][2] = (fastf_t) ((-hgt) / 2. + isw);
- pts[2][0] = (fastf_t)0.;
- pts[2][1] = (fastf_t) (rds - wid / 2.);
- pts[2][2] = (fastf_t) ((-hgt) / 2. + isw);
- pts[3][0] = (fastf_t)0.;
- pts[3][1] = (fastf_t) (rds - wid / 2.);
- pts[3][2] = (fastf_t) (hgt / 2. - isw);
+ pts[0][0] = (fastf_t)0.0;
+ pts[0][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[0][2] = (fastf_t) (hgt / 2.0 - isw);
+ pts[1][0] = (fastf_t)0.0;
+ pts[1][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[1][2] = (fastf_t) ((-hgt) / 2.0 + isw);
+ pts[2][0] = (fastf_t)0.0;
+ pts[2][1] = (fastf_t) (rds - wid / 2.0);
+ pts[2][2] = (fastf_t) ((-hgt) / 2.0 + isw);
+ pts[3][0] = (fastf_t)0.0;
+ pts[3][1] = (fastf_t) (rds - wid / 2.0);
+ pts[3][2] = (fastf_t) (hgt / 2.0 - isw);
pts[4][0] = (fastf_t)(-dpt);
- pts[4][1] = (fastf_t) (wid / 2. - rds);
- pts[4][2] = (fastf_t) (hgt / 2. - isw);
+ pts[4][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[4][2] = (fastf_t) (hgt / 2.0 - isw);
pts[5][0] = (fastf_t)(-dpt);
- pts[5][1] = (fastf_t) (wid / 2. - rds);
- pts[5][2] = (fastf_t) ((-hgt) / 2. + isw);
+ pts[5][1] = (fastf_t) (wid / 2.0 - rds);
+ pts[5][2] = (fastf_t) ((-hgt) / 2.0 + isw);
pts[6][0] = (fastf_t)(-dpt);
- pts[6][1] = (fastf_t) (rds - wid / 2.);
- pts[6][2] = (fastf_t) ((-hgt) / 2. + isw);
+ pts[6][1] = (fastf_t) (rds - wid / 2.0);
+ pts[6][2] = (fastf_t) ((-hgt) / 2.0 + isw);
pts[7][0] = (fastf_t)(-dpt);
- pts[7][1] = (fastf_t) (rds - wid / 2.);
- pts[7][2] = (fastf_t) (hgt / 2. - isw);
+ pts[7][1] = (fastf_t) (rds - wid / 2.0);
+ pts[7][2] = (fastf_t) (hgt / 2.0 - isw);
solnam[7] = '7';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create arb8 4. */
- pts[0][1] = (fastf_t) (wid / 2. - isw);
- pts[0][2] = (fastf_t) (hgt / 2. - rds);
- pts[1][1] = (fastf_t) (wid / 2. - isw);
- pts[1][2] = (fastf_t) (rds - hgt / 2.);
- pts[2][1] = (fastf_t) ((-wid) / 2. + isw);
- pts[2][2] = (fastf_t) (rds - hgt / 2.);
- pts[3][1] = (fastf_t) ((-wid) / 2. + isw);
- pts[3][2] = (fastf_t) (hgt / 2. - rds);
- pts[4][1] = (fastf_t) (wid / 2. - isw);
- pts[4][2] = (fastf_t) (hgt / 2. - rds);
- pts[5][1] = (fastf_t) (wid / 2. - isw);
- pts[5][2] = (fastf_t) (rds - hgt / 2.);
- pts[6][1] = (fastf_t) ((-wid) / 2. + isw);
- pts[6][2] = (fastf_t) (rds - hgt / 2.);
- pts[7][1] = (fastf_t) ((-wid) / 2. + isw);
- pts[7][2] = (fastf_t) (hgt / 2. - rds);
+ pts[0][1] = (fastf_t) (wid / 2.0 - isw);
+ pts[0][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[1][1] = (fastf_t) (wid / 2.0 - isw);
+ pts[1][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[2][1] = (fastf_t) ((-wid) / 2.0 + isw);
+ pts[2][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[3][1] = (fastf_t) ((-wid) / 2.0 + isw);
+ pts[3][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[4][1] = (fastf_t) (wid / 2.0 - isw);
+ pts[4][2] = (fastf_t) (hgt / 2.0 - rds);
+ pts[5][1] = (fastf_t) (wid / 2.0 - isw);
+ pts[5][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[6][1] = (fastf_t) ((-wid) / 2.0 + isw);
+ pts[6][2] = (fastf_t) (rds - hgt / 2.0);
+ pts[7][1] = (fastf_t) ((-wid) / 2.0 + isw);
+ pts[7][2] = (fastf_t) (hgt / 2.0 - rds);
solnam[7] = '8';
mk_arb8(fpw, solnam, &pts[0][X]);
/* Create cylinder 5. */
- bs[0] = (fastf_t)0.;
- bs[1] = (fastf_t) (wid / 2. - rds);
- bs[2] = (fastf_t) (hgt / 2. - rds);
+ bs[0] = (fastf_t)0.0;
+ bs[1] = (fastf_t) (wid / 2.0 - rds);
+ bs[2] = (fastf_t) (hgt / 2.0 - rds);
ht[0] = (fastf_t)(-dpt);
- ht[1] = (fastf_t)0.;
- ht[2] = (fastf_t)0.;
+ ht[1] = (fastf_t)0.0;
+ ht[2] = (fastf_t)0.0;
rad = (fastf_t) (rds - isw);
solnam[7] = '9';
mk_rcc(fpw, solnam, bs, ht, rad);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
