[brlcad-commits] SF.net SVN: brlcad:[45268] brlcad/trunk/src/libged
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[45268] brlcad/trunk/src/libged
|
From: <br...@us...> - 2011-06-28 22:08:10
|
Revision: 45268
http://brlcad.svn.sourceforge.net/brlcad/?rev=45268&view=rev
Author: brlcad
Date: 2011-06-28 22:08:03 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
ws indent style cleanup
Modified Paths:
--------------
brlcad/trunk/src/libged/bb.c
brlcad/trunk/src/libged/bev.c
brlcad/trunk/src/libged/bigE.c
brlcad/trunk/src/libged/blast.c
brlcad/trunk/src/libged/bo.c
brlcad/trunk/src/libged/bot.c
brlcad/trunk/src/libged/bot_condense.c
brlcad/trunk/src/libged/bot_decimate.c
brlcad/trunk/src/libged/bot_dump.c
brlcad/trunk/src/libged/bot_face_fuse.c
brlcad/trunk/src/libged/bot_face_sort.c
brlcad/trunk/src/libged/bot_flip.c
brlcad/trunk/src/libged/bot_merge.c
brlcad/trunk/src/libged/bot_smooth.c
brlcad/trunk/src/libged/bot_split.c
brlcad/trunk/src/libged/bot_vertex_fuse.c
brlcad/trunk/src/libged/brep.c
Modified: brlcad/trunk/src/libged/bb.c
===================================================================
--- brlcad/trunk/src/libged/bb.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bb.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -42,7 +42,7 @@
point_t rpp_min, rpp_max;
point_t obj_min, obj_max;
int c;
- int use_air = 1;
+ int use_air = 1;
int print_header = 1;
int print_rpp = 0;
int print_dim = 0;
@@ -56,7 +56,7 @@
double zlen;
double vol;
char bbname[64];
-
+
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_READ_ONLY(gedp, GED_ERROR);
GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
@@ -160,9 +160,9 @@
}
if (make_bb == 1) {
- struct directory *dp;
- struct rt_arb_internal *arb;
- struct rt_db_internal new_intern;
+ struct directory *dp;
+ struct rt_arb_internal *arb;
+ struct rt_db_internal new_intern;
arb = (struct rt_arb_internal *)bu_malloc(sizeof(struct rt_arb_internal), "arb");
VMOVE(arb->pt[0], rpp_min);
VSET(arb->pt[1], rpp_min[X], rpp_min[Y], rpp_max[Z]);
@@ -173,25 +173,25 @@
VMOVE(arb->pt[6], rpp_max);
VSET(arb->pt[7], rpp_max[X], rpp_max[Y], rpp_min[Z]);
arb->magic = RT_ARB_INTERNAL_MAGIC;
-
+
/* set up internal structure */
RT_DB_INTERNAL_INIT(&new_intern);
new_intern.idb_major_type = DB5_MAJORTYPE_BRLCAD;
new_intern.idb_type = ID_ARB8;
new_intern.idb_meth = &rt_functab[ID_ARB8];
new_intern.idb_ptr = (genptr_t)arb;
-
+
if ((dp=db_diradd(gedp->ged_wdbp->dbip, bbname, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (genptr_t)&new_intern.idb_type)) == RT_DIR_NULL) {
bu_vls_printf(&gedp->ged_result_str, "Cannot add %s to directory\n", bbname);
return GED_ERROR;
}
-
+
if (rt_db_put_internal(dp, gedp->ged_wdbp->dbip, &new_intern, gedp->ged_wdbp->wdb_resp) < 0) {
rt_db_free_internal(&new_intern);
bu_vls_printf(&gedp->ged_result_str, "Database write error, aborting.\n");
}
}
-
+
return GED_OK;
}
Modified: brlcad/trunk/src/libged/bev.c
===================================================================
--- brlcad/trunk/src/libged/bev.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bev.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -39,9 +39,9 @@
static struct model *ged_nmg_model;
/*
- * M G E D _ F A C E T I Z E _ R E G I O N _ E N D
+ * M G E D _ F A C E T I Z E _ R E G I O N _ E N D
*
- * This routine must be prepared to run in parallel.
+ * This routine must be prepared to run in parallel.
*/
static union tree *
ged_facetize_region_end(struct db_tree_state *UNUSED(tsp), const struct db_full_path *pathp, union tree *curtree, genptr_t client_data)
@@ -49,20 +49,20 @@
struct bu_list vhead;
struct ged *gedp = (struct ged *)client_data;
- BU_LIST_INIT( &vhead );
+ BU_LIST_INIT(&vhead);
- if (RT_G_DEBUG&DEBUG_TREEWALK) {
- char *sofar = db_path_to_string(pathp);
+ if (RT_G_DEBUG&DEBUG_TREEWALK) {
+ char *sofar = db_path_to_string(pathp);
bu_vls_printf(&gedp->ged_result_str, "ged_facetize_region_end() path='%s'\n", sofar);
bu_free((genptr_t)sofar, "path string");
}
- if ( curtree->tr_op == OP_NOP ) return curtree;
+ if (curtree->tr_op == OP_NOP) return curtree;
- bu_semaphore_acquire( RT_SEM_MODEL );
- if ( ged_facetize_tree ) {
- union tree *tr;
+ bu_semaphore_acquire(RT_SEM_MODEL);
+ if (ged_facetize_tree) {
+ union tree *tr;
BU_GETUNION(tr, tree);
RT_TREE_INIT(tr);
tr->tr_op = OP_UNION;
@@ -73,7 +73,7 @@
} else {
ged_facetize_tree = curtree;
}
- bu_semaphore_release( RT_SEM_MODEL );
+ bu_semaphore_release(RT_SEM_MODEL);
/* Tree has been saved, and will be freed later */
return TREE_NULL;
@@ -86,7 +86,7 @@
static const char *usage = "[P|t] new_obj obj1 op obj2 op obj3 ...";
int i;
- int c;
+ int c;
int ncpu;
char *cmdname;
char *newname;
@@ -131,8 +131,8 @@
/* Parse options. */
bu_optind = 1; /* re-init bu_getopt() */
- while ( (c=bu_getopt(argc, (char * const *)argv, "tP:")) != -1 ) {
- switch (c) {
+ while ((c=bu_getopt(argc, (char * const *)argv, "tP:")) != -1) {
+ switch (c) {
case 'P':
#if 0
/* not yet supported */
@@ -142,12 +142,11 @@
case 't':
triangulate = 1;
break;
- default:
- {
+ default: {
bu_vls_printf(&gedp->ged_result_str, "%s: option '%c' unknown\n", cmdname, c);
}
- break;
+ break;
}
}
argc -= bu_optind;
@@ -178,38 +177,35 @@
op = ' ';
tmp_tree = (union tree *)NULL;
- while ( argc )
- {
- i = db_walk_tree( gedp->ged_wdbp->dbip, 1, (const char **)argv,
- ncpu,
- &gedp->ged_wdbp->wdb_initial_tree_state,
- 0, /* take all regions */
- ged_facetize_region_end,
- nmg_booltree_leaf_tess,
- (genptr_t)gedp );
+ while (argc) {
+ i = db_walk_tree(gedp->ged_wdbp->dbip, 1, (const char **)argv,
+ ncpu,
+ &gedp->ged_wdbp->wdb_initial_tree_state,
+ 0, /* take all regions */
+ ged_facetize_region_end,
+ nmg_booltree_leaf_tess,
+ (genptr_t)gedp);
- if ( i < 0 ) {
+ if (i < 0) {
bu_vls_printf(&gedp->ged_result_str, "%s: error in db_walk_tree()\n", cmdname);
/* Destroy NMG */
- nmg_km( ged_nmg_model );
+ nmg_km(ged_nmg_model);
return GED_ERROR;
}
argc--;
argv++;
- if ( tmp_tree && op != ' ' )
- {
+ if (tmp_tree && op != ' ') {
union tree *new_tree;
- BU_GETUNION( new_tree, tree );
+ BU_GETUNION(new_tree, tree);
RT_TREE_INIT(new_tree);
new_tree->tr_b.tb_regionp = REGION_NULL;
new_tree->tr_b.tb_left = tmp_tree;
new_tree->tr_b.tb_right = ged_facetize_tree;
- switch ( op )
- {
+ switch (op) {
case 'u':
case 'U':
new_tree->tr_op = OP_UNION;
@@ -220,92 +216,82 @@
case '+':
new_tree->tr_op = OP_INTERSECT;
break;
- default:
- {
+ default: {
bu_vls_printf(&gedp->ged_result_str, "%s: Unrecognized operator: (%c)\nAborting\n",
argv[0], op);
- db_free_tree( ged_facetize_tree, &rt_uniresource );
- nmg_km( ged_nmg_model );
+ db_free_tree(ged_facetize_tree, &rt_uniresource);
+ nmg_km(ged_nmg_model);
return GED_ERROR;
}
}
tmp_tree = new_tree;
ged_facetize_tree = (union tree *)NULL;
- }
- else if ( !tmp_tree && op == ' ' )
- {
+ } else if (!tmp_tree && op == ' ') {
/* just starting out */
tmp_tree = ged_facetize_tree;
ged_facetize_tree = (union tree *)NULL;
}
- if ( argc )
- {
+ if (argc) {
op = *argv[0];
argc--;
argv++;
- }
- else
+ } else
op = ' ';
}
- if ( tmp_tree )
- {
+ if (tmp_tree) {
/* Now, evaluate the boolean tree into ONE region */
bu_vls_printf(&gedp->ged_result_str, "%s: evaluating boolean expressions\n", cmdname);
- if ( BU_SETJUMP )
- {
+ if (BU_SETJUMP) {
BU_UNSETJUMP;
bu_vls_printf(&gedp->ged_result_str, "%s: WARNING: Boolean evaluation failed!!!\n", cmdname);
- if ( tmp_tree )
- db_free_tree( tmp_tree, &rt_uniresource );
+ if (tmp_tree)
+ db_free_tree(tmp_tree, &rt_uniresource);
tmp_tree = (union tree *)NULL;
- nmg_km( ged_nmg_model );
+ nmg_km(ged_nmg_model);
ged_nmg_model = (struct model *)NULL;
return GED_ERROR;
}
- failed = nmg_boolean( tmp_tree, ged_nmg_model, &gedp->ged_wdbp->wdb_tol, &rt_uniresource );
+ failed = nmg_boolean(tmp_tree, ged_nmg_model, &gedp->ged_wdbp->wdb_tol, &rt_uniresource);
BU_UNSETJUMP;
- }
- else
+ } else
failed = 1;
- if ( failed ) {
+ if (failed) {
bu_vls_printf(&gedp->ged_result_str, "%s: no resulting region, aborting\n", cmdname);
- if ( tmp_tree )
- db_free_tree( tmp_tree, &rt_uniresource );
+ if (tmp_tree)
+ db_free_tree(tmp_tree, &rt_uniresource);
tmp_tree = (union tree *)NULL;
- nmg_km( ged_nmg_model );
+ nmg_km(ged_nmg_model);
ged_nmg_model = (struct model *)NULL;
return GED_ERROR;
}
/* New region remains part of this nmg "model" */
- NMG_CK_REGION( tmp_tree->tr_d.td_r );
+ NMG_CK_REGION(tmp_tree->tr_d.td_r);
bu_vls_printf(&gedp->ged_result_str, "%s: facetize %s\n", cmdname, tmp_tree->tr_d.td_name);
- nmg_vmodel( ged_nmg_model );
+ nmg_vmodel(ged_nmg_model);
/* Triangulate model, if requested */
- if ( triangulate )
- {
+ if (triangulate) {
bu_vls_printf(&gedp->ged_result_str, "%s: triangulating resulting object\n", cmdname);
- if ( BU_SETJUMP )
- {
+ if (BU_SETJUMP) {
BU_UNSETJUMP;
bu_vls_printf(&gedp->ged_result_str, "%s: WARNING: Triangulation failed!!!\n", cmdname);
- if ( tmp_tree )
- db_free_tree( tmp_tree, &rt_uniresource );
+ if (tmp_tree)
+ db_free_tree(tmp_tree, &rt_uniresource);
tmp_tree = (union tree *)NULL;
- nmg_km( ged_nmg_model );
+ nmg_km(ged_nmg_model);
ged_nmg_model = (struct model *)NULL;
return GED_ERROR;
}
- nmg_triangulate_model( ged_nmg_model, &gedp->ged_wdbp->wdb_tol );
+ nmg_triangulate_model(ged_nmg_model, &gedp->ged_wdbp->wdb_tol);
BU_UNSETJUMP;
}
@@ -325,7 +311,7 @@
tmp_tree->tr_d.td_r = (struct nmgregion *)NULL;
/* Free boolean tree, and the regions in it. */
- db_free_tree( tmp_tree, &rt_uniresource );
+ db_free_tree(tmp_tree, &rt_uniresource);
return GED_OK;
}
Modified: brlcad/trunk/src/libged/bigE.c
===================================================================
--- brlcad/trunk/src/libged/bigE.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bigE.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -59,8 +59,8 @@
#define MY_FREE_SEG_LIST(_segheadp, _res) { \
struct seg *_a; \
while (BU_LIST_WHILE (_a, seg, (_segheadp))) { \
- BU_LIST_DEQUEUE(&(_a->l)); \
- RT_FREE_SEG(_a, _res); \
+ BU_LIST_DEQUEUE(&(_a->l)); \
+ RT_FREE_SEG(_a, _res); \
} }
/* stolen from g_half.c */
@@ -69,7 +69,7 @@
vect_t half_Xbase; /* "X" basis direction */
vect_t half_Ybase; /* "Y" basis direction */
};
-#define HALF_NULL ((struct half_specific *)0)
+#define HALF_NULL ((struct half_specific *)0)
/* structures for building a tree corresponding to the region to be
* drawn uses the same "op" values as "union tree"
@@ -101,8 +101,9 @@
} l;
};
+
#define E_TREE_MAGIC 0x45545245
-#define CK_ETREE(_p) BU_CKMAG(_p, E_TREE_MAGIC, "struct E_tree")
+#define CK_ETREE(_p) BU_CKMAG(_p, E_TREE_MAGIC, "struct E_tree")
HIDDEN union E_tree *
@@ -222,6 +223,7 @@
return eptr;
}
+
/* build an E_tree corresponding to the region tree (tp) */
union E_tree *
build_etree(union tree *tp,
@@ -270,6 +272,7 @@
return eptr;
}
+
/* a handy routine (for debugging) that prints asegment list */
void
show_seg(struct bu_list *seg, int str)
@@ -299,6 +302,7 @@
}
}
+
/* given a segment list, eliminate any overlaps in the segments */
HIDDEN void
eliminate_overlaps(struct bu_list *seghead,
@@ -334,6 +338,7 @@
}
}
+
/* perform the intersection of two segments the result is assigned the
* provided type
*/
@@ -376,6 +381,7 @@
return;
}
+
/* perform the subtraction of one segment from another the result is
* assigned the type from segment A
*/
@@ -428,6 +434,7 @@
}
}
+
HIDDEN void
promote_ints(struct bu_list *head,
struct _ged_client_data *dgcdp)
@@ -627,6 +634,7 @@
#endif
}
+
/* Evaluate an operation on the operands (segment lists) */
HIDDEN struct bu_list *
eval_op(struct bu_list *A,
@@ -948,6 +956,7 @@
}
+
/* evaluate an E-tree */
HIDDEN struct bu_list *
eval_etree(union E_tree *eptr,
@@ -990,6 +999,7 @@
return (struct bu_list *)NULL; /* for the compilers */
}
+
HIDDEN void
inverse_dir(vect_t dir, vect_t inv_dir)
{
@@ -1014,6 +1024,7 @@
}
}
+
HIDDEN struct soltab *
classify_seg(struct seg *segp, struct soltab *shoot, struct xray *rp, struct _ged_client_data *dgcdp)
{
@@ -1099,6 +1110,7 @@
return ret;
}
+
/* Shoot rays (corresponding to possible edges in the result) at the
* solids, put the results in the E-tree leaves as type IN_SOL. Call
* eval_etree() and plot the results
@@ -1333,6 +1345,7 @@
}
+
#define HITS_BLOCK 20
HIDDEN void
@@ -1698,6 +1711,7 @@
bu_free((char *)hits2, "hits2");
}
+
HIDDEN void
free_etree(union E_tree *eptr,
struct _ged_client_data *dgcdp)
@@ -1735,6 +1749,7 @@
}
}
+
/* convert all "half" solids to polysolids */
HIDDEN void
fix_halfs(struct _ged_client_data *dgcdp)
@@ -2011,6 +2026,7 @@
}
}
+
int
ged_E(struct ged *gedp, int argc, const char *argv[])
{
@@ -2058,16 +2074,16 @@
char *cp = bu_optarg;
r = atoi(cp);
- while ((*cp >= '0' && *cp <= '9')) cp++;
+ while ((*cp >= '0' && *cp <= '9')) cp++;
while (*cp && (*cp < '0' || *cp > '9')) cp++;
g = atoi(cp);
- while ((*cp >= '0' && *cp <= '9')) cp++;
+ while ((*cp >= '0' && *cp <= '9')) cp++;
while (*cp && (*cp < '0' || *cp > '9')) cp++;
b = atoi(cp);
- if (r < 0 || r > 255) r = 255;
- if (g < 0 || g > 255) g = 255;
- if (b < 0 || b > 255) b = 255;
+ if (r < 0 || r > 255) r = 255;
+ if (g < 0 || g > 255) g = 255;
+ if (b < 0 || b > 255) b = 255;
dgcdp->wireframe_color_override = 1;
dgcdp->wireframe_color[0] = r;
@@ -2166,6 +2182,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/libged/blast.c
===================================================================
--- brlcad/trunk/src/libged/blast.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/blast.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -31,7 +31,7 @@
* Erase all currently displayed geometry and draw the specified object(s)
*
* Usage:
- * blast object(s)
+ * blast object(s)
*
*/
int
Modified: brlcad/trunk/src/libged/bo.c
===================================================================
--- brlcad/trunk/src/libged/bo.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bo.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -94,13 +94,13 @@
argc -= bu_optind;
argv += bu_optind;
- if ( (input_mode && argc != 4) || (output_mode && argc != 2) ) {
+ if ((input_mode && argc != 4) || (output_mode && argc != 2)) {
bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return GED_ERROR;
}
- if ( input_mode ) {
+ if (input_mode) {
if (argv[0][0] == 'u') {
if (argv[1][1] != '\0') {
@@ -166,7 +166,7 @@
file_name = (char *)*argv;
/* make a binunif of the entire file */
- if ( rt_mk_binunif( gedp->ged_wdbp, obj_name, file_name, minor_type, 0) ) {
+ if (rt_mk_binunif (gedp->ged_wdbp, obj_name, file_name, minor_type, 0)) {
bu_vls_printf(&gedp->ged_result_str, "Error creating %s", obj_name);
return GED_ERROR;
}
@@ -181,20 +181,20 @@
obj_name = (char *)*argv;
- if ( (dp=db_lookup(gedp->ged_wdbp->dbip, obj_name, LOOKUP_NOISY )) == RT_DIR_NULL ) {
+ if ((dp=db_lookup(gedp->ged_wdbp->dbip, obj_name, LOOKUP_NOISY)) == RT_DIR_NULL) {
return GED_ERROR;
}
- if ( !( dp->d_major_type & DB5_MAJORTYPE_BINARY_MASK) ) {
+ if (!(dp->d_major_type & DB5_MAJORTYPE_BINARY_MASK)) {
bu_vls_printf(&gedp->ged_result_str, "%s is not a binary object", obj_name);
return GED_ERROR;
}
- if ( dp->d_major_type != DB5_MAJORTYPE_BINARY_UNIF ) {
+ if (dp->d_major_type != DB5_MAJORTYPE_BINARY_UNIF) {
bu_vls_printf(&gedp->ged_result_str, "source must be a uniform binary object");
return GED_ERROR;
}
- fp = fopen( file_name, "w+b");
+ fp = fopen(file_name, "w+b");
if (fp == NULL) {
bu_vls_printf(&gedp->ged_result_str, "Error: cannot open file %s for writing", file_name);
return GED_ERROR;
@@ -207,7 +207,7 @@
return GED_ERROR;
}
- RT_CK_DB_INTERNAL( &intern );
+ RT_CK_DB_INTERNAL(&intern);
bip = (struct rt_binunif_internal *)intern.idb_ptr;
if (bip->count < 1) {
@@ -217,15 +217,15 @@
return GED_ERROR;
}
- if ( fwrite( bip->u.int8, bip->count * db5_type_sizeof_h_binu( bip->type ),
- 1, fp) != 1 ) {
+ if (fwrite(bip->u.int8, bip->count * db5_type_sizeof_h_binu(bip->type),
+ 1, fp) != 1) {
bu_vls_printf(&gedp->ged_result_str, "Error writing contents to file");
- fclose( fp );
+ fclose(fp);
rt_db_free_internal(&intern);
return GED_ERROR;
}
- fclose( fp );
+ fclose(fp);
rt_db_free_internal(&intern);
} else {
Modified: brlcad/trunk/src/libged/bot.c
===================================================================
--- brlcad/trunk/src/libged/bot.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -110,6 +110,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot_condense.c
===================================================================
--- brlcad/trunk/src/libged/bot_condense.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_condense.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -71,9 +71,9 @@
}
bot = (struct rt_bot_internal *)intern.idb_ptr;
- RT_BOT_CK_MAGIC( bot );
+ RT_BOT_CK_MAGIC(bot);
- count2 = rt_bot_condense( bot );
+ count2 = rt_bot_condense(bot);
bu_vls_printf(&gedp->ged_result_str, "%s: %d dead vertices eliminated\n", argv[0], count2);
GED_DB_DIRADD(gedp, new_dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR);
@@ -82,6 +82,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot_decimate.c
===================================================================
--- brlcad/trunk/src/libged/bot_decimate.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_decimate.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -67,34 +67,33 @@
/* process args */
bu_optind = 1;
bu_opterr = 0;
- while ( (c=bu_getopt(argc, (char * const *)argv, "c:n:e:")) != -1 ) {
+ while ((c=bu_getopt(argc, (char * const *)argv, "c:n:e:")) != -1) {
switch (c) {
case 'c':
- max_chord_error = atof( bu_optarg );
- if ( max_chord_error < 0.0 ) {
+ max_chord_error = atof(bu_optarg);
+ if (max_chord_error < 0.0) {
bu_vls_printf(&gedp->ged_result_str,
"Maximum chord error cannot be less than zero");
return GED_ERROR;
}
break;
case 'n':
- max_normal_error = atof( bu_optarg );
- if ( max_normal_error < 0.0 ) {
+ max_normal_error = atof(bu_optarg);
+ if (max_normal_error < 0.0) {
bu_vls_printf(&gedp->ged_result_str,
"Maximum normal error cannot be less than zero");
return GED_ERROR;
}
break;
case 'e':
- min_edge_length = atof( bu_optarg );
- if ( min_edge_length < 0.0 ) {
+ min_edge_length = atof(bu_optarg);
+ if (min_edge_length < 0.0) {
bu_vls_printf(&gedp->ged_result_str,
"minumum edge length cannot be less than zero");
return GED_ERROR;
}
break;
- default:
- {
+ default: {
bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return GED_ERROR;
}
@@ -111,7 +110,7 @@
GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_QUIET, GED_ERROR);
/* import the current solid */
- RT_DB_INTERNAL_INIT( &intern );
+ RT_DB_INTERNAL_INIT(&intern);
GED_DB_GET_INTERNAL(gedp, &intern, dp, NULL, gedp->ged_wdbp->wdb_resp, GED_ERROR);
/* make sure this is a BOT solid */
@@ -123,18 +122,18 @@
bot = (struct rt_bot_internal *)intern.idb_ptr;
- RT_BOT_CK_MAGIC( bot );
+ RT_BOT_CK_MAGIC(bot);
/* convert maximum error and edge length to mm */
- if(max_chord_error > 0.0) {
+ if (max_chord_error > 0.0) {
max_chord_error = max_chord_error * gedp->ged_wdbp->dbip->dbi_local2base;
}
- if(min_edge_length > 0.0) {
+ if (min_edge_length > 0.0) {
min_edge_length = min_edge_length * gedp->ged_wdbp->dbip->dbi_local2base;
}
/* do the decimation */
- if ( rt_bot_decimate( bot, max_chord_error, max_normal_error, min_edge_length) < 0 ) {
+ if (rt_bot_decimate(bot, max_chord_error, max_normal_error, min_edge_length) < 0) {
bu_vls_printf(&gedp->ged_result_str, "Decimation Error\n");
rt_db_free_internal(&intern);
return GED_ERROR;
@@ -142,7 +141,7 @@
/* save the result to the database */
/* XXX - should this be rt_db_put_internal() instead? */
- if ( wdb_put_internal( gedp->ged_wdbp, argv[0], &intern, 1.0 ) < 0 ) {
+ if (wdb_put_internal(gedp->ged_wdbp, argv[0], &intern, 1.0) < 0) {
bu_vls_printf(&gedp->ged_result_str,
"Failed to write decimated BOT back to database\n");
return GED_ERROR;
Modified: brlcad/trunk/src/libged/bot_dump.c
===================================================================
--- brlcad/trunk/src/libged/bot_dump.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_dump.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -46,7 +46,7 @@
#include "./ged_private.h"
-#define V3ARGS_SCALE(_a) (_a)[X]*cfactor, (_a)[Y]*cfactor, (_a)[Z]*cfactor
+#define V3ARGS_SCALE(_a) (_a)[X]*cfactor, (_a)[Y]*cfactor, (_a)[Z]*cfactor
static char usage[] = "\
Usage: %s [-b] [-n] [-m directory] [-o file] [-t dxf|obj|sat|stl] [-u units] [bot1 bot2 ...]\n";
@@ -58,6 +58,7 @@
OTYPE_STL
};
+
struct _ged_bot_dump_client_data {
struct ged *gedp;
FILE *fp;
@@ -65,6 +66,7 @@
char *file_ext;
};
+
struct _ged_obj_material {
struct bu_list l;
struct bu_vls name;
@@ -74,6 +76,7 @@
fastf_t a;
};
+
static int using_dbot_dump;
struct bu_list HeadObjMaterials;
struct bu_vls obj_materials_file;
@@ -112,6 +115,7 @@
| ((r & 0xff000000) >> 24);
}
+
static struct _ged_obj_material *
ged_get_obj_material(int red, int green, int blue, fastf_t transparency)
{
@@ -147,6 +151,7 @@
return gomp;
}
+
static void
ged_free_obj_materials() {
struct _ged_obj_material *gomp;
@@ -158,6 +163,7 @@
}
}
+
static void
write_bot_sat(struct rt_bot_internal *bot, FILE *fp, char *UNUSED(name))
{
@@ -227,17 +233,17 @@
first_coedge = curr_line_num;
curr_loop_id = first_coedge+num_faces*7;
for (i = 0; i < num_faces; i++) {
- fprintf( fp, "-%d coedge $-1 $%d $%d $%d $%d forward $%d $-1 #\n",
- curr_line_num, curr_line_num+1, curr_line_num+2, curr_line_num,
- curr_line_num+num_faces*3, curr_loop_id);
+ fprintf(fp, "-%d coedge $-1 $%d $%d $%d $%d forward $%d $-1 #\n",
+ curr_line_num, curr_line_num+1, curr_line_num+2, curr_line_num,
+ curr_line_num+num_faces*3, curr_loop_id);
++curr_line_num;
- fprintf( fp, "-%d coedge $-1 $%d $%d $%d $%d forward $%d $-1 #\n",
- curr_line_num, curr_line_num+1, curr_line_num-1, curr_line_num,
- curr_line_num+num_faces*3, curr_loop_id);
+ fprintf(fp, "-%d coedge $-1 $%d $%d $%d $%d forward $%d $-1 #\n",
+ curr_line_num, curr_line_num+1, curr_line_num-1, curr_line_num,
+ curr_line_num+num_faces*3, curr_loop_id);
++curr_line_num;
- fprintf( fp, "-%d coedge $-1 $%d $%d $%d $%d forward $%d $-1 #\n",
- curr_line_num, curr_line_num-2, curr_line_num-1, curr_line_num,
- curr_line_num+num_faces*3, curr_loop_id);
+ fprintf(fp, "-%d coedge $-1 $%d $%d $%d $%d forward $%d $-1 #\n",
+ curr_line_num, curr_line_num-2, curr_line_num-1, curr_line_num,
+ curr_line_num+num_faces*3, curr_loop_id);
++curr_line_num;
++curr_loop_id;
}
@@ -355,6 +361,7 @@
}
}
+
static void
write_bot_dxf(struct rt_bot_internal *bot, FILE *fp, char *name)
{
@@ -396,6 +403,7 @@
}
+
static void
write_bot_obj(struct rt_bot_internal *bot, FILE *fp, char *name)
{
@@ -408,7 +416,7 @@
vect_t BmA;
vect_t CmA;
vect_t norm;
- int i,vi;
+ int i, vi;
struct _ged_obj_material *gomp;
if (using_dbot_dump) {
@@ -465,6 +473,7 @@
v_offset += num_vertices;
}
+
static void
write_bot_stl(struct rt_bot_internal *bot, FILE *fp, char *name)
{
@@ -513,6 +522,7 @@
fprintf(fp, "endsolid %s\n", name);
}
+
static void
write_bot_stl_binary(struct rt_bot_internal *bot, int fd, char *UNUSED(name))
{
@@ -583,6 +593,7 @@
}
}
+
static void
bot_dump(struct directory *dp, struct rt_bot_internal *bot, FILE *fp, int fd, const char *file_ext, const char *db_name)
{
@@ -657,37 +668,37 @@
}
switch (output_type) {
- case OTYPE_DXF:
- fprintf(fp,
- "0\nSECTION\n2\nHEADER\n999\n%s (BOT from %s)\n0\nENDSEC\n0\nSECTION\n2\nENTITIES\n",
- dp->d_namep, db_name);
- write_bot_dxf(bot, fp, dp->d_namep);
- fprintf(fp, "0\nENDSEC\n0\nEOF\n");
- break;
- case OTYPE_OBJ:
- v_offset = 1;
- fprintf(fp, "mtllib %s\n", bu_vls_addr(&obj_materials_file));
- write_bot_obj(bot, fp, dp->d_namep);
- break;
- case OTYPE_SAT:
- curr_line_num = 0;
+ case OTYPE_DXF:
+ fprintf(fp,
+ "0\nSECTION\n2\nHEADER\n999\n%s (BOT from %s)\n0\nENDSEC\n0\nSECTION\n2\nENTITIES\n",
+ dp->d_namep, db_name);
+ write_bot_dxf(bot, fp, dp->d_namep);
+ fprintf(fp, "0\nENDSEC\n0\nEOF\n");
+ break;
+ case OTYPE_OBJ:
+ v_offset = 1;
+ fprintf(fp, "mtllib %s\n", bu_vls_addr(&obj_materials_file));
+ write_bot_obj(bot, fp, dp->d_namep);
+ break;
+ case OTYPE_SAT:
+ curr_line_num = 0;
- fprintf(fp, "400 0 1 0\n");
- /*XXX Temporarily hardwired */
+ fprintf(fp, "400 0 1 0\n");
+ /*XXX Temporarily hardwired */
#if 1
- fprintf(fp, "37 SolidWorks(2008000)-Sat-Convertor-2.0 11 ACIS 8.0 NT 24 Wed Dec 03 09:26:53 2003\n");
+ fprintf(fp, "37 SolidWorks(2008000)-Sat-Convertor-2.0 11 ACIS 8.0 NT 24 Wed Dec 03 09:26:53 2003\n");
#else
- fprintf(fp, "08 BRL-CAD-bot_dump-4.0 11 ACIS 4.0 NT 24 Thur Sep 25 15:00:00 2008\n");
+ fprintf(fp, "08 BRL-CAD-bot_dump-4.0 11 ACIS 4.0 NT 24 Thur Sep 25 15:00:00 2008\n");
#endif
- fprintf(fp, "1 9.9999999999999995e-007 1e-010\n");
+ fprintf(fp, "1 9.9999999999999995e-007 1e-010\n");
- write_bot_sat(bot, fp, dp->d_namep);
- fprintf(fp, "End-of-ACIS-data\n");
- break;
- case OTYPE_STL:
- default:
- write_bot_stl(bot, fp, dp->d_namep);
- break;
+ write_bot_sat(bot, fp, dp->d_namep);
+ fprintf(fp, "End-of-ACIS-data\n");
+ break;
+ case OTYPE_STL:
+ default:
+ write_bot_stl(bot, fp, dp->d_namep);
+ break;
}
fclose(fp);
@@ -700,29 +711,30 @@
write_bot_stl_binary(bot, fd, dp->d_namep);
} else {
switch (output_type) {
- case OTYPE_DXF:
- write_bot_dxf(bot, fp, dp->d_namep);
- break;
- case OTYPE_OBJ:
- write_bot_obj(bot, fp, dp->d_namep);
- break;
- case OTYPE_SAT:
- write_bot_sat(bot, fp, dp->d_namep);
- break;
- case OTYPE_STL:
- default:
- write_bot_stl(bot, fp, dp->d_namep);
- break;
+ case OTYPE_DXF:
+ write_bot_dxf(bot, fp, dp->d_namep);
+ break;
+ case OTYPE_OBJ:
+ write_bot_obj(bot, fp, dp->d_namep);
+ break;
+ case OTYPE_SAT:
+ write_bot_sat(bot, fp, dp->d_namep);
+ break;
+ case OTYPE_STL:
+ default:
+ write_bot_stl(bot, fp, dp->d_namep);
+ break;
}
}
}
}
+
static union tree *
-ged_bot_dump_leaf(struct db_tree_state *tsp,
+ged_bot_dump_leaf(struct db_tree_state *tsp,
const struct db_full_path *pathp,
- struct rt_db_internal *ip,
- genptr_t client_data)
+ struct rt_db_internal *ip,
+ genptr_t client_data)
{
int ret;
union tree *curtree;
@@ -767,6 +779,7 @@
return curtree;
}
+
static int
ged_bot_dump_get_args(struct ged *gedp, int argc, const char *argv[])
{
@@ -829,6 +842,7 @@
return GED_OK;
}
+
int
ged_bot_dump(struct ged *gedp, int argc, const char *argv[])
{
@@ -1054,6 +1068,7 @@
return GED_OK;
}
+
static void
write_data_arrows(struct ged_data_arrow_state *gdasp, FILE *fp, int sflag)
{
@@ -1128,6 +1143,7 @@
}
}
+
static void
write_data_axes(struct ged_data_axes_state *gdasp, FILE *fp, int sflag)
{
@@ -1199,11 +1215,12 @@
fprintf(fp, "l %d %d\n", (i*6)+v_offset+4, (i*6)+v_offset+5);
}
-
+
v_offset += (gdasp->gdas_num_points*6);
}
}
+
static void
write_data_lines(struct ged_data_line_state *gdlsp, FILE *fp, int sflag)
{
@@ -1241,6 +1258,7 @@
}
}
+
static void
write_data_obj(struct ged *gedp, FILE *fp)
{
@@ -1254,54 +1272,56 @@
write_data_lines(&gedp->ged_gvp->gv_sdata_lines, fp, 1);
}
+
static int
ged_data_dump(struct ged *gedp, FILE *fp)
{
switch (output_type) {
- case OTYPE_DXF:
- break;
- case OTYPE_OBJ:
- if (output_directory) {
- char *cp;
- struct bu_vls filepath;
- FILE *data_fp;
+ case OTYPE_DXF:
+ break;
+ case OTYPE_OBJ:
+ if (output_directory) {
+ char *cp;
+ struct bu_vls filepath;
+ FILE *data_fp;
- cp = strrchr(output_directory, '/');
- if (!cp)
- cp = (char *)output_directory;
- else
- ++cp;
+ cp = strrchr(output_directory, '/');
+ if (!cp)
+ cp = (char *)output_directory;
+ else
+ ++cp;
- if (*cp == '\0') {
- bu_vls_printf(&gedp->ged_result_str, "ged_data_dump: bad dirname - %s\n", output_directory);
- return GED_ERROR;
- }
+ if (*cp == '\0') {
+ bu_vls_printf(&gedp->ged_result_str, "ged_data_dump: bad dirname - %s\n", output_directory);
+ return GED_ERROR;
+ }
- bu_vls_init(&filepath);
- bu_vls_printf(&filepath, "%s/%s_data.obj", output_directory, cp);
+ bu_vls_init(&filepath);
+ bu_vls_printf(&filepath, "%s/%s_data.obj", output_directory, cp);
- if ((data_fp=fopen(bu_vls_addr(&filepath), "wb+")) == NULL) {
- bu_vls_printf(&gedp->ged_result_str, "ged_data_dump: failed to open %V\n", &filepath);
+ if ((data_fp=fopen(bu_vls_addr(&filepath), "wb+")) == NULL) {
+ bu_vls_printf(&gedp->ged_result_str, "ged_data_dump: failed to open %V\n", &filepath);
+ bu_vls_free(&filepath);
+ return GED_ERROR;
+ }
+
bu_vls_free(&filepath);
- return GED_ERROR;
- }
-
- bu_vls_free(&filepath);
- write_data_obj(gedp, data_fp);
- fclose(data_fp);
- } else
- write_data_obj(gedp, fp);
- break;
- case OTYPE_SAT:
- break;
- case OTYPE_STL:
- default:
- break;
+ write_data_obj(gedp, data_fp);
+ fclose(data_fp);
+ } else
+ write_data_obj(gedp, fp);
+ break;
+ case OTYPE_SAT:
+ break;
+ case OTYPE_STL:
+ default:
+ break;
}
return GED_OK;
}
+
int
ged_dbot_dump(struct ged *gedp, int argc, const char *argv[])
{
Modified: brlcad/trunk/src/libged/bot_face_fuse.c
===================================================================
--- brlcad/trunk/src/libged/bot_face_fuse.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_face_fuse.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -1,4 +1,4 @@
-/* B O T _ F A C E _ F U S E . C
+/* B O T _ F A C E _ F U S E . C
* BRL-CAD
*
* Copyright (c) 2008-2011 United States Government as represented by
@@ -64,16 +64,15 @@
GED_DB_LOOKUP(gedp, old_dp, argv[2], LOOKUP_NOISY, GED_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, GED_ERROR);
- if ( intern.idb_type != ID_BOT )
- {
+ if (intern.idb_type != ID_BOT) {
bu_vls_printf(&gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[2]);
return GED_ERROR;
}
bot = (struct rt_bot_internal *)intern.idb_ptr;
- RT_BOT_CK_MAGIC( bot );
+ RT_BOT_CK_MAGIC(bot);
- (void) rt_bot_face_fuse( bot );
+ (void) rt_bot_face_fuse(bot);
GED_DB_DIRADD(gedp, new_dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR);
GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, GED_ERROR);
@@ -81,6 +80,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot_face_sort.c
===================================================================
--- brlcad/trunk/src/libged/bot_face_sort.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_face_sort.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -1,4 +1,4 @@
-/* B O T _ F A C E _ S O R T . C
+/* B O T _ F A C E _ S O R T . C
* BRL-CAD
*
* Copyright (c) 2008-2011 United States Government as represented by
Modified: brlcad/trunk/src/libged/bot_flip.c
===================================================================
--- brlcad/trunk/src/libged/bot_flip.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_flip.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -79,6 +79,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot_merge.c
===================================================================
--- brlcad/trunk/src/libged/bot_merge.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_merge.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -80,7 +80,7 @@
/* read in all the bots */
- for (idx=1, i=2; i < argc; i++ ) {
+ for (idx=1, i=2; i < argc; i++) {
if ((dp = db_lookup(gedp->ged_wdbp->dbip, argv[i], LOOKUP_NOISY)) == RT_DIR_NULL) {
continue;
}
@@ -96,7 +96,7 @@
intern.idb_ptr = (genptr_t)0;
- RT_BOT_CK_MAGIC( bots[idx] );
+ RT_BOT_CK_MAGIC(bots[idx]);
bots[0]->num_vertices += bots[idx]->num_vertices;
bots[0]->num_faces += bots[idx]->num_faces;
@@ -107,7 +107,7 @@
if (idx == 1) return GED_ERROR;
- for (i=1; i < idx; i++ ) {
+ for (i=1; i < idx; i++) {
/* check for surface normals */
if (bots[0]->mode) {
if (bots[0]->mode != bots[i]->mode) {
@@ -140,7 +140,7 @@
avail_face = 0;
- for (i=1; i < idx; i++ ) {
+ for (i=1; i < idx; i++) {
/* copy the vertices */
memcpy(&bots[0]->vertices[3*avail_vert], bots[i]->vertices, bots[i]->num_vertices*3*sizeof(fastf_t));
@@ -191,6 +191,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot_smooth.c
===================================================================
--- brlcad/trunk/src/libged/bot_smooth.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_smooth.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -74,9 +74,9 @@
while (*argv[arg_index] == '-') {
/* this is an option */
- if ( BU_STR_EQUAL( argv[arg_index], "-t" ) ) {
+ if (BU_STR_EQUAL(argv[arg_index], "-t")) {
arg_index++;
- tolerance_angle = atof( argv[arg_index] );
+ tolerance_angle = atof(argv[arg_index]);
} else {
bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return GED_ERROR;
@@ -84,7 +84,7 @@
arg_index++;
}
- if ( arg_index >= argc ) {
+ if (arg_index >= argc) {
bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return GED_ERROR;
}
@@ -94,7 +94,7 @@
GED_DB_LOOKUP(gedp, dp_old, old_bot_name, LOOKUP_QUIET, GED_ERROR);
- if ( !BU_STR_EQUAL( old_bot_name, new_bot_name ) ) {
+ if (!BU_STR_EQUAL(old_bot_name, new_bot_name)) {
GED_CHECK_EXISTS(gedp, new_bot_name, LOOKUP_QUIET, GED_ERROR);
} else {
dp_new = dp_old;
@@ -109,15 +109,15 @@
}
old_bot = (struct rt_bot_internal *)intern.idb_ptr;
- RT_BOT_CK_MAGIC( old_bot );
+ RT_BOT_CK_MAGIC(old_bot);
- if ( rt_bot_smooth( old_bot, old_bot_name, gedp->ged_wdbp->dbip, tolerance_angle*M_PI/180.0 ) ) {
+ if (rt_bot_smooth(old_bot, old_bot_name, gedp->ged_wdbp->dbip, tolerance_angle*M_PI/180.0)) {
bu_vls_printf(&gedp->ged_result_str, "Failed to smooth %s\n", old_bot_name);
rt_db_free_internal(&intern);
return GED_ERROR;
}
- if ( dp_new == RT_DIR_NULL ) {
+ if (dp_new == RT_DIR_NULL) {
GED_DB_DIRADD(gedp, dp_new, new_bot_name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR);
}
@@ -127,6 +127,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot_split.c
===================================================================
--- brlcad/trunk/src/libged/bot_split.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_split.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -120,6 +120,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/bot_vertex_fuse.c
===================================================================
--- brlcad/trunk/src/libged/bot_vertex_fuse.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/bot_vertex_fuse.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -71,9 +71,9 @@
}
bot = (struct rt_bot_internal *)intern.idb_ptr;
- RT_BOT_CK_MAGIC( bot );
+ RT_BOT_CK_MAGIC(bot);
- count = rt_bot_vertex_fuse( bot );
+ count = rt_bot_vertex_fuse(bot);
bu_log("Fused %d vertices\n", count);
GED_DB_DIRADD(gedp, new_dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (genptr_t)&intern.idb_type, GED_ERROR);
@@ -82,6 +82,7 @@
return GED_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/libged/brep.c
===================================================================
--- brlcad/trunk/src/libged/brep.c 2011-06-28 22:01:41 UTC (rev 45267)
+++ brlcad/trunk/src/libged/brep.c 2011-06-28 22:08:03 UTC (rev 45268)
@@ -52,14 +52,14 @@
int real_flag;
char commtag[64];
char namebuf[64];
-
+
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_DRAWABLE(gedp, GED_ERROR);
GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
-
+
/* initialize result */
bu_vls_trunc(&gedp->ged_result_str, 0);
-
+
/* must be wanting help */
if (argc <= 2) {
bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
@@ -72,12 +72,12 @@
bu_vls_printf(&gedp->ged_result_str, "\tplot F [index] - plot specific BREP 'face'\n");
return GED_HELP;
}
-
+
if (argc < 2 || argc > 6) {
bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
return GED_ERROR;
}
-
+
solid_name = (char *)argv[1];
if ((ndp = db_lookup(gedp->ged_wdbp->dbip, solid_name, LOOKUP_NOISY)) == RT_DIR_NULL) {
bu_vls_printf(&gedp->ged_result_str, "Error: %s is not a solid or does not exist in database", solid_name);
@@ -85,27 +85,27 @@
} else {
real_flag = (ndp->d_addr == RT_DIR_PHONY_ADDR) ? 0 : 1;
}
-
+
if (!real_flag) {
/* solid doesnt exists - don't kill */
bu_vls_printf(&gedp->ged_result_str, "Error: %s is not a real solid", solid_name);
return GED_OK;
}
-
+
GED_DB_GET_INTERNAL(gedp, &intern, ndp, bn_mat_identity, &rt_uniresource, GED_ERROR);
-
-
+
+
RT_CK_DB_INTERNAL(&intern);
bi = (struct rt_brep_internal*)intern.idb_ptr;
-
+
if (!RT_BREP_TEST_MAGIC(bi)) {
/* solid doesnt exists - don't kill */
bu_vls_printf(&gedp->ged_result_str, "Error: %s is not a BREP solid.", solid_name);
return GED_OK;
}
-
+
BU_GETSTRUCT(stp, soltab);
-
+
if ((bs = (struct brep_specific*)stp->st_specific) == NULL) {
bs = (struct brep_specific*)bu_malloc(sizeof(struct brep_specific), "brep_specific");
bs->brep = bi->brep;
@@ -123,7 +123,7 @@
vbp = (struct bn_vlblock *)NULL;
rt_db_free_internal(&intern);
-
+
return GED_OK;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|