[brlcad-commits] SF.net SVN: brlcad:[33507] brlcad/trunk/src/shapes
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[33507] brlcad/trunk/src/shapes
|
From: <br...@us...> - 2009-01-09 20:50:04
|
Revision: 33507
http://brlcad.svn.sourceforge.net/brlcad/?rev=33507&view=rev
Author: brlcad
Date: 2009-01-09 20:49:59 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
remove gratuitous spacing
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/winfrm.c
brlcad/trunk/src/shapes/wire.c
Modified: brlcad/trunk/src/shapes/bolt.c
===================================================================
--- brlcad/trunk/src/shapes/bolt.c 2009-01-09 20:44:20 UTC (rev 33506)
+++ brlcad/trunk/src/shapes/bolt.c 2009-01-09 20:49:59 UTC (rev 33507)
@@ -19,7 +19,7 @@
*/
/** @file bolt.c
*
- * Program to make a bolt using libwdb. The objects will be in mm.
+ * Program to make a bolt using libwdb. The objects will be in mm.
*
*/
@@ -39,32 +39,32 @@
int
main(int argc, char **argv)
{
- struct rt_wdb *fpw; /* File to be written to. */
- char filemged[26]; /* Mged file create. */
- double hd, hh; /* Diameter & height of bolt head. */
- double wd, wh; /* Diameter & height of washer. */
- double sd, sh; /* Diameter & height of bolt stem. */
- double leg, hyp; /* Length of leg & hypotenus of triangle. */
- point_t pts[8]; /* Eight points of arb8. */
- point_t bs; /* Base of rcc. */
- vect_t ht; /* Height of rcc. */
- fastf_t rad; /* Radius of rcc. */
- int iopt; /* Type of bolt to be built: 1=>bolt head, */
+ struct rt_wdb *fpw; /* File to be written to. */
+ char filemged[26]; /* Mged file create. */
+ double hd, hh; /* Diameter & height of bolt head. */
+ double wd, wh; /* Diameter & height of washer. */
+ double sd, sh; /* Diameter & height of bolt stem. */
+ double leg, hyp; /* Length of leg & hypotenus of triangle. */
+ point_t pts[8]; /* Eight points of arb8. */
+ point_t bs; /* Base of rcc. */
+ vect_t ht; /* Height of rcc. */
+ fastf_t rad; /* Radius of rcc. */
+ int iopt; /* Type of bolt to be built: 1=>bolt head, */
/* 2=>head & washer; 3=>head, washer, & */
- /* stem; 4=>head & stem. */
- int i, j, k; /* Loop counters. */
- char *temp; /* Temporary character string. */
- char temp1[16]; /* Temporary character string. */
+ /* stem; 4=>head & stem. */
+ int i, j, k; /* Loop counters. */
+ char *temp; /* Temporary character string. */
+ char temp1[16]; /* Temporary character string. */
- char solnam[9]; /* Solid name. */
- char regnam[9]; /* Region name. */
- char grpnam[9]; /* Group name. */
- int numblt; /* Number of bolts to be created (<=26). */
+ char solnam[9]; /* Solid name. */
+ char regnam[9]; /* Region name. */
+ char grpnam[9]; /* Group name. */
+ int numblt; /* Number of bolts to be created (<=26). */
- struct wmember comb; /* Used to make regions. */
- struct wmember comb1; /* Used to make groups. */
+ struct wmember comb; /* Used to make regions. */
+ struct wmember comb1; /* Used to make groups. */
- /* Zero all dimnsions of bolt. */
+ /* Zero all dimnsions of bolt. */
iopt = 0;
hd = 0;
hh = 0;
@@ -73,7 +73,7 @@
sd = 0;
sh = 0;
- /* Set up solid, region, and group names. */
+ /* Set up solid, region, and group names. */
solnam[0] = 's';
solnam[1] = '.';
solnam[2] = 'b';
@@ -99,12 +99,12 @@
grpnam[4] = ' ';
grpnam[5] = '\0';
- /* If there are no arguments ask questions. */
+ /* If there are no arguments ask questions. */
if (argc == 1)
{
- /* START # 1 */
+ /* START # 1 */
- /* Find type of bolt to build. */
+ /* Find type of bolt to build. */
(void)printf("Enter option:\n");
(void)printf("\t1 - bolt head\n");
(void)printf("\t2 - bolt head & washer\n");
@@ -113,31 +113,31 @@
(void)fflush(stdout);
(void)scanf("%d", &iopt);
- /* Get file name of mged file to be created. */
+ /* Get file name of mged file to be created. */
(void)printf("Enter name of mged file to be created (25 char max).\n\t");
(void)fflush(stdout);
(void)scanf("%26s", filemged);
- /* Find the number of bolts to be created (<=26). */
+ /* Find the number of bolts to be created (<=26). */
(void)printf("Enter the number of bolts to be created (26 max).\n\t");
(void)fflush(stdout);
(void)scanf("%d", &numblt);
if (numblt > 26) numblt = 26;
- /* Find dimensions of the bolt. */
- /* Find dimensions of head first. */
+ /* Find dimensions of the bolt. */
+ /* Find dimensions of head first. */
(void)printf("Enter diameter (flat edge to flat edge) & height of ");
(void)printf("bolt head.\n\t");
(void)fflush(stdout);
(void)scanf("%lf %lf", &hd, &hh);
- /* Find dimensions of washer if necessary. */
+ /* Find dimensions of washer if necessary. */
if ((iopt == 2) || (iopt == 3))
{
(void)printf("Enter diameter & height of washer.\n\t");
(void)fflush(stdout);
(void)scanf("%lf %lf", &wd, &wh);
}
- /* Find dimensions of bolt stem if necessary. */
+ /* Find dimensions of bolt stem if necessary. */
if ((iopt == 3) || (iopt == 4))
{
(void)printf("Enter diameter & height of bolt stem.\n\t");
@@ -145,66 +145,66 @@
(void)scanf("%lf %lf", &sd, &sh);
}
- } /* END # 1 */
+ } /* END # 1 */
- /* If there are arguments do not ask any questions. Get the */
- /* answers from the arguments. */
+ /* If there are arguments do not ask any questions. Get the */
+ /* answers from the arguments. */
else
{
- /* START # 2 */
+ /* START # 2 */
- /* List of options. */
- /* -o# - # = 1 => bolt head */
- /* 2 => head & washer */
- /* 3 => head, washer, & stem */
- /* 4 => head & stem */
- /* -fname - name = name of .g file */
+ /* List of options. */
+ /* -o# - # = 1 => bolt head */
+ /* 2 => head & washer */
+ /* 3 => head, washer, & stem */
+ /* 4 => head & stem */
+ /* -fname - name = name of .g file */
/* -n# - # = number of bolts to create (<=26) */
- /* -hd# - # = head diameter */
- /* -hh# - # = head height */
- /* -wd# - # = washer diameter */
- /* -wh# - # = washer height */
- /* -sd# - # = stem diameter */
- /* -sh# - # = stem height */
+ /* -hd# - # = head diameter */
+ /* -hh# - # = head height */
+ /* -wd# - # = washer diameter */
+ /* -wh# - # = washer height */
+ /* -sd# - # = stem diameter */
+ /* -sh# - # = stem height */
for (i=1; i<argc; i++)
{
- /* START # 3 */
- /* Put argument into temporary character string. */
+ /* START # 3 */
+ /* Put argument into temporary character string. */
temp = argv[i];
- /* -o - set type of bolt to make. */
+ /* -o - set type of bolt to make. */
if (temp[1] == 'o')
{
- /* START # 4 */
+ /* START # 4 */
if (temp[2] == '1') iopt = 1;
if (temp[2] == '2') iopt = 2;
if (temp[2] == '3') iopt = 3;
if (temp[2] == '4') iopt = 4;
- } /* END # 4 */
+ } /* END # 4 */
- /* -f - mged file name. */
+ /* -f - mged file name. */
else if (temp[1] == 'f')
{
- /* START # 5 */
+ /* START # 5 */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 25))
{
- /* START # 6 */
+ /* START # 6 */
filemged[k] = temp[j];
j++;
k++;
- } /* END # 6 */
+ } /* END # 6 */
filemged[k] = '\0';
- } /* END # 5 */
+ } /* END # 5 */
- /* -n - number of bolts to be created. */
+ /* -n - number of bolts to be created. */
else if (temp[1] == 'n')
{
- /* START # 6.05 */
- /* Set up temporary character string, temp1. */
+ /* START # 6.05 */
+ /* Set up temporary character string, temp1. */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 15))
@@ -216,13 +216,13 @@
temp1[k] = '\0';
(void)sscanf(temp1, "%d", &numblt);
if (numblt > 26) numblt = 26;
- } /* END # 6.05 */
+ } /* END # 6.05 */
- /* Take care of all other arguments. */
+ /* Take care of all other arguments. */
else
{
- /* START # 6.1 */
- /* Set temporary character string, temp1. */
+ /* START # 6.1 */
+ /* Set temporary character string, temp1. */
j = 3;
k = 0;
while ((temp[j] != '\0') && (k < 15))
@@ -233,53 +233,53 @@
}
temp1[k] = '\0';
- /* -hd & -hh - head diameter & height. */
+ /* -hd & -hh - head diameter & height. */
if (temp[1] == 'h')
{
- /* START # 7 */
- if (temp[2] == 'd') /* Head diameter. */
+ /* START # 7 */
+ if (temp[2] == 'd') /* Head diameter. */
{
(void)sscanf(temp1, "%lf", &hd);
}
- else if (temp[2] =='h') /* Head height. */
+ else if (temp[2] =='h') /* Head height. */
{
(void)sscanf(temp1, "%lf", &hh);
}
- } /* END # 7 */
+ } /* END # 7 */
- /* -wd & -wh - washer diameter & height. */
+ /* -wd & -wh - washer diameter & height. */
else if (temp[1] == 'w')
{
- /* START # 8 */
- if (temp[2] == 'd') /* Washer diameter. */
+ /* START # 8 */
+ if (temp[2] == 'd') /* Washer diameter. */
{
(void)sscanf(temp1, "%lf", &wd);
}
- else if (temp[2] == 'h') /* Washer height. */
+ else if (temp[2] == 'h') /* Washer height. */
{
(void)sscanf(temp1, "%lf", &wh);
}
- } /* END # 8 */
+ } /* END # 8 */
- /* -sd & -sh - stem washer diameter & height. */
+ /* -sd & -sh - stem washer diameter & height. */
else if (temp[1] == 's')
{
- /* START # 9 */
- if (temp[2] == 'd') /* Stem diameter. */
+ /* START # 9 */
+ if (temp[2] == 'd') /* Stem diameter. */
{
(void)sscanf(temp1, "%lf", &sd);
}
- else if (temp[2] == 'h') /* Stem height. */
+ else if (temp[2] == 'h') /* Stem height. */
{
(void)sscanf(temp1, "%lf", &sh);
}
- } /* END # 9 */
- } /* END # 6.1 */
+ } /* END # 9 */
+ } /* END # 6.1 */
- } /* END # 3 */
- } /* END # 2 */
+ } /* END # 3 */
+ } /* END # 2 */
- /* Print out bolt dimensions. */
+ /* Print out bolt dimensions. */
(void)printf("\noption: %d - ", iopt);
if (iopt == 1) (void)printf("bolt head\n");
if (iopt == 2) (void)printf("head & washer\n");
@@ -292,22 +292,22 @@
(void)printf("number of bolts: %d\n\n", numblt);
(void)fflush(stdout);
- /* Open mged file for writing to. */
+ /* Open mged file for writing to. */
fpw = wdb_fopen(filemged);
- /* Write ident record. */
+ /* Write ident record. */
mk_id(fpw, "bolts");
- for (i=0; i<numblt; i++) /* Loop for each bolt created. */
+ for (i=0; i<numblt; i++) /* Loop for each bolt created. */
{
- /* START # 20 */
+ /* START # 20 */
- /* Create all solids needed. */
- /* Create solids of bolt head. */
+ /* Create all solids needed. */
+ /* Create solids of bolt head. */
leg = tan(M_PI / 6.) * hd / 2.;
hyp = leg * leg + (hd / 2.) * (hd / 2.);
hyp = sqrt(hyp);
- /* Bolt head is two solids, create first solid. */
+ /* Bolt head is two solids, create first solid. */
pts[0][0] = (fastf_t) ((-hd) / 2.);
pts[0][1] = (fastf_t)leg;
pts[0][2] = (fastf_t)hh;
@@ -336,7 +336,7 @@
solnam[7] = '1';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create second solid. */
+ /* Create second solid. */
pts[0][0] = (fastf_t) (hd / 2.);
pts[0][1] = (fastf_t)leg;
pts[0][2] = (fastf_t)hh;
@@ -364,7 +364,7 @@
solnam[7] = '2';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create washer if necessary. */
+ /* Create washer if necessary. */
if ((iopt == 2) || (iopt == 3))
{
bs[0] = (fastf_t)0.;
@@ -378,7 +378,7 @@
mk_rcc(fpw, solnam, bs, ht, rad);
}
- /* Create bolt stem if necessary. */
+ /* Create bolt stem if necessary. */
if ((iopt == 3) || (iopt == 4))
{
bs[0] = (fastf_t)0.;
@@ -392,22 +392,22 @@
mk_rcc(fpw, solnam, bs, ht, rad);
}
- /* Create all regions. */
- /* First must initialize list. */
+ /* Create all regions. */
+ /* First must initialize list. */
BU_LIST_INIT(&comb.l);
- /* Create region for first half of bolt head. */
+ /* Create region for first half of bolt head. */
solnam[7] = '1';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
solnam[7] = '2';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_SUBTRACT);
- /* Subtract washer if it exists. */
+ /* Subtract washer if it exists. */
if ((iopt == 2) || (iopt == 3))
{
solnam[7] = '3';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_SUBTRACT);
}
- /* Subtract stem if it exists. */
+ /* Subtract stem if it exists. */
if ((iopt == 3) || (iopt == 4))
{
solnam[7] = '3';
@@ -417,16 +417,16 @@
regnam[7] = '1';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Create region for second half of bolt head. */
+ /* Create region for second half of bolt head. */
solnam[7] = '2';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
- /* Subtract washer if it exists. */
+ /* Subtract washer if it exists. */
if ((iopt == 2) || (iopt == 3))
{
solnam[7] = '3';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_SUBTRACT);
}
- /* Subtract stem if it exists. */
+ /* Subtract stem if it exists. */
if ((iopt == 3) || (iopt == 4))
{
solnam[7] = '4';
@@ -435,12 +435,12 @@
regnam[7] = '2';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Create region for washer if it exists. */
+ /* Create region for washer if it exists. */
if ((iopt == 2) || (iopt == 3))
{
solnam[7] = '3';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
- /* Subtract bolt stem if it exists. */
+ /* Subtract bolt stem if it exists. */
if (iopt == 3)
{
solnam[7] = '4';
@@ -450,7 +450,7 @@
mk_lfcomb(fpw, regnam, &comb, 1);
}
- /* Create region for bolt stem if it exists. */
+ /* Create region for bolt stem if it exists. */
if ((iopt == 3) || (iopt == 4))
{
solnam[7] = '4';
@@ -459,33 +459,33 @@
mk_lfcomb(fpw, regnam, &comb, 1);
}
- /* Create a group containing all bolt regions. */
- /* First initialize the list. */
+ /* Create a group containing all bolt regions. */
+ /* First initialize the list. */
BU_LIST_INIT(&comb1.l);
- /* Add both bolt head regions to the list. */
+ /* Add both bolt head regions to the list. */
regnam[7] = '1';
(void)mk_addmember(regnam, &comb1.l, NULL, WMOP_UNION);
regnam[7] = '2';
(void)mk_addmember(regnam, &comb1.l, NULL, WMOP_UNION);
- /* Add washer region if necessary. */
+ /* Add washer region if necessary. */
if ((iopt == 2) || (iopt == 3))
{
regnam[7] = '3';
(void)mk_addmember(regnam, &comb1.l, NULL, WMOP_UNION);
}
- /* Add bolt stem region if necessary. */
+ /* Add bolt stem region if necessary. */
if ((iopt == 3) || (iopt == 4))
{
regnam[7] = '4';
(void)mk_addmember(regnam, &comb1.l, NULL, WMOP_UNION);
}
- /* Actually create the group. */
+ /* Actually create the group. */
grpnam[4] = 97 + i;
mk_lfcomb(fpw, grpnam, &comb1, 0);
- } /* END # 20 */
+ } /* END # 20 */
- /* Close mged file. */
+ /* Close mged file. */
wdb_close(fpw);
return 0;
}
Modified: brlcad/trunk/src/shapes/gastank.c
===================================================================
--- brlcad/trunk/src/shapes/gastank.c 2009-01-09 20:44:20 UTC (rev 33506)
+++ brlcad/trunk/src/shapes/gastank.c 2009-01-09 20:49:59 UTC (rev 33507)
@@ -41,35 +41,35 @@
int
main(int argc, char **argv)
{
- /* START # 1 */
- struct rt_wdb *fpw; /* File to be written to. */
- char filemged[26]; /* Mged file create. */
- double hgt, wid, dpt; /* Height, width, & depth of gas tank. */
- double rds; /* Radius of the corner of gas tank. */
- point_t pts[8]; /* Points for arb8. */
- point_t bs; /* Base of cylinder. */
- vect_t ht; /* Height of cylinder. */
- fastf_t rad; /* Radius of cylinder & sphere. */
- point_t cent; /* Center of sphere. */
+ /* START # 1 */
+ struct rt_wdb *fpw; /* File to be written to. */
+ char filemged[26]; /* Mged file create. */
+ double hgt, wid, dpt; /* Height, width, & depth of gas tank. */
+ double rds; /* Radius of the corner of gas tank. */
+ point_t pts[8]; /* Points for arb8. */
+ point_t bs; /* Base of cylinder. */
+ vect_t ht; /* Height of cylinder. */
+ fastf_t rad; /* Radius of cylinder & sphere. */
+ point_t cent; /* Center of sphere. */
- /* point_t and vect_t are set using typedef of type fastf_t. */
- /* fastf_t is a type that is machine dependent. */
+ /* point_t and vect_t are set using typedef of type fastf_t. */
+ /* fastf_t is a type that is machine dependent. */
- char *temp; /* Temporary character string. */
- char temp1[16]; /* Temporary character string. */
+ char *temp; /* Temporary character string. */
+ char temp1[16]; /* Temporary character string. */
- char solnam[9]; /* Solid name. */
- char regnam[9]; /* Region name. */
- char grpnam[5]; /* Group name. */
- int numtnk; /* Number of gas tanks to be created */
- /* (<=26). */
+ char solnam[9]; /* Solid name. */
+ char regnam[9]; /* Region name. */
+ char grpnam[5]; /* Group name. */
+ int numtnk; /* Number of gas tanks to be created */
+ /* (<=26). */
- struct wmember comb; /* Used to make regions. */
- struct wmember comb1; /* Used to make groups. */
+ struct wmember comb; /* Used to make regions. */
+ struct wmember comb1; /* Used to make groups. */
- int i, j, k; /* Loop counters. */
+ int i, j, k; /* Loop counters. */
- /* Set up solid, region, and group names. */
+ /* Set up solid, region, and group names. */
solnam[0] = 's';
solnam[1] = '.';
solnam[2] = 't';
@@ -94,27 +94,27 @@
grpnam[3] = ' ';
grpnam[4] = '\0';
- /* If there are no arguments ask questions. */
+ /* If there are no arguments ask questions. */
if (argc == 1)
{
- /* START # 3 */
+ /* START # 3 */
- /* Print info about the window. */
+ /* Print info about the window. */
(void)printf("\nThis program constructs a solid gas tank with all\n");
(void)printf("edges and corners rounded.\n\n");
- /* Find name of mged file to be created. */
+ /* Find name of mged file to be created. */
(void)printf("Enter the mged file to be created (25 char max).\n\t");
(void)fflush(stdout);
(void)scanf("%26s", filemged);
- /* Find the number of gas tanks to create. */
+ /* Find the number of gas tanks to create. */
(void)printf("Enter the number of gas tanks to create (26 max).\n\t");
(void)fflush(stdout);
(void)scanf("%d", &numtnk);
if (numtnk > 26) numtnk = 26;
- /* Find the dimensions of the gas tanks. */
+ /* Find the dimensions of the gas tanks. */
(void)printf("Enter the height, width, and depth of the gas tank.\n\t");
(void)fflush(stdout);
(void)scanf("%lf %lf %lf", &hgt, &wid, &dpt);
@@ -122,56 +122,56 @@
(void)fflush(stdout);
(void)scanf("%lf", &rds);
- } /* END # 3 */
+ } /* END # 3 */
- /* If there are arguments get answers from arguments. */
+ /* If there are arguments get answers from arguments. */
else
{
- /* START # 4 */
- /* List options. */
- /* -fname - name = mged file name. */
- /* -n# - # = number of gas tanks. */
- /* -h# - # = height of gas tank in mm. */
- /* -w# - # = width of gas tank in mm. */
- /* -d# - # = depth of gas tank in mm. */
- /* -r# - # = radius of corners in mm. */
+ /* START # 4 */
+ /* List options. */
+ /* -fname - name = mged file name. */
+ /* -n# - # = number of gas tanks. */
+ /* -h# - # = height of gas tank in mm. */
+ /* -w# - # = width of gas tank in mm. */
+ /* -d# - # = depth of gas tank in mm. */
+ /* -r# - # = radius of corners in mm. */
for (i=1; i<argc; i++)
{
- /* START # 5 */
- /* Put argument in temporary character string. */
+ /* START # 5 */
+ /* Put argument in temporary character string. */
temp = argv[i];
- /* -f - mged file. */
+ /* -f - mged file. */
if (temp[1] == 'f')
{
- /* START # 6 */
+ /* START # 6 */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 25))
{
- /* START # 7 */
+ /* START # 7 */
filemged[k] = temp[j];
j++;
k++;
- } /* END # 7 */
+ } /* END # 7 */
filemged[k] = '\0';
- } /* END # 6 */
+ } /* END # 6 */
- /* All other options. */
+ /* All other options. */
else
{
- /* START # 8 */
- /* Set up temporary character string. */
+ /* START # 8 */
+ /* Set up temporary character string. */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 15))
{
- /* START # 9 */
+ /* START # 9 */
temp1[k] = temp[j];
j++;
k++;
- } /* END # 9 */
+ } /* END # 9 */
temp1[k] = '\0';
if (temp[1] == 'n')
{
@@ -182,11 +182,11 @@
else if (temp[1] == 'w') (void)sscanf(temp1, "%lf", &wid);
else if (temp[1] == 'd') (void)sscanf(temp1, "%lf", &dpt);
else if (temp[1] == 'r') (void)sscanf(temp1, "%lf", &rds);
- } /* END # 8 */
- } /* END # 5 */
- } /* END # 4 */
+ } /* END # 8 */
+ } /* END # 5 */
+ } /* END # 4 */
- /* Print out all info. */
+ /* Print out all info. */
(void)printf("\nmged file: %s\n", filemged);
(void)printf("height of gas tank: %f mm\n", hgt);
(void)printf("width of gas tank: %f mm\n", wid);
@@ -195,19 +195,19 @@
(void)printf("number of gas tanks: %d\n\n", numtnk);
(void)fflush(stdout);
- /* Open mged file. */
+ /* Open mged file. */
fpw = wdb_fopen(filemged);
- /* Write ident record. */
+ /* Write ident record. */
mk_id(fpw, "windows");
for (i=0; i<numtnk; i++)
{
- /* START # 2 */
+ /* START # 2 */
- /* Create all solids. */
+ /* Create all solids. */
- /* Create the 3 arb8s. */
+ /* Create the 3 arb8s. */
pts[0][0] = (fastf_t)(dpt / 2.);
pts[0][1] = (fastf_t)(wid / 2. - rds);
@@ -276,7 +276,7 @@
solnam[7] = '3';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Make 8 spheres. */
+ /* Make 8 spheres. */
cent[0] = (fastf_t)(dpt / 2. - rds);
cent[1] = (fastf_t)(wid / 2. - rds);
@@ -315,7 +315,7 @@
solnam[7] = '1';
mk_sph(fpw, solnam, cent, rad);
- /* Make 12 cylinders. */
+ /* Make 12 cylinders. */
bs[0] = (fastf_t)(dpt / 2. - rds);
bs[1] = (fastf_t)(wid / 2. - rds);
@@ -381,12 +381,12 @@
solnam[7] = '3';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Make all regions. */
+ /* Make all regions. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb.l);
- /* Region 1. */
+ /* Region 1. */
solnam[5] = 97 + i;
solnam[6] = '0';
solnam[7] = '1';
@@ -400,7 +400,7 @@
regnam[7] = '1';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 2. */
+ /* Region 2. */
solnam[7] = '2';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
solnam[7] = '3';
@@ -408,13 +408,13 @@
regnam[7] = '2';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 3. */
+ /* Region 3. */
solnam[7] = '3';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
regnam[7] = '3';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 4. */
+ /* Region 4. */
solnam[7] = '4';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
solnam[6] = '1';
@@ -428,7 +428,7 @@
regnam[7] = '4';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 5. */
+ /* Region 5. */
solnam[6] = '0';
solnam[7] = '5';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -443,7 +443,7 @@
regnam[7] = '5';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 6. */
+ /* Region 6. */
solnam[6] = '0';
solnam[7] = '6';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -458,7 +458,7 @@
regnam[7] = '6';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 7. */
+ /* Region 7. */
solnam[6] = '0';
solnam[7] = '7';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -473,7 +473,7 @@
regnam[7] = '7';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 8. */
+ /* Region 8. */
solnam[6] = '0';
solnam[7] = '8';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -488,7 +488,7 @@
regnam[7] = '8';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 9. */
+ /* Region 9. */
solnam[6] = '0';
solnam[7] = '9';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -503,7 +503,7 @@
regnam[7] = '9';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 10. */
+ /* Region 10. */
solnam[6] = '1';
solnam[7] = '0';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -518,7 +518,7 @@
regnam[7] = '0';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 11. */
+ /* Region 11. */
solnam[6] = '1';
solnam[7] = '1';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -533,7 +533,7 @@
regnam[7] = '1';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 12. */
+ /* Region 12. */
solnam[6] = '1';
solnam[7] = '2';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -546,7 +546,7 @@
regnam[7] = '2';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 13. */
+ /* Region 13. */
solnam[6] = '1';
solnam[7] = '3';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -559,7 +559,7 @@
regnam[7] = '3';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 14. */
+ /* Region 14. */
solnam[6] = '1';
solnam[7] = '4';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -572,7 +572,7 @@
regnam[7] = '4';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 15. */
+ /* Region 15. */
solnam[6] = '1';
solnam[7] = '5';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -585,7 +585,7 @@
regnam[7] = '5';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 16. */
+ /* Region 16. */
solnam[6] = '1';
solnam[7] = '6';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -598,7 +598,7 @@
regnam[7] = '6';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 17. */
+ /* Region 17. */
solnam[6] = '1';
solnam[7] = '7';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -611,7 +611,7 @@
regnam[7] = '7';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 18. */
+ /* Region 18. */
solnam[6] = '1';
solnam[7] = '8';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -624,7 +624,7 @@
regnam[7] = '8';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 19. */
+ /* Region 19. */
solnam[6] = '1';
solnam[7] = '9';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -637,7 +637,7 @@
regnam[7] = '9';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 20. */
+ /* Region 20. */
solnam[6] = '2';
solnam[7] = '0';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -650,7 +650,7 @@
regnam[7] = '0';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 21. */
+ /* Region 21. */
solnam[6] = '2';
solnam[7] = '1';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -663,7 +663,7 @@
regnam[7] = '1';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 22. */
+ /* Region 22. */
solnam[6] = '2';
solnam[7] = '2';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -676,7 +676,7 @@
regnam[7] = '2';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Region 23. */
+ /* Region 23. */
solnam[6] = '2';
solnam[7] = '3';
(void)mk_addmember(solnam, &comb.l, NULL, WMOP_INTERSECT);
@@ -689,9 +689,9 @@
regnam[7] = '3';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Create group. */
+ /* Create group. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb1.l);
regnam[6] = '0';
@@ -746,12 +746,12 @@
grpnam[3] = 97 + i;
mk_lfcomb(fpw, grpnam, &comb1, 0);
- } /* START # 2 */
+ } /* START # 2 */
- /* Close file. */
+ /* Close file. */
wdb_close(fpw);
return 0;
-} /* END # 1 */
+} /* END # 1 */
/*
* Local Variables:
Modified: brlcad/trunk/src/shapes/handle.c
===================================================================
--- brlcad/trunk/src/shapes/handle.c 2009-01-09 20:44:20 UTC (rev 33506)
+++ brlcad/trunk/src/shapes/handle.c 2009-01-09 20:49:59 UTC (rev 33507)
@@ -43,32 +43,32 @@
int
main(int argc, char **argv)
{
- /* START # 1 */
- struct rt_wdb *fpw; /* File to be written to. */
- char filemged[26]; /* Mged file create. */
- double hgt, len; /* Height & length of handle. */
- double r1, r2; /* Radius of tori & radius of cylinders. */
- point_t pts[8]; /* Eight points of arb8. */
- point_t bs; /* Base of rcc. */
- vect_t ht; /* Height of rcc. */
- fastf_t rad; /* Radius of rcc. */
- point_t cent; /* Center of torus. */
- vect_t norm; /* Normal of torus. */
- double rad1, rad2; /* R1 and r2 of torus. */
- char *temp; /* Temporary character string. */
- char temp1[16]; /* Temporary character string. */
+ /* START # 1 */
+ struct rt_wdb *fpw; /* File to be written to. */
+ char filemged[26]; /* Mged file create. */
+ double hgt, len; /* Height & length of handle. */
+ double r1, r2; /* Radius of tori & radius of cylinders. */
+ point_t pts[8]; /* Eight points of arb8. */
+ point_t bs; /* Base of rcc. */
+ vect_t ht; /* Height of rcc. */
+ fastf_t rad; /* Radius of rcc. */
+ point_t cent; /* Center of torus. */
+ vect_t norm; /* Normal of torus. */
+ double rad1, rad2; /* R1 and r2 of torus. */
+ char *temp; /* Temporary character string. */
+ char temp1[16]; /* Temporary character string. */
- char solnam[8]; /* Solid name. */
- char regnam[8]; /* Region name. */
- char grpnam[5]; /* Group name. */
- int numhan; /* Number of handles to be created (<=26). */
+ char solnam[8]; /* Solid name. */
+ char regnam[8]; /* Region name. */
+ char grpnam[5]; /* Group name. */
+ int numhan; /* Number of handles to be created (<=26). */
- struct wmember comb; /* Used to make regions. */
- struct wmember comb1; /* Used to make groups. */
+ struct wmember comb; /* Used to make regions. */
+ struct wmember comb1; /* Used to make groups. */
- int i, j, k; /* Loop counters. */
+ int i, j, k; /* Loop counters. */
- /* Set up solid, region, and group names. */
+ /* Set up solid, region, and group names. */
solnam[0] = 's';
solnam[1] = '.';
solnam[2] = 'h';
@@ -91,31 +91,31 @@
grpnam[3] = ' ';
grpnam[4] = '\0';
- /* If there are no arguments ask questions. */
+ /* If there are no arguments ask questions. */
if (argc == 1)
{
- /* START # 3 */
+ /* START # 3 */
- /* Explain makings of handle. */
+ /* Explain makings of handle. */
(void)printf("\nThis program constructs a handle with the base centered\n");
(void)printf("at (0, 0, 0) and the height extending in the positive z-\n");
(void)printf("direction. The handle will be composed of 3 cylinders, \n");
(void)printf("2 tori, and 2 arb8s.\n\n");
(void)fflush(stdout);
- /* Find name of mged file to create. */
+ /* Find name of mged file to create. */
(void)printf("Enter the name of the mged file to be created ");
(void)printf("(25 char max).\n\t");
(void)fflush(stdout);
(void)scanf("%26s", filemged);
- /* Find number of handles to create (<=26). */
+ /* Find number of handles to create (<=26). */
(void)printf("Enter number of handles to create (26 max).\n\t");
(void)fflush(stdout);
(void)scanf("%d", &numhan);
if (numhan > 26) numhan = 26;
- /* Find dimensions of handle. */
+ /* Find dimensions of handle. */
(void)printf("Enter the length and height of handle in mm.\n\t");
(void)fflush(stdout);
(void)scanf("%lf %lf", &len, &hgt);
@@ -128,102 +128,102 @@
(void)fflush(stdout);
(void)scanf("%lf", &r2);
- } /* END # 3 */
+ } /* END # 3 */
- /* if there are arguments get the answers from the arguments. */
+ /* if there are arguments get the answers from the arguments. */
else
{
- /* START # 4 */
- /* List of options. */
- /* -fname - name = name of .g file. */
- /* -n# - # = number of handles. */
- /* -l# - # = length of handle in mm. */
- /* -h# - # = height of handle in mm. */
- /* -r1# - # = r1 radius of torus. */
- /* -r2# - # = r2 radius of torus & cylinder. */
+ /* START # 4 */
+ /* List of options. */
+ /* -fname - name = name of .g file. */
+ /* -n# - # = number of handles. */
+ /* -l# - # = length of handle in mm. */
+ /* -h# - # = height of handle in mm. */
+ /* -r1# - # = r1 radius of torus. */
+ /* -r2# - # = r2 radius of torus & cylinder. */
for (i=1; i<argc; i++)
{
- /* START # 5 */
- /* Put argument into temporary character string. */
+ /* START # 5 */
+ /* Put argument into temporary character string. */
temp = argv[i];
- /* -f - mged file name. */
+ /* -f - mged file name. */
if (temp[1] == 'f')
{
- /* START # 6 */
+ /* START # 6 */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 25))
{
- /* START # 7 */
+ /* START # 7 */
filemged[k] = temp[j];
j++;
k++;
- } /* END # 7 */
+ } /* END # 7 */
filemged[k] = '\0';
- } /* END # 6 */
+ } /* END # 6 */
- /* -n - # of handles to be created. */
+ /* -n - # of handles to be created. */
else if (temp[1] == 'n')
{
- /* START # 8 */
- /* Set up temporary character string. */
+ /* START # 8 */
+ /* Set up temporary character string. */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 15))
{
- /* START # 9 */
+ /* START # 9 */
temp1[k] = temp[j];
j++;
k++;
- } /* END # 9 */
+ } /* END # 9 */
temp1[k] = '\0';
(void)sscanf(temp1, "%d", &numhan);
if (numhan > 26) numhan = 26;
- } /* END # 8 */
+ } /* END # 8 */
- /* -l or -h - length and height of handle in mm. */
+ /* -l or -h - length and height of handle in mm. */
else if ((temp[1] == 'l') || (temp[1] == 'h'))
{
- /* START # 10 */
- /* Set up temporary character string. */
+ /* START # 10 */
+ /* Set up temporary character string. */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 15))
{
- /* START # 11 */
+ /* START # 11 */
temp1[k] = temp[j];
j++;
k++;
- } /* END # 11 */
+ } /* END # 11 */
temp1[k] = '\0';
if (temp[1] == 'l') (void)sscanf(temp1, "%lf", &len);
else if (temp[1] == 'h') (void)sscanf(temp1, "%lf", &hgt);
- } /* END # 10 */
+ } /* END # 10 */
- /* -r1 or -r2 - radii for torus. */
+ /* -r1 or -r2 - radii for torus. */
else if (temp[1] == 'r')
{
- /* START # 12 */
- /* Set up temporary character string. */
+ /* START # 12 */
+ /* Set up temporary character string. */
j = 3;
k = 0;
while ((temp[j] != '\0') && (k < 15))
{
- /* START # 13 */
+ /* START # 13 */
temp1[k] = temp[j];
j++;
k++;
- } /* END # 13 */
+ } /* END # 13 */
temp1[k] = '\0';
if (temp[2] == '1') (void)sscanf(temp1, "%lf", &r1);
else if (temp[2] == '2') (void)sscanf(temp1, "%lf", &r2);
- } /* END # 12 */
- } /* END # 5 */
- } /* END # 4 */
+ } /* END # 12 */
+ } /* END # 5 */
+ } /* END # 4 */
- /* Print out dimensions of the handle. */
+ /* Print out dimensions of the handle. */
(void)printf("\nmged file name: %s\n", filemged);
(void)printf("length: %f mm\n", len);
(void)printf("height: %f mm\n", hgt);
@@ -232,19 +232,19 @@
(void)printf("number of handles: %d\n\n", numhan);
(void)fflush(stdout);
- /* Open mged file for writing to. */
+ /* Open mged file for writing to. */
fpw = wdb_fopen(filemged);
- /* Write ident record. */
+ /* Write ident record. */
mk_id(fpw, "handles");
for (i=0; i<numhan; i++)
{
- /* START # 2 */
+ /* START # 2 */
- /* Create solids for handle. */
+ /* Create solids for handle. */
- /* Create top cylinder. */
+ /* Create top cylinder. */
bs[0] = (fastf_t)0.;
bs[1] = (fastf_t) (len / 2. - r1 - r2);
bs[2] = (fastf_t) (hgt - r2);
@@ -256,7 +256,7 @@
solnam[6] = '1';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create right cylinder. */
+ /* Create right cylinder. */
bs[0] = (fastf_t)0.;
bs[1] = (fastf_t) (len / 2. - r2);
bs[2] = (fastf_t)0.;
@@ -267,12 +267,12 @@
solnam[6] = '2';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create left cylinder. */
+ /* Create left cylinder. */
bs[1] = (-bs[1]);
solnam[6] = '3';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create right torus. */
+ /* Create right torus. */
cent[0] = (fastf_t)0.;
cent[1] = (fastf_t) (len / 2. -r1 - r2);
cent[2] = (fastf_t) (hgt - r1 -r2);
@@ -284,12 +284,12 @@
solnam[6] = '4';
mk_tor(fpw, solnam, cent, norm, rad1, rad2);
- /* Create left torus. */
+ /* Create left torus. */
cent[1] = (-cent[1]);
solnam[6] = '5';
mk_tor(fpw, solnam, cent, norm, rad1, rad2);
- /* Create right arb8. */
+ /* Create right arb8. */
pts[0][0] = (fastf_t)r2;
pts[0][1] = (fastf_t) (len / 2. - r1 - r2);
pts[0][2] = (fastf_t)hgt;
@@ -317,7 +317,7 @@
solnam[6] ='6';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create left arb8. */
+ /* Create left arb8. */
pts[0][1] = (-pts[0][1]);
pts[1][1] = (-pts[1][1]);
pts[2][1] = (-pts[2][1]);
@@ -329,9 +329,9 @@
solnam[6] = '7';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create all regions. */
+ /* Create all regions. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb.l);
solnam[6] = '1';
@@ -372,9 +372,9 @@
regnam[6] = '5';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Create a group. */
+ /* Create a group. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb1.l);
regnam[6] = '1';
@@ -390,13 +390,13 @@
grpnam[3] = 97 + i;
mk_lfcomb(fpw, grpnam, &comb1, 0);
- } /* END # 2 */
+ } /* END # 2 */
- /* Close mged file. */
+ /* Close mged file. */
wdb_close(fpw);
return 0;
-} /* END # 1 */
+} /* END # 1 */
/*
* Local Variables:
Modified: brlcad/trunk/src/shapes/window.c
===================================================================
--- brlcad/trunk/src/shapes/window.c 2009-01-09 20:44:20 UTC (rev 33506)
+++ brlcad/trunk/src/shapes/window.c 2009-01-09 20:49:59 UTC (rev 33507)
@@ -42,29 +42,29 @@
int
main(int argc, char **argv)
{
- /* START # 1 */
- struct rt_wdb *fpw; /* File to be written to. */
- char filemged[26]; /* Mged file create. */
- double hgt, wid, dpt; /* Height, width, & depth of handle. */
- double rds; /* Radius of the corner of window. */
- point_t pts[8]; /* Eight points of arb8. */
- point_t bs; /* Base of rcc. */
- vect_t ht; /* Height of rcc. */
- fastf_t rad; /* Radius of rcc. */
- char *temp; /* Temporary character string. */
- char temp1[16]; /* Temporary character string. */
+ /* START # 1 */
+ struct rt_wdb *fpw; /* File to be written to. */
+ char filemged[26]; /* Mged file create. */
+ double hgt, wid, dpt; /* Height, width, & depth of handle. */
+ double rds; /* Radius of the corner of window. */
+ point_t pts[8]; /* Eight points of arb8. */
+ point_t bs; /* Base of rcc. */
+ vect_t ht; /* Height of rcc. */
+ fastf_t rad; /* Radius of rcc. */
+ char *temp; /* Temporary character string. */
+ char temp1[16]; /* Temporary character string. */
- char solnam[8]; /* Solid name. */
- char regnam[8]; /* Region name. */
- char grpnam[5]; /* Group name. */
- int numwin; /* Number of windows to be created (<=26). */
+ char solnam[8]; /* Solid name. */
+ char regnam[8]; /* Region name. */
+ char grpnam[5]; /* Group name. */
+ int numwin; /* Number of windows to be created (<=26). */
- struct wmember comb; /* Used to make regions. */
- struct wmember comb1; /* Used to make groups. */
+ struct wmember comb; /* Used to make regions. */
+ struct wmember comb1; /* Used to make groups. */
- int i, j, k; /* Loop counters. */
+ int i, j, k; /* Loop counters. */
- /* Set up solid, region, and group names. */
+ /* Set up solid, region, and group names. */
solnam[0] = 's';
solnam[1] = '.';
solnam[2] = 'w';
@@ -87,28 +87,28 @@
grpnam[3] = ' ';
grpnam[4] = '\0';
- /* If there are no arguments ask questions. */
+ /* If there are no arguments ask questions. */
if (argc == 1)
{
- /* START # 3 */
+ /* START # 3 */
- /* Print info about the window. */
+ /* Print info about the window. */
(void)printf("\nThe windows are composed of 2 arb8s and 4 cylinders.\n");
(void)printf("The front of the window is centered at (0, 0, 0) and\n");
(void)printf("extends in the negative x-direction the depth of the\n");
(void)printf("window.\n\n");
- /* Find name of mged file to be created. */
+ /* Find name of mged file to be created. */
(void)printf("Enter the mged file to be created (25 char max).\n\t");
(void)fflush(stdout);
(void)scanf("%26s", filemged);
- /* Find the number of windows to create. */
+ /* Find the number of windows to create. */
(void)printf("Enter the number of windows to create (26 max).\n\t");
(void)fflush(stdout);
(void)scanf("%d", &numwin);
- /* Find the dimensions of the windows. */
+ /* Find the dimensions of the windows. */
(void)printf("Enter the height, width, and depth of the window.\n\t");
(void)fflush(stdout);
(void)scanf("%lf %lf %lf", &hgt, &wid, &dpt);
@@ -116,56 +116,56 @@
(void)fflush(stdout);
(void)scanf("%lf", &rds);
- } /* END # 3 */
+ } /* END # 3 */
- /* If there are arguments get answers from arguments. */
+ /* If there are arguments get answers from arguments. */
else
{
- /* START # 4 */
- /* List options. */
- /* -fname - name = mged file name. */
- /* -n# - # = number of windows. */
- /* -h# - # = height of window in mm. */
- /* -w# - # = width of window in mm. */
- /* -d# - # = depth of window in mm. */
- /* -r# - # = radius of window corner in mm. */
+ /* START # 4 */
+ /* List options. */
+ /* -fname - name = mged file name. */
+ /* -n# - # = number of windows. */
+ /* -h# - # = height of window in mm. */
+ /* -w# - # = width of window in mm. */
+ /* -d# - # = depth of window in mm. */
+ /* -r# - # = radius of window corner in mm. */
for (i=1; i<argc; i++)
{
- /* START # 5 */
- /* Put argument in temporary character string. */
+ /* START # 5 */
+ /* Put argument in temporary character string. */
temp = argv[i];
- /* -f - mged file. */
+ /* -f - mged file. */
if (temp[1] == 'f')
{
- /* START # 6 */
+ /* START # 6 */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 25))
{
- /* START # 7 */
+ /* START # 7 */
filemged[k] = temp[j];
j++;
k++;
- } /* END # 7 */
+ } /* END # 7 */
filemged[k] = '\0';
- } /* END # 6 */
+ } /* END # 6 */
- /* All other options. */
+ /* All other options. */
else
{
- /* START # 8 */
- /* Set up temporary character string. */
+ /* START # 8 */
+ /* Set up temporary character string. */
j = 2;
k = 0;
while ((temp[j] != '\0') && (k < 15))
{
- /* START # 9 */
+ /* START # 9 */
temp1[k] = temp[j];
j++;
k++;
- } /* END # 9 */
+ } /* END # 9 */
temp1[k] = '\0';
if (temp[1] == 'n')
{
@@ -176,11 +176,11 @@
else if (temp[1] == 'w') (void)sscanf(temp1, "%lf", &wid);
else if (temp[1] == 'd') (void)sscanf(temp1, "%lf", &dpt);
else if (temp[1] == 'r') (void)sscanf(temp1, "%lf", &rds);
- } /* END # 8 */
- } /* END # 5 */
- } /* END # 4 */
+ } /* END # 8 */
+ } /* END # 5 */
+ } /* END # 4 */
- /* Print out all info. */
+ /* Print out all info. */
(void)printf("\nmged file: %s\n", filemged);
(void)printf("height of window: %f mm\n", hgt);
(void)printf("width of window: %f mm\n", wid);
@@ -189,16 +189,16 @@
(void)printf("number of windows: %d\n\n", numwin);
(void)fflush(stdout);
- /* Open mged file. */
+ /* Open mged file. */
fpw = wdb_fopen(filemged);
- /* Write ident record. */
+ /* Write ident record. */
mk_id(fpw, "windows");
for (i=0; i<numwin; i++)
{
- /* START # 2 */
- /* Create first arb8. */
+ /* 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.);
@@ -227,7 +227,7 @@
solnam[6] = '1';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create second arb8. */
+ /* 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.);
@@ -247,7 +247,7 @@
solnam[6] = '2';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create cylinder 1. */
+ /* Create cylinder 1. */
bs[0] = (fastf_t)0.;
bs[1] = (fastf_t) (wid / 2. - rds);
bs[2] = (fastf_t) (hgt / 2. - rds);
@@ -258,24 +258,24 @@
solnam[6] = '3';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 2. */
+ /* Create cylinder 2. */
bs[2] = (-bs[2]);
solnam[6] = '4';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 3. */
+ /* Create cylinder 3. */
bs[1] = (-bs[1]);
solnam[6] = '5';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 4. */
+ /* Create cylinder 4. */
bs[2] = (-bs[2]);
solnam[6] = '6';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Make all regions. */
+ /* Make all regions. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb.l);
solnam[6] = '1';
@@ -326,9 +326,9 @@
regnam[6] = '6';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Create group. */
+ /* Create group. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb1.l);
regnam[6] = '1';
@@ -346,13 +346,13 @@
grpnam[3] = 97 + i;
mk_lfcomb(fpw, grpnam, &comb1, 0);
- } /* START # 2 */
+ } /* START # 2 */
- /* Close file. */
+ /* Close file. */
wdb_close(fpw);
return 0;
-} /* END # 1 */
+} /* END # 1 */
/*
* Local Variables:
Modified: brlcad/trunk/src/shapes/winfrm.c
===================================================================
--- brlcad/trunk/src/shapes/winfrm.c 2009-01-09 20:44:20 UTC (rev 33506)
+++ brlcad/trunk/src/shapes/winfrm.c 2009-01-09 20:49:59 UTC (rev 33507)
@@ -42,31 +42,31 @@
int
main(int argc, char **argv)
{
- /* START # 1 */
- struct rt_wdb *fpw; /* File to be written to. */
- char filemged[26]; /* Mged file create. */
- double hgt, wid, dpt; /* Height, width, & depth of outside window */
- /* frame. */
- double rds; /* Radius of the corner of window frame. */
- double isw; /* Width of frame itself. */
- point_t pts[8]; /* Eight points of arb8. */
- point_t bs; /* Base of rcc. */
- vect_t ht; /* Height of rcc. */
- fastf_t rad; /* Radius of rcc. */
- char *temp; /* Temporary character string. */
- char temp1[16]; /* Temporary character string. */
+ /* START # 1 */
+ struct rt_wdb *fpw; /* File to be written to. */
+ char filemged[26]; /* Mged file create. */
+ double hgt, wid, dpt; /* Height, width, & depth of outside window */
+ /* frame. */
+ double rds; /* Radius of the corner of window frame. */
+ double isw; /* Width of frame itself. */
+ point_t pts[8]; /* Eight points of arb8. */
+ point_t bs; /* Base of rcc. */
+ vect_t ht; /* Height of rcc. */
+ fastf_t rad; /* Radius of rcc. */
+ char *temp; /* Temporary character string. */
+ char temp1[16]; /* Temporary character string. */
- char solnam[9]; /* Solid name. */
- char regnam[8]; /* Region name. */
- char grpnam[5]; /* Group name. */
- int numwin; /* Number of windows to be created (<=26). */
+ char solnam[9]; /* Solid name. */
+ char regnam[8]; /* Region name. */
+ char grpnam[5]; /* Group name. */
+ int numwin; /* Number of windows to be created (<=26). */
- struct wmember comb; /* Used to make regions. */
- struct wmember comb1; /* Used to make groups. */
+ struct wmember comb; /* Used to make regions. */
+ struct wmember comb1; /* Used to make groups. */
- int i, j, k; /* Loop counters. */
+ int i, j, k; /* Loop counters. */
- /* Set up solid, region, and group names. */
+ /* Set up solid, region, and group names. */
solnam[0] = 's';
solnam[1] = '.';
solnam[2] = 'w';
@@ -90,28 +90,28 @@
grpnam[3] = ' ';
grpnam[4] = '\0';
- /* If there are no arguments ask questions. */
+ /* If there are no arguments ask questions. */
if (argc == 1)
{
- /* START # 3 */
+ /* START # 3 */
- /* Print info about the window. */
+ /* Print info about the window. */
(void)printf("\nThe window frames are composed of 4 arb8s and 8\n");
(void)printf("cylinders. The front of the window frame is centered\n");
(void)printf("at (0, 0, 0) and extends in the negative x-direction\n");
(void)printf("the depth of the window frame.\n\n");
- /* Find name of mged file to be created. */
+ /* Find name of mged file to be created. */
(void)printf("Enter the mged file to be created (25 char max).\n\t");
(void)fflush(stdout);
(void)scanf("%26s", filemged);
- /* Find the number of window frames to create. */
+ /* Find the number of window frames to create. */
(void)printf("Enter the number of window frames to create (26 max).\n\t");
(void)fflush(stdout);
(void)scanf("%d", &numwin);
- /* Find the dimensions of the window frames. */
+ /* Find the dimensions of the window frames. */
(void)printf("Enter the height, width, and depth of the window frame.\n\t");
(void)fflush(stdout);
(void)scanf("%lf %lf %lf", &hgt, &wid, &dpt);
@@ -122,57 +122,57 @@
(void)fflush(stdout);
(void)scanf("%lf", &isw);
- } /* END # 3 */
+ } /* END # 3 */
- /* If there are arguments get answers from arguments. */
+ /* If there are arguments get answers from arguments. */
else
{
- /* START # 4 */
- /* List options. */
- /* -fname - name = mged file name. */
- /* -n# - # = number of window frames. */
- /* -h# - # = height of window frame in mm. */
- /* -w# - # = width of window frame in mm. */
- /* -d# - # = depth of window frame in mm. */
- /* -r# - # = radius of window frame corner in mm. */
- /* -i# - # = width of frame itself in mm. */
+ /* START # 4 */
+ /* List options. */
+ /* -fname - name = mged file name. */
+ /* -n# - # = number of window frames. */
+ /* -h# - # = height of window frame in mm. */
+ /* -w# - # = width of window frame in mm. */
+ /* -d# - # = depth of window frame in mm. */
+ /* -r# - # = radius of window frame corner in mm. */
+ /* -i# - # = width of frame itself in mm. */
for (i=1; i<argc; i++)
{
- /* START # 5 */
- /* Put argument in temporary character string. */
+ /* START # 5 */
+ /* Put argument in temporary character string. */
temp = argv[i];
- /* -f - mged file. */
+ /* -f - mged file. */
if (temp[1] == 'f')
{
- /* START # 6 */
+ /* START # 6 */
j = 2;
k = 0;
while ( (temp[j] != '\0') && (k < 25) )
{
- /* START # 7 */
+ /* START # 7 */
filemged[k] = temp[j];
j++;
k++;
- } /* END # 7 */
+ } /* END # 7 */
filemged[k] = '\0';
- } /* END # 6 */
+ } /* END # 6 */
- /* All other options. */
+ /* All other options. */
else
{
- /* START # 8 */
- /* Set up temporary character string. */
+ /* START # 8 */
+ /* Set up temporary character string. */
j = 2;
k = 0;
while ( (temp[j] != '\0') && (k < 15) )
{
- /* START # 9 */
+ /* START # 9 */
temp1[k] = temp[j];
j++;
k++;
- } /* END # 9 */
+ } /* END # 9 */
temp1[k] = '\0';
if (temp[1] == 'n')
{
@@ -184,11 +184,11 @@
else if (temp[1] == 'd') (void)sscanf(temp1, "%lf", &dpt);
else if (temp[1] == 'r') (void)sscanf(temp1, "%lf", &rds);
else if (temp[1] == 'i') (void)sscanf(temp1, "%lf", &isw);
- } /* END # 8 */
- } /* END # 5 */
- } /* END # 4 */
+ } /* END # 8 */
+ } /* END # 5 */
+ } /* END # 4 */
- /* Print out all info. */
+ /* Print out all info. */
(void)printf("\nmged file: %s\n", filemged);
(void)printf("height of window frame: %f mm\n", hgt);
(void)printf("width of window frame: %f mm\n", wid);
@@ -198,16 +198,16 @@
(void)printf("number of window frames: %d\n\n", numwin);
(void)fflush(stdout);
- /* Open mged file. */
+ /* Open mged file. */
fpw = wdb_fopen(filemged);
- /* Write ident record. */
+ /* Write ident record. */
mk_id(fpw, "window frames");
for (i=0; i<numwin; i++)
{
- /* START # 2 */
- /* Create first arb8. */
+ /* 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.);
@@ -237,7 +237,7 @@
solnam[7] = '1';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create second arb8. */
+ /* 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.);
@@ -257,7 +257,7 @@
solnam[7] = '2';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create cylinder 1. */
+ /* Create cylinder 1. */
bs[0] = (fastf_t)0.;
bs[1] = (fastf_t) (wid / 2. - rds);
bs[2] = (fastf_t) (hgt / 2. - rds);
@@ -268,23 +268,23 @@
solnam[7] = '3';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 2. */
+ /* Create cylinder 2. */
bs[2] = (-bs[2]);
solnam[7] = '4';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 3. */
+ /* Create cylinder 3. */
bs[1] = (-bs[1]);
solnam[7] = '5';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 4. */
+ /* Create cylinder 4. */
bs[2] = (-bs[2]);
solnam[7] = '6';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create all inside solids. */
- /* Create arb8 3. */
+ /* 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);
@@ -312,7 +312,7 @@
solnam[7] = '7';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create arb8 4. */
+ /* 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);
@@ -332,7 +332,7 @@
solnam[7] = '8';
mk_arb8(fpw, solnam, &pts[0][X]);
- /* Create cylinder 5. */
+ /* Create cylinder 5. */
bs[0] = (fastf_t)0.;
bs[1] = (fastf_t) (wid / 2. - rds);
bs[2] = (fastf_t) (hgt / 2. - rds);
@@ -343,25 +343,25 @@
solnam[7] = '9';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 6. */
+ /* Create cylinder 6. */
bs[2] = (-bs[2]);
solnam[6] = '1';
solnam[7] = '0';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 7. */
+ /* Create cylinder 7. */
bs[1] = (-bs[1]);
solnam[7] = '1';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Create cylinder 8. */
+ /* Create cylinder 8. */
bs[2] = (-bs[2]);
solnam[7] = '2';
mk_rcc(fpw, solnam, bs, ht, rad);
- /* Make all regions. */
+ /* Make all regions. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb.l);
solnam[6] = '0';
@@ -431,9 +431,9 @@
regnam[6] = '6';
mk_lfcomb(fpw, regnam, &comb, 1);
- /* Create group. */
+ /* Create group. */
- /* Initialize list. */
+ /* Initialize list. */
BU_LIST_INIT(&comb1.l);
regnam[6] = '1';
@@ -451,12 +451,12 @@
grpnam[3] = 97 + i;
mk_lfcomb(fpw, grpnam, &comb1, 0);
- } /* START # 2 */
+ } /* START # 2 */
- /* Close file. */
+ /* Close file. */
wdb_close(fpw);
return 0;
-} /* END # 1 */
+} /* END # 1 */
/*
* Local Variables:
Modified: brlcad/trunk/src/shapes/wire.c
===================================================================
--- brlcad/trunk/src/shapes/wire.c 2009-01-09 20:44:20 UTC (rev 33506)
+++ brlcad/trunk/src/shapes/wire.c 2009-01-09 20:49:59 UTC (rev 33507)
@@ -36,44 +36,44 @@
#include "raytrace.h"
#include "wdb.h"
-#define MAXWIRESEG 10 /* Maximum number of segments. The */
- /* maximum may be no greater then 100 */
- /* because of the way the name of the */
- /* segments is found. */
+#define MAXWIRESEG 10 /* Maximum number of segments. The */
+ /* maximum may be no greater then 100 */
+ /* because of the way the name of the */
+ /* segments is found. */
int
main(int argc, char **argv)
{
- /* START # 1 */
- struct rt_wdb *fpw; /* File to be created. */
- char filemged[26]; /* Mged file name. */
- double numseg; /* Number of segments. */
- double strtpt[MAXWIRESEG][3]; /* Start point of segment. */
- double endpt[MAXWIRESEG][3]; /* End point of segment. */
- double strtrad[MAXWIRESEG]; /* Radius at starting point of segment. */
- double endrad[MAXWIRESEG]; /* Radius at ending point of segment. */
+ /* START # 1 */
+ struct rt_wdb *fpw; /* File to be created. */
+ char filemged[26]; /* Mged file name. */
+ double numseg; /* Number of segments. */
+ double strtpt[MAXWIRESEG][3]; /* Start point of segment. */
+ double endpt[MAXWIRESEG][3]; /* End point of segment. */
+ double strtrad[MAXWIRESEG]; /* Radius at starting point of segment. */
+ double endrad[MAXWIRESEG]; /* Radius at ending point of segment. */
- char solcyl[8], regcyl[8]; /* Solid & region name for cylinder (cone). */
- char solsph[8], regsph[8]; /* Solid & region name for sphere. */
- char solsub1[8], solsub2[8]; /* Solids that are subtracted. */
- char group[6]; /* Group name. */
+ char solcyl[8], regcyl[8]; /* Solid & region name for cylinder (cone). */
+ char solsph[8], regsph[8]; /* Solid & region name for sphere. */
+ char solsub1[8], solsub2[8]; /* Solids that are subtracted. */
+ char group[6]; /* Group name. */
- point_t bs; /* Base of cone. */
- vect_t dir; /* Direction of cone. */
- fastf_t ht; /* Height of cone. */
- fastf_t rdc1; /* Radius 1 of cone. */
- fastf_t rdc2; /* Radius 2 of cone. */
- point_t cent; /* Center of sphere. */
- fastf_t rds; /* Radius of sphere. */
- struct wmember comb; /* Used to make regions. */
- struct wmember comb1; /* Used to make groups. */
+ point_t bs; /* Base of cone. */
+ vect_t dir; /* Direction of cone. */
+ fastf_t ht; /* Height of cone. */
+ fastf_t rdc1; /* Radius 1 of cone. */
+ fastf_t rdc2; /* Radius 2 of cone. */
+ point_t cent; /* Center of sphere. */
+ fastf_t rds; /* Radius of sphere. */
+ struct wmember comb; /* Used to make regions. */
+ struct wmember comb1; /* Used to make groups. */
- int i; /* Loop counters. */
- double r; /* Temporary variables. */
- char temp[10]; /* Temporary char string. */
- char temp1[10]; /* Temporary char string. */
+ int i; /* Loop counters. */
+ double r; /* Temporary variables. */
+ char temp[10]; /* Temporary char string. */
+ char temp1[10]; /* Temporary char string. */
- /* Set up solid, region, & group names. */
+ /* Set up solid, region, & group names. */
solcyl[0] = 's';
solcyl[1] = '.';
solcyl[2] = 'w';
@@ -135,19 +135,19 @@
solsub2[6] = '#';
solsub2[7] = '\0';
- /* Find name of mged file to be created. */
+ /* Find name of ...
[truncated message content] |