[brlcad-commits] SF.net SVN: brlcad:[45267] brlcad/trunk/src/libged
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2011-06-28 22:01:48
|
Revision: 45267 http://brlcad.svn.sourceforge.net/brlcad/?rev=45267&view=rev Author: brlcad Date: 2011-06-28 22:01:41 +0000 (Tue, 28 Jun 2011) Log Message: ----------- ws indent style cleanup Modified Paths: -------------- brlcad/trunk/src/libged/3ptarb.c brlcad/trunk/src/libged/adc.c brlcad/trunk/src/libged/adjust.c brlcad/trunk/src/libged/ae2dir.c brlcad/trunk/src/libged/analyze.c brlcad/trunk/src/libged/arb.c brlcad/trunk/src/libged/arced.c brlcad/trunk/src/libged/arot.c brlcad/trunk/src/libged/attr.c brlcad/trunk/src/libged/autoview.c Modified: brlcad/trunk/src/libged/3ptarb.c =================================================================== --- brlcad/trunk/src/libged/3ptarb.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/3ptarb.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -47,19 +47,20 @@ "Enter Z: " }; + int ged_3ptarb(struct ged *gedp, int argc, const char *argv[]) { - int i, solve; - vect_t vec1; - vect_t vec2; - fastf_t pt4[2], length, thick; - vect_t norm; - fastf_t ndotv; - char **prompts; - struct directory *dp; - struct rt_db_internal internal; - struct rt_arb_internal *aip; + int i, solve; + vect_t vec1; + vect_t vec2; + fastf_t pt4[2], length, thick; + vect_t norm; + fastf_t ndotv; + char **prompts; + struct directory *dp; + struct rt_db_internal internal; + struct rt_arb_internal *aip; static const char *usage = "name x1 y1 z1 x2 y2 z2 x3 y3 z3 coord c1 c2 th"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); @@ -94,7 +95,7 @@ vec2[i] = atof(argv[i+2]) - atof(argv[i+8]); } VCROSS(norm, vec1, vec2); - length = MAGNITUDE( norm ); + length = MAGNITUDE(norm); if (ZERO(length)) { bu_vls_printf(&gedp->ged_result_str, "%s: points are colinear\n", argv[0]); return GED_ERROR; @@ -123,8 +124,8 @@ return GED_MORE; } - pt4[0] = atof( argv[12] ) * gedp->ged_wdbp->dbip->dbi_local2base; - pt4[1] = atof( argv[13] ) * gedp->ged_wdbp->dbip->dbi_local2base; + pt4[0] = atof(argv[12]) * gedp->ged_wdbp->dbip->dbi_local2base; + pt4[1] = atof(argv[13]) * gedp->ged_wdbp->dbip->dbi_local2base; break; case 'y': @@ -143,8 +144,8 @@ return GED_MORE; } - pt4[0] = atof( argv[12] ) * gedp->ged_wdbp->dbip->dbi_local2base; - pt4[1] = atof( argv[13] ) * gedp->ged_wdbp->dbip->dbi_local2base; + pt4[0] = atof(argv[12]) * gedp->ged_wdbp->dbip->dbi_local2base; + pt4[1] = atof(argv[13]) * gedp->ged_wdbp->dbip->dbi_local2base; break; case 'z': @@ -163,8 +164,8 @@ return GED_MORE; } - pt4[0] = atof( argv[12] ) * gedp->ged_wdbp->dbip->dbi_local2base; - pt4[1] = atof( argv[13] ) * gedp->ged_wdbp->dbip->dbi_local2base; + pt4[0] = atof(argv[12]) * gedp->ged_wdbp->dbip->dbi_local2base; + pt4[1] = atof(argv[13]) * gedp->ged_wdbp->dbip->dbi_local2base; break; default: @@ -183,56 +184,56 @@ return GED_ERROR; } - RT_DB_INTERNAL_INIT( &internal ); + RT_DB_INTERNAL_INIT(&internal); internal.idb_major_type = DB5_MAJORTYPE_BRLCAD; internal.idb_type = ID_ARB8; internal.idb_meth = &rt_functab[ID_ARB8]; - internal.idb_ptr = (genptr_t)bu_malloc( sizeof(struct rt_arb_internal), "rt_arb_internal" ); + internal.idb_ptr = (genptr_t)bu_malloc(sizeof(struct rt_arb_internal), "rt_arb_internal"); aip = (struct rt_arb_internal *)internal.idb_ptr; aip->magic = RT_ARB_INTERNAL_MAGIC; for (i=0; i<8; i++) { - VSET( aip->pt[i], 0.0, 0.0, 0.0 ); + VSET(aip->pt[i], 0.0, 0.0, 0.0); } for (i=0; i<3; i++) { /* the three given vertices */ - VSET( aip->pt[i], atof( argv[i*3+2] )*gedp->ged_wdbp->dbip->dbi_local2base, atof( argv[i*3+3] )*gedp->ged_wdbp->dbip->dbi_local2base, atof( argv[i*3+4] )*gedp->ged_wdbp->dbip->dbi_local2base ); + VSET(aip->pt[i], atof(argv[i*3+2])*gedp->ged_wdbp->dbip->dbi_local2base, atof(argv[i*3+3])*gedp->ged_wdbp->dbip->dbi_local2base, atof(argv[i*3+4])*gedp->ged_wdbp->dbip->dbi_local2base); } thick *= gedp->ged_wdbp->dbip->dbi_local2base; - ndotv = VDOT( aip->pt[0], norm ); + ndotv = VDOT(aip->pt[0], norm); - switch ( solve ) { + switch (solve) { case X: /* solve for x-coord of 4th point */ - aip->pt[3][Y] = pt4[0]; /* y-coord */ - aip->pt[3][Z] = pt4[1]; /* z-coord */ - aip->pt[3][X] = ( ndotv - - norm[Y] * aip->pt[3][Y] - - norm[Z] * aip->pt[3][Z]) + aip->pt[3][Y] = pt4[0]; /* y-coord */ + aip->pt[3][Z] = pt4[1]; /* z-coord */ + aip->pt[3][X] = (ndotv + - norm[Y] * aip->pt[3][Y] + - norm[Z] * aip->pt[3][Z]) / norm[X]; /* x-coord */ break; case Y: /* solve for y-coord of 4th point */ - aip->pt[3][X] = pt4[0]; /* x-coord */ - aip->pt[3][Z] = pt4[1]; /* z-coord */ - aip->pt[3][Y] = ( ndotv - - norm[X] * aip->pt[3][X] - - norm[Z] * aip->pt[3][Z]) + aip->pt[3][X] = pt4[0]; /* x-coord */ + aip->pt[3][Z] = pt4[1]; /* z-coord */ + aip->pt[3][Y] = (ndotv + - norm[X] * aip->pt[3][X] + - norm[Z] * aip->pt[3][Z]) / norm[Y]; /* y-coord */ break; case Z: /* solve for z-coord of 4th point */ - aip->pt[3][X] = pt4[0]; /* x-coord */ - aip->pt[3][Y] = pt4[1]; /* y-coord */ - aip->pt[3][Z] = ( ndotv - - norm[X] * aip->pt[3][X] - - norm[Y] * aip->pt[3][Y]) + aip->pt[3][X] = pt4[0]; /* x-coord */ + aip->pt[3][Y] = pt4[1]; /* y-coord */ + aip->pt[3][Z] = (ndotv + - norm[X] * aip->pt[3][X] + - norm[Y] * aip->pt[3][Y]) / norm[Z]; /* z-coord */ break; @@ -244,7 +245,7 @@ /* calculate the remaining 4 vertices */ for (i=0; i<4; i++) { - VJOIN1( aip->pt[i+4], aip->pt[i], thick, norm ); + VJOIN1(aip->pt[i+4], aip->pt[i], thick, norm); } GED_DB_DIRADD(gedp, dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (genptr_t)&internal.idb_type, GED_ERROR); @@ -254,6 +255,7 @@ return GED_OK; } + /* * Local Variables: * tab-width: 8 Modified: brlcad/trunk/src/libged/adc.c =================================================================== --- brlcad/trunk/src/libged/adc.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/adc.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -75,12 +75,12 @@ /* * Note - this needs to be rewritten to accept keyword/value pairs so - * that multiple attributes can be set with a single command call. + * that multiple attributes can be set with a single command call. */ int -ged_adc(struct ged *gedp, - int argc, - const char *argv[]) +ged_adc(struct ged *gedp, + int argc, + const char *argv[]) { char *command; char *parameter; @@ -594,6 +594,7 @@ return GED_ERROR; } + static void ged_adc_model_To_adc_view(struct ged_view *gvp) { @@ -602,6 +603,7 @@ gvp->gv_adc.gas_dv_y = gvp->gv_adc.gas_pos_view[Y] * GED_MAX; } + static void ged_adc_grid_To_adc_view(struct ged_view *gvp) { @@ -615,6 +617,7 @@ gvp->gv_adc.gas_dv_y = gvp->gv_adc.gas_pos_view[Y] * GED_MAX; } + static void ged_adc_view_To_adc_grid(struct ged_view *gvp) { @@ -626,6 +629,7 @@ VSUB2(gvp->gv_adc.gas_pos_grid, gvp->gv_adc.gas_pos_view, view_pt); } + void ged_calc_adc_pos(struct ged_view *gvp) { @@ -641,6 +645,7 @@ } } + void ged_calc_adc_a1(struct ged_view *gvp) { @@ -659,6 +664,7 @@ } } + void ged_calc_adc_a2(struct ged_view *gvp) { @@ -677,6 +683,7 @@ } } + void ged_calc_adc_dst(struct ged_view *gvp) { @@ -696,6 +703,7 @@ gvp->gv_adc.gas_dst = (gvp->gv_adc.gas_dv_dist * INV_GED + 1.0) * M_SQRT1_2; } + static void ged_adc_reset(struct ged_view *gvp) { @@ -719,6 +727,7 @@ gvp->gv_adc.gas_anchor_dst = 0; } + static void ged_adc_vls_print(struct ged_view *gvp, fastf_t base2local, struct bu_vls *out_vp) { Modified: brlcad/trunk/src/libged/adjust.c =================================================================== --- brlcad/trunk/src/libged/adjust.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/adjust.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -36,9 +36,9 @@ ged_adjust(struct ged *gedp, int argc, const char *argv[]) { int status; - struct directory *dp; - char *name; - struct rt_db_internal intern; + struct directory *dp; + char *name; + struct rt_db_internal intern; static const char *usage = "object attr value ?attr value?"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); Modified: brlcad/trunk/src/libged/ae2dir.c =================================================================== --- brlcad/trunk/src/libged/ae2dir.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/ae2dir.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -32,6 +32,7 @@ #include "./ged_private.h" + int ged_ae2dir(struct ged *gedp, int argc, const char *argv[]) { @@ -82,6 +83,7 @@ return GED_OK; } + /* * Local Variables: * tab-width: 8 Modified: brlcad/trunk/src/libged/analyze.c =================================================================== --- brlcad/trunk/src/libged/analyze.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/analyze.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -40,24 +40,24 @@ /* Conversion factor for Gallons to cubic millimeters */ #define GALLONS_TO_MM3 3785411.784 -static void ged_do_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_arb_anal(struct ged *gedp, const struct rt_db_internal *ip); -static double ged_anal_face(struct ged *gedp, int face, fastf_t *center_pt, const struct rt_arb_internal *arb, int type, const struct bn_tol *tol); -static void ged_anal_edge(struct ged *gedp, int edge, const struct rt_arb_internal *arb, int type); -static double ged_find_vol(int loc, struct rt_arb_internal *arb, struct bn_tol *tol); -static void ged_tgc_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_ell_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_tor_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_ars_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_rpc_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_rhc_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_part_anal(struct ged *gedp, const struct rt_db_internal *ip); -static void ged_superell_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_do_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_arb_anal(struct ged *gedp, const struct rt_db_internal *ip); +static double ged_anal_face(struct ged *gedp, int face, fastf_t *center_pt, const struct rt_arb_internal *arb, int type, const struct bn_tol *tol); +static void ged_anal_edge(struct ged *gedp, int edge, const struct rt_arb_internal *arb, int type); +static double ged_find_vol(int loc, struct rt_arb_internal *arb, struct bn_tol *tol); +static void ged_tgc_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_ell_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_tor_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_ars_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_rpc_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_rhc_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_part_anal(struct ged *gedp, const struct rt_db_internal *ip); +static void ged_superell_anal(struct ged *gedp, const struct rt_db_internal *ip); /* - * Analyze command - prints loads of info about a solid - * Format: analyze [name] - * if 'name' is missing use solid being edited + * Analyze command - prints loads of info about a solid + * Format: analyze [name] + * if 'name' is missing use solid being edited */ int @@ -65,7 +65,7 @@ { struct directory *ndp; int i; - struct rt_db_internal intern; + struct rt_db_internal intern; static const char *usage = "object(s)"; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); @@ -86,8 +86,8 @@ } /* use the names that were input */ - for ( i = 1; i < argc; i++ ) { - if ( (ndp = db_lookup( gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY )) == RT_DIR_NULL ) + for (i = 1; i < argc; i++) { + if ((ndp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) == RT_DIR_NULL) continue; GED_DB_GET_INTERNAL(gedp, &intern, ndp, bn_mat_identity, &rt_uniresource, GED_ERROR); @@ -107,7 +107,7 @@ { /* XXX Could give solid name, and current units, here */ - switch ( ip->idb_type ) { + switch (ip->idb_type) { case ID_ARS: ged_ars_anal(gedp, ip); @@ -147,7 +147,7 @@ default: bu_vls_printf(&gedp->ged_result_str, "analyze: unable to process %s solid\n", - rt_functab[ip->idb_type].ft_name ); + rt_functab[ip->idb_type].ft_name); break; } } @@ -155,29 +155,30 @@ /* edge definition array */ static const int nedge[5][24] = { - {0, 1, 1, 2, 2, 0, 0, 3, 3, 2, 1, 3, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* ARB4 */ - {0, 1, 1, 2, 2, 3, 0, 3, 0, 4, 1, 4, 2, 4, 3, 4, -1,-1,-1,-1,-1,-1,-1,-1}, /* ARB5 */ - {0, 1, 1, 2, 2, 3, 0, 3, 0, 4, 1, 4, 2, 5, 3, 5, 4, 5, -1,-1,-1,-1,-1,-1}, /* ARB6 */ - {0, 1, 1, 2, 2, 3, 0, 3, 0, 4, 3, 4, 1, 5, 2, 6, 4, 5, 5, 6, 4, 6, -1,-1}, /* ARB7 */ + {0, 1, 1, 2, 2, 0, 0, 3, 3, 2, 1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* ARB4 */ + {0, 1, 1, 2, 2, 3, 0, 3, 0, 4, 1, 4, 2, 4, 3, 4, -1, -1, -1, -1, -1, -1, -1, -1}, /* ARB5 */ + {0, 1, 1, 2, 2, 3, 0, 3, 0, 4, 1, 4, 2, 5, 3, 5, 4, 5, -1, -1, -1, -1, -1, -1}, /* ARB6 */ + {0, 1, 1, 2, 2, 3, 0, 3, 0, 4, 3, 4, 1, 5, 2, 6, 4, 5, 5, 6, 4, 6, -1, -1}, /* ARB7 */ {0, 1, 1, 2, 2, 3, 0, 3, 0, 4, 4, 5, 1, 5, 5, 6, 6, 7, 4, 7, 3, 7, 2, 6}, }; + /* - * A R B _ A N A L + * A R B _ A N A L */ static void ged_arb_anal(struct ged *gedp, const struct rt_db_internal *ip) { - struct rt_arb_internal *arb = (struct rt_arb_internal *)ip->idb_ptr; - int i; - point_t center_pt; - double tot_vol; - double tot_area; - int cgtype; /* COMGEOM arb type: # of vertices */ - int type; + struct rt_arb_internal *arb = (struct rt_arb_internal *)ip->idb_ptr; + int i; + point_t center_pt; + double tot_vol; + double tot_area; + int cgtype; /* COMGEOM arb type: # of vertices */ + int type; /* find the specific arb type, in GIFT order. */ - if ( (cgtype = rt_arb_std_type( ip, &gedp->ged_wdbp->wdb_tol )) == 0 ) { + if ((cgtype = rt_arb_std_type(ip, &gedp->ged_wdbp->wdb_tol)) == 0) { bu_vls_printf(&gedp->ged_result_str, "ged_arb_anal: bad ARB\n"); return; } @@ -190,10 +191,10 @@ bu_vls_printf(&gedp->ged_result_str, "\n------------------------------------------------------------------------------\n"); bu_vls_printf(&gedp->ged_result_str, "| FACE | ROT FB | PLANE EQUATION | SURFACE AREA |\n"); bu_vls_printf(&gedp->ged_result_str, "|------|---------------|----------------------------------|------------------|\n"); - rt_arb_centroid( center_pt, arb, cgtype ); + rt_arb_centroid(center_pt, arb, cgtype); for (i=0; i<6; i++) - tot_area += ged_anal_face( gedp, i, center_pt, arb, type, &gedp->ged_wdbp->wdb_tol ); + tot_area += ged_anal_face(gedp, i, center_pt, arb, type, &gedp->ged_wdbp->wdb_tol); bu_vls_printf(&gedp->ged_result_str, "------------------------------------------------------------------------------\n"); @@ -203,17 +204,17 @@ /* set up the records for arb4's and arb6's */ { - struct rt_arb_internal earb; + struct rt_arb_internal earb; earb = *arb; /* struct copy */ - if ( cgtype == 4 ) { + if (cgtype == 4) { VMOVE(earb.pt[3], earb.pt[4]); - } else if ( cgtype == 6 ) { + } else if (cgtype == 6) { VMOVE(earb.pt[5], earb.pt[6]); } for (i=0; i<12; i++) { - ged_anal_edge( gedp, i, &earb, type ); - if ( nedge[type][i*2] == -1 ) + ged_anal_edge(gedp, i, &earb, type); + if (nedge[type][i*2] == -1) break; } } @@ -221,7 +222,7 @@ /* find the volume - break arb8 into 6 arb4s */ for (i=0; i<6; i++) - tot_vol += ged_find_vol( i, arb, &gedp->ged_wdbp->wdb_tol ); + tot_vol += ged_find_vol(i, arb, &gedp->ged_wdbp->wdb_tol); bu_vls_printf(&gedp->ged_result_str, " | Volume = %18.8f Surface Area = %15.8f |\n", tot_vol*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local, @@ -231,6 +232,7 @@ bu_vls_printf(&gedp->ged_result_str, " -----------------------------------------------------------------\n"); } + /* ARB face printout array */ static const int prface[5][6] = { {123, 124, 234, 134, -111, -111}, /* ARB4 */ @@ -251,7 +253,7 @@ /* - * F I N D A N G + * F I N D A N G * * finds direction cosines and rotation, fallback angles of a unit vector * angles = pointer to 5 fastf_t's to store angles @@ -263,21 +265,21 @@ fastf_t f; /* convert direction cosines into axis angles */ - if ( unitv[X] <= -1.0 ) angles[X] = -90.0; - else if ( unitv[X] >= 1.0 ) angles[X] = 90.0; - else angles[X] = acos( unitv[X] ) * bn_radtodeg; + if (unitv[X] <= -1.0) angles[X] = -90.0; + else if (unitv[X] >= 1.0) angles[X] = 90.0; + else angles[X] = acos(unitv[X]) * bn_radtodeg; - if ( unitv[Y] <= -1.0 ) angles[Y] = -90.0; - else if ( unitv[Y] >= 1.0 ) angles[Y] = 90.0; - else angles[Y] = acos( unitv[Y] ) * bn_radtodeg; + if (unitv[Y] <= -1.0) angles[Y] = -90.0; + else if (unitv[Y] >= 1.0) angles[Y] = 90.0; + else angles[Y] = acos(unitv[Y]) * bn_radtodeg; - if ( unitv[Z] <= -1.0 ) angles[Z] = -90.0; - else if ( unitv[Z] >= 1.0 ) angles[Z] = 90.0; - else angles[Z] = acos( unitv[Z] ) * bn_radtodeg; + if (unitv[Z] <= -1.0) angles[Z] = -90.0; + else if (unitv[Z] >= 1.0) angles[Z] = 90.0; + else angles[Z] = acos(unitv[Z]) * bn_radtodeg; /* fallback angle */ - if ( unitv[Z] <= -1.0 ) unitv[Z] = -1.0; - else if ( unitv[Z] >= 1.0 ) unitv[Z] = 1.0; + if (unitv[Z] <= -1.0) unitv[Z] = -1.0; + else if (unitv[Z] >= 1.0) unitv[Z] = 1.0; angles[4] = asin(unitv[Z]); /* rotation angle */ @@ -285,40 +287,41 @@ * with an epsilon of +/- 1.0e-17, so the tolerance below was * substituted for the original +/- 1.0e-20. */ - if ((f = cos(angles[4])) > 1.0e-16 || f < -1.0e-16 ) { + if ((f = cos(angles[4])) > 1.0e-16 || f < -1.0e-16) { f = unitv[X]/f; - if ( f <= -1.0 ) + if (f <= -1.0) angles[3] = 180; - else if ( f >= 1.0 ) + else if (f >= 1.0) angles[3] = 0; else - angles[3] = bn_radtodeg * acos( f ); + angles[3] = bn_radtodeg * acos(f); } else angles[3] = 0.0; - if ( unitv[Y] < 0 ) + if (unitv[Y] < 0) angles[3] = 360.0 - angles[3]; angles[4] *= bn_radtodeg; } -/* Analyzes an arb face + +/* Analyzes an arb face */ static double ged_anal_face(struct ged *gedp, int face, fastf_t *center_pt, const struct rt_arb_internal *arb, int type, const struct bn_tol *tol) - /* reference center point */ +/* reference center point */ { int i, j, k; int a, b, c, d; /* 4 points of face to look at */ - fastf_t angles[5]; /* direction cosines, rot, fb */ - fastf_t temp; - fastf_t area[2], len[6]; - vect_t v_temp; - plane_t plane; - double face_area = 0; + fastf_t angles[5]; /* direction cosines, rot, fb */ + fastf_t temp; + fastf_t area[2], len[6]; + vect_t v_temp; + plane_t plane; + double face_area = 0; a = rt_arb_faces[type][face*4+0]; b = rt_arb_faces[type][face*4+1]; @@ -329,8 +332,8 @@ return 0; /* find plane eqn for this face */ - if ( bn_mk_plane_3pts( plane, arb->pt[a], arb->pt[b], - arb->pt[c], tol ) < 0 ) { + if (bn_mk_plane_3pts(plane, arb->pt[a], arb->pt[b], + arb->pt[c], tol) < 0) { bu_vls_printf(&gedp->ged_result_str, "| %d%d%d%d | ***NOT A PLANE*** |\n", a+1, b+1, c+1, d+1); return 0; @@ -343,29 +346,29 @@ * fallback angles so that they always give the outward * pointing normal vector. */ - if ( (plane[W] - VDOT(center_pt, &plane[0])) < 0.0 ) { - for ( i=0; i<4; i++ ) + if ((plane[W] - VDOT(center_pt, &plane[0])) < 0.0) { + for (i=0; i<4; i++) plane[i] *= -1.0; } /* plane[] contains normalized eqn of plane of this face * find the dir cos, rot, fb angles */ - findang( angles, &plane[0] ); + findang(angles, &plane[0]); /* find the surface area of this face */ for (i=0; i<3; i++) { j = rt_arb_faces[type][face*4+i]; k = rt_arb_faces[type][face*4+i+1]; VSUB2(v_temp, arb->pt[k], arb->pt[j]); - len[i] = MAGNITUDE( v_temp ); + len[i] = MAGNITUDE(v_temp); } len[4] = len[2]; j = rt_arb_faces[type][face*4+0]; for (i=2; i<4; i++) { k = rt_arb_faces[type][face*4+i]; VSUB2(v_temp, arb->pt[k], arb->pt[j]); - len[((i*2)-1)] = MAGNITUDE( v_temp ); + len[((i*2)-1)] = MAGNITUDE(v_temp); } len[2] = len[3]; @@ -386,7 +389,8 @@ return face_area; } -/* Analyzes arb edges - finds lengths */ + +/* Analyzes arb edges - finds lengths */ static void ged_anal_edge(struct ged *gedp, int edge, const struct rt_arb_internal *arb, int type) { @@ -396,15 +400,15 @@ a = nedge[type][edge*2]; b = nedge[type][edge*2+1]; - if ( b == -1 ) { + if (b == -1) { /* fill out the line */ - if ( (a = edge%4) == 0 ) + if ((a = edge%4) == 0) return; - if ( a == 1 ) { + if (a == 1) { bu_vls_printf(&gedp->ged_result_str, " | | | |\n "); return; } - if ( a == 2 ) { + if (a == 2) { bu_vls_printf(&gedp->ged_result_str, " | | |\n "); return; } @@ -416,19 +420,19 @@ bu_vls_printf(&gedp->ged_result_str, " | %d%d %9.8f", a+1, b+1, MAGNITUDE(v_temp)*gedp->ged_wdbp->dbip->dbi_base2local); - if ( ++edge%4 == 0 ) + if (++edge%4 == 0) bu_vls_printf(&gedp->ged_result_str, " |\n "); } -/* Finds volume of an arb4 defined by farb4[loc][] */ +/* Finds volume of an arb4 defined by farb4[loc][] */ static double ged_find_vol(int loc, struct rt_arb_internal *arb, struct bn_tol *tol) { int a, b, c, d; fastf_t vol, height, len[3], temp, areabase; - vect_t v_temp; - plane_t plane; + vect_t v_temp; + plane_t plane; /* a, b, c = base of the arb4 */ a = farb4[loc][0]; @@ -438,8 +442,8 @@ /* d = "top" point of arb4 */ d = farb4[loc][3]; - if ( bn_mk_plane_3pts( plane, arb->pt[a], arb->pt[b], - arb->pt[c], tol ) < 0 ) + if (bn_mk_plane_3pts(plane, arb->pt[a], arb->pt[b], + arb->pt[c], tol) < 0) return 0.0; /* have a good arb4 - find its volume */ @@ -457,14 +461,14 @@ } -/* analyze a torus */ +/* analyze a torus */ static void ged_tor_anal(struct ged *gedp, const struct rt_db_internal *ip) { - struct rt_tor_internal *tor = (struct rt_tor_internal *)ip->idb_ptr; + struct rt_tor_internal *tor = (struct rt_tor_internal *)ip->idb_ptr; fastf_t r1, r2, vol, sur_area; - RT_TOR_CK_MAGIC( tor ); + RT_TOR_CK_MAGIC(tor); r1 = tor->r_a; r2 = tor->r_h; @@ -472,7 +476,7 @@ vol = 2.0 * M_PI * M_PI * r1 * r2 * r2; sur_area = 4.0 * M_PI * M_PI * r1 * r2; - bu_vls_printf(&gedp->ged_result_str, "TOR Vol = %.8f (%.8f gal) Surface Area = %.8f\n", + bu_vls_printf(&gedp->ged_result_str, "TOR Vol = %.8f (%.8f gal) Surface Area = %.8f\n", vol*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local, vol/GALLONS_TO_MM3, sur_area*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local); @@ -480,14 +484,15 @@ return; } -#define PROLATE 1 -#define OBLATE 2 -/* analyze an ell */ +#define PROLATE 1 +#define OBLATE 2 + +/* analyze an ell */ static void ged_ell_anal(struct ged *gedp, const struct rt_db_internal *ip) { - struct rt_ell_internal *ell = (struct rt_ell_internal *)ip->idb_ptr; + struct rt_ell_internal *ell = (struct rt_ell_internal *)ip->idb_ptr; fastf_t ma, mb, mc; #ifdef major /* Some systems have these defined as macros!!! */ #undef major @@ -497,13 +502,13 @@ #endif fastf_t ecc, major, minor; fastf_t vol, sur_area; - int type; + int type; - RT_ELL_CK_MAGIC( ell ); + RT_ELL_CK_MAGIC(ell); - ma = MAGNITUDE( ell->a ); - mb = MAGNITUDE( ell->b ); - mc = MAGNITUDE( ell->c ); + ma = MAGNITUDE(ell->a); + mb = MAGNITUDE(ell->b); + mc = MAGNITUDE(ell->c); type = 0; @@ -512,71 +517,65 @@ vol*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local, vol/GALLONS_TO_MM3); - if ( fabs(ma-mb) < .00001 && fabs(mb-mc) < .00001 ) { + if (fabs(ma-mb) < .00001 && fabs(mb-mc) < .00001) { /* have a sphere */ sur_area = 4.0 * M_PI * ma * ma; bu_vls_printf(&gedp->ged_result_str, " Surface Area = %.8f\n", sur_area*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local); return; } - if ( fabs(ma-mb) < .00001 ) { + if (fabs(ma-mb) < .00001) { /* A == B */ - if ( mc > ma ) { + if (mc > ma) { /* oblate spheroid */ type = OBLATE; major = mc; minor = ma; - } - else { + } else { /* prolate spheroid */ type = PROLATE; major = ma; minor = mc; } - } - else - if ( fabs(ma-mc) < .00001 ) { + } else + if (fabs(ma-mc) < .00001) { /* A == C */ - if ( mb > ma ) { + if (mb > ma) { /* oblate spheroid */ type = OBLATE; major = mb; minor = ma; - } - else { + } else { /* prolate spheroid */ type = PROLATE; major = ma; minor = mb; } - } - else - if ( fabs(mb-mc) < .00001 ) { + } else + if (fabs(mb-mc) < .00001) { /* B == C */ - if ( ma > mb ) { + if (ma > mb) { /* oblate spheroid */ type = OBLATE; major = ma; minor = mb; - } - else { + } else { /* prolate spheroid */ type = PROLATE; major = mb; minor = ma; } - } - else { + } else { bu_vls_printf(&gedp->ged_result_str, " Cannot find surface area\n"); return; } ecc = sqrt(major*major - minor*minor) / major; - if ( type == PROLATE ) { + if (type == PROLATE) { sur_area = 2.0 * M_PI * minor * minor + (2.0 * M_PI * (major*minor/ecc) * asin(ecc)); - } else if ( type == OBLATE ) { + } else if (type == OBLATE) { sur_area = 2.0 * M_PI * major * major + - (M_PI * (minor*minor/ecc) * log( (1.0+ecc)/(1.0-ecc) )); + (M_PI * (minor*minor/ecc) * log((1.0+ecc)/(1.0-ecc))); } else { sur_area = 0.0; } @@ -586,11 +585,11 @@ } -/* analyze an superell */ +/* analyze an superell */ static void ged_superell_anal(struct ged *gedp, const struct rt_db_internal *ip) { - struct rt_superell_internal *superell = (struct rt_superell_internal *)ip->idb_ptr; + struct rt_superell_internal *superell = (struct rt_superell_internal *)ip->idb_ptr; fastf_t ma, mb, mc; #ifdef major /* Some systems have these defined as macros!!! */ #undef major @@ -600,13 +599,13 @@ #endif fastf_t ecc, major, minor; fastf_t vol, sur_area; - int type; + int type; - RT_SUPERELL_CK_MAGIC( superell ); + RT_SUPERELL_CK_MAGIC(superell); - ma = MAGNITUDE( superell->a ); - mb = MAGNITUDE( superell->b ); - mc = MAGNITUDE( superell->c ); + ma = MAGNITUDE(superell->a); + mb = MAGNITUDE(superell->b); + mc = MAGNITUDE(superell->c); type = 0; @@ -615,71 +614,65 @@ vol*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local, vol/GALLONS_TO_MM3); - if ( fabs(ma-mb) < .00001 && fabs(mb-mc) < .00001 ) { + if (fabs(ma-mb) < .00001 && fabs(mb-mc) < .00001) { /* have a sphere */ sur_area = 4.0 * M_PI * ma * ma; bu_vls_printf(&gedp->ged_result_str, " Surface Area = %.8f\n", sur_area*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local); return; } - if ( fabs(ma-mb) < .00001 ) { + if (fabs(ma-mb) < .00001) { /* A == B */ - if ( mc > ma ) { + if (mc > ma) { /* oblate spheroid */ type = OBLATE; major = mc; minor = ma; - } - else { + } else { /* prolate spheroid */ type = PROLATE; major = ma; minor = mc; } - } - else - if ( fabs(ma-mc) < .00001 ) { + } else + if (fabs(ma-mc) < .00001) { /* A == C */ - if ( mb > ma ) { + if (mb > ma) { /* oblate spheroid */ type = OBLATE; major = mb; minor = ma; - } - else { + } else { /* prolate spheroid */ type = PROLATE; major = ma; minor = mb; } - } - else - if ( fabs(mb-mc) < .00001 ) { + } else + if (fabs(mb-mc) < .00001) { /* B == C */ - if ( ma > mb ) { + if (ma > mb) { /* oblate spheroid */ type = OBLATE; major = ma; minor = mb; - } - else { + } else { /* prolate spheroid */ type = PROLATE; major = mb; minor = ma; } - } - else { + } else { bu_vls_printf(&gedp->ged_result_str, " Cannot find surface area\n"); return; } ecc = sqrt(major*major - minor*minor) / major; - if ( type == PROLATE ) { + if (type == PROLATE) { sur_area = 2.0 * M_PI * minor * minor + (2.0 * M_PI * (major*minor/ecc) * asin(ecc)); - } else if ( type == OBLATE ) { + } else if (type == OBLATE) { sur_area = 2.0 * M_PI * major * major + - (M_PI * (minor*minor/ecc) * log( (1.0+ecc)/(1.0-ecc) )); + (M_PI * (minor*minor/ecc) * log((1.0+ecc)/(1.0-ecc))); } else { sur_area = 0.0; } @@ -688,32 +681,33 @@ sur_area*gedp->ged_wdbp->dbip->dbi_base2local*gedp->ged_wdbp->dbip->dbi_base2local); } -#define GED_ANAL_RCC 1 -#define GED_ANAL_TRC 2 -#define GED_ANAL_REC 3 -/* analyze tgc */ +#define GED_ANAL_RCC 1 +#define GED_ANAL_TRC 2 +#define GED_ANAL_REC 3 + +/* analyze tgc */ static void ged_tgc_anal(struct ged *gedp, const struct rt_db_internal *ip) { - struct rt_tgc_internal *tgc = (struct rt_tgc_internal *)ip->idb_ptr; + struct rt_tgc_internal *tgc = (struct rt_tgc_internal *)ip->idb_ptr; fastf_t maxb, ma, mb, mc, md, mh; fastf_t area_base, area_top, area_side, vol; vect_t axb; int cgtype = 0; - RT_TGC_CK_MAGIC( tgc ); + RT_TGC_CK_MAGIC(tgc); VCROSS(axb, tgc->a, tgc->b); maxb = MAGNITUDE(axb); - ma = MAGNITUDE( tgc->a ); - mb = MAGNITUDE( tgc->b ); - mc = MAGNITUDE( tgc->c ); - md = MAGNITUDE( tgc->d ); - mh = MAGNITUDE( tgc->h ); + ma = MAGNITUDE(tgc->a); + mb = MAGNITUDE(tgc->b); + mc = MAGNITUDE(tgc->c); + md = MAGNITUDE(tgc->d); + mh = MAGNITUDE(tgc->h); /* check for right cylinder */ - if ( fabs(fabs(VDOT(tgc->h, axb)) - (mh*maxb)) < .00001 ) { + if (fabs(fabs(VDOT(tgc->h, axb)) - (mh*maxb)) < .00001) { /* have a right cylinder */ if (fabs(ma-mb) < .00001) { /* have a circular base */ @@ -724,15 +718,14 @@ else cgtype = GED_ANAL_TRC; } - } - else { + } else { /* have an elliptical base */ if (fabs(ma-mc) < .00001 && fabs(mb-md) < .00001) cgtype = GED_ANAL_REC; } } - switch ( cgtype ) { + switch (cgtype) { case GED_ANAL_RCC: area_base = M_PI * ma * ma; @@ -778,7 +771,7 @@ } -/* analyze ars */ +/* analyze ars */ static void ged_ars_anal(struct ged *gedp, const struct rt_db_internal *ip) { @@ -787,17 +780,18 @@ bu_vls_printf(&gedp->ged_result_str, "ARS analyze not implemented\n"); } -/* XXX analyze spline needed + +/* XXX analyze spline needed * static void * ged_spline_anal(&gedp->ged_result_str, ip) - * struct bu_vls *vp; - * const struct rt_db_internal *ip; + * struct bu_vls *vp; + * const struct rt_db_internal *ip; * { - * bu_vls_printf(&gedp->ged_result_str, "SPLINE analyze not implemented\n"); + * bu_vls_printf(&gedp->ged_result_str, "SPLINE analyze not implemented\n"); * } */ -/* analyze particle */ +/* analyze particle */ static void ged_part_anal(struct ged *gedp, const struct rt_db_internal *ip) { @@ -806,19 +800,20 @@ bu_vls_printf(&gedp->ged_result_str, "PARTICLE analyze not implemented\n"); } + #define arcsinh(x) (log((x) + sqrt((x)*(x) + 1.))) -/* analyze rpc */ +/* analyze rpc */ static void ged_rpc_anal(struct ged *gedp, const struct rt_db_internal *ip) { - fastf_t area_parab, area_body, b, h, r, vol_parab; - struct rt_rpc_internal *rpc = (struct rt_rpc_internal *)ip->idb_ptr; + fastf_t area_parab, area_body, b, h, r, vol_parab; + struct rt_rpc_internal *rpc = (struct rt_rpc_internal *)ip->idb_ptr; - RT_RPC_CK_MAGIC( rpc ); + RT_RPC_CK_MAGIC(rpc); - b = MAGNITUDE( rpc->rpc_B ); - h = MAGNITUDE( rpc->rpc_H ); + b = MAGNITUDE(rpc->rpc_B); + h = MAGNITUDE(rpc->rpc_H); r = rpc->rpc_r; /* area of one parabolic side */ @@ -841,17 +836,18 @@ vol_parab/GALLONS_TO_MM3); } -/* analyze rhc */ + +/* analyze rhc */ static void ged_rhc_anal(struct ged *gedp, const struct rt_db_internal *ip) { - fastf_t area_hyperb, area_body, b, c, h, r, vol_hyperb, work1; - struct rt_rhc_internal *rhc = (struct rt_rhc_internal *)ip->idb_ptr; + fastf_t area_hyperb, area_body, b, c, h, r, vol_hyperb, work1; + struct rt_rhc_internal *rhc = (struct rt_rhc_internal *)ip->idb_ptr; - RT_RHC_CK_MAGIC( rhc ); + RT_RHC_CK_MAGIC(rhc); - b = MAGNITUDE( rhc->rhc_B ); - h = MAGNITUDE( rhc->rhc_H ); + b = MAGNITUDE(rhc->rhc_B); + h = MAGNITUDE(rhc->rhc_H); r = rhc->rhc_r; c = rhc->rhc_c; @@ -866,9 +862,9 @@ area_body=0.; #if 0 k = (b+c)*(b+c) - c*c; -#define X_eval(y) sqrt( 1. + (4.*k)/(r*r*k*k*(y)*(y) + r*r*c*c) ) +#define X_eval(y) sqrt(1. + (4.*k)/(r*r*k*k*(y)*(y) + r*r*c*c)) #define L_eval(y) .5*k*(y)*X_eval(y) \ - + r*k*(r*r*c*c + 4.*k - r*r*c*c/k)*arcsinh((y)*sqrt(k)/c) + + r*k*(r*r*c*c + 4.*k - r*r*c*c/k)*arcsinh((y)*sqrt(k)/c) area_body = 2.*(L_eval(r) - L_eval(0.)); #endif Modified: brlcad/trunk/src/libged/arb.c =================================================================== --- brlcad/trunk/src/libged/arb.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/arb.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -34,12 +34,13 @@ #include "./ged_private.h" + int ged_arb(struct ged *gedp, int argc, const char *argv[]) { struct directory *dp; - struct rt_db_internal internal; - struct rt_arb_internal *arb; + struct rt_db_internal internal; + struct rt_arb_internal *arb; int i, j; fastf_t rota, fb; vect_t norm1, norm2, norm3; @@ -80,8 +81,8 @@ rota *= bn_degtorad; fb *= bn_degtorad; - BU_GETSTRUCT( arb, rt_arb_internal ); - RT_DB_INTERNAL_INIT( &internal ); + BU_GETSTRUCT(arb, rt_arb_internal); + RT_DB_INTERNAL_INIT(&internal); internal.idb_major_type = DB5_MAJORTYPE_BRLCAD; internal.idb_type = ID_ARB8; internal.idb_meth = &rt_functab[ID_ARB8]; @@ -102,24 +103,24 @@ /* find two perpendicular vectors which are perpendicular to norm */ j = 0; - for ( i = 0; i < 3; i++ ) { - if ( fabs(norm1[i]) < fabs(norm1[j]) ) + for (i = 0; i < 3; i++) { + if (fabs(norm1[i]) < fabs(norm1[j])) j = i; } - VSET( norm2, 0.0, 0.0, 0.0 ); + VSET(norm2, 0.0, 0.0, 0.0); norm2[j] = 1.0; - VCROSS( norm3, norm2, norm1 ); - VCROSS( norm2, norm3, norm1 ); + VCROSS(norm3, norm2, norm1); + VCROSS(norm2, norm3, norm1); /* create new rpp 20x20x2 */ /* the 20x20 faces are in rot, fb plane */ - VUNITIZE( norm2 ); - VUNITIZE( norm3 ); - VJOIN1( arb->pt[1], arb->pt[0], 508.0, norm2 ); - VJOIN1( arb->pt[3], arb->pt[0], -508.0, norm3 ); - VJOIN2( arb->pt[2], arb->pt[0], 508.0, norm2, -508.0, norm3 ); - for ( i=0; i<4; i++ ) - VJOIN1( arb->pt[i+4], arb->pt[i], -50.8, norm1 ); + VUNITIZE(norm2); + VUNITIZE(norm3); + VJOIN1(arb->pt[1], arb->pt[0], 508.0, norm2); + VJOIN1(arb->pt[3], arb->pt[0], -508.0, norm3); + VJOIN2(arb->pt[2], arb->pt[0], 508.0, norm2, -508.0, norm3); + for (i=0; i<4; i++) + VJOIN1(arb->pt[i+4], arb->pt[i], -50.8, norm1); GED_DB_DIRADD(gedp, dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (genptr_t)&internal.idb_type, GED_ERROR); GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, GED_ERROR); @@ -127,6 +128,7 @@ return GED_OK; } + /* * Local Variables: * tab-width: 8 Modified: brlcad/trunk/src/libged/arced.c =================================================================== --- brlcad/trunk/src/libged/arced.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/arced.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -114,7 +114,7 @@ goto fail; } - if (bn_mat_is_identity( tp->tr_l.tl_mat)) { + if (bn_mat_is_identity(tp->tr_l.tl_mat)) { bu_free((genptr_t)tp->tr_l.tl_mat, "tl_mat"); tp->tr_l.tl_mat = (matp_t)NULL; } @@ -126,7 +126,7 @@ db_free_1anim(anp); return GED_OK; - fail: +fail: rt_db_free_internal(&intern); db_free_1anim(anp); return GED_ERROR; Modified: brlcad/trunk/src/libged/arot.c =================================================================== --- brlcad/trunk/src/libged/arot.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/arot.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -85,6 +85,7 @@ return GED_OK; } + int ged_arot(struct ged *gedp, int argc, const char *argv[]) { @@ -97,6 +98,7 @@ return _ged_do_rot(gedp, gedp->ged_gvp->gv_coord, rmat, (int (*)())0); } + /* * Local Variables: * tab-width: 8 Modified: brlcad/trunk/src/libged/attr.c =================================================================== --- brlcad/trunk/src/libged/attr.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/attr.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -37,7 +37,7 @@ _ged_cmpattr(const void *p1, const void *p2) { return bu_strcmp((char * const)((struct bu_attribute_value_pair *)p1)->name, - (char * const)((struct bu_attribute_value_pair *)p2)->name); + (char * const)((struct bu_attribute_value_pair *)p2)->name); } Modified: brlcad/trunk/src/libged/autoview.c =================================================================== --- brlcad/trunk/src/libged/autoview.c 2011-06-28 21:51:17 UTC (rev 45266) +++ brlcad/trunk/src/libged/autoview.c 2011-06-28 22:01:41 UTC (rev 45267) @@ -35,7 +35,7 @@ * Auto-adjust the view so that all displayed geometry is in view * * Usage: - * autoview + * autoview * */ int @@ -43,13 +43,13 @@ { struct ged_display_list *gdlp; struct ged_display_list *next_gdlp; - struct solid *sp; + struct solid *sp; int is_empty = 1; - vect_t min, max; - vect_t minus, plus; - vect_t center; - vect_t radial; - vect_t sqrt_small; + vect_t min, max; + vect_t minus, plus; + vect_t center; + vect_t radial; + vect_t sqrt_small; GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR); GED_CHECK_DRAWABLE(gedp, GED_ERROR); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |