Revision: 64381
http://sourceforge.net/p/brlcad/code/64381
Author: starseeker
Date: 2015-03-12 20:41:03 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
Make the top level a bit more hierarchial, so it's easier to see what's going
on.
Modified Paths:
--------------
brlcad/trunk/src/librt/test_shape_recognition.cpp
Modified: brlcad/trunk/src/librt/test_shape_recognition.cpp
===================================================================
--- brlcad/trunk/src/librt/test_shape_recognition.cpp 2015-03-12 20:06:09 UTC
(rev 64380)
+++ brlcad/trunk/src/librt/test_shape_recognition.cpp 2015-03-12 20:41:03 UTC
(rev 64381)
@@ -464,13 +464,30 @@
//BU_PUT(obj, struct subbrep_object_data);
}
+ struct wmember *ccomb = NULL;
+ struct bu_vls obj_comb_name = BU_VLS_INIT_ZERO;
for (unsigned int i = 0; i < BU_PTBL_LEN(subbreps_tree); i++){
struct subbrep_object_data *obj = (struct subbrep_object_data
*)BU_PTBL_GET(subbreps_tree, i);
struct bu_vls obj_name = BU_VLS_INIT_ZERO;
subbrep_obj_name(obj, &obj_name);
+ if (obj->params->bool_op == 'u') {
+ if (ccomb) {
+ mk_lcomb(wdbp, bu_vls_addr(&obj_comb_name), ccomb, 0, NULL,
NULL, NULL, 0);
+ BU_PUT(ccomb, struct wmember);
+ }
+ BU_GET(ccomb, struct wmember);
+ BU_LIST_INIT(&ccomb->l);
+ bu_vls_sprintf(&obj_comb_name, "comb_%s.c", bu_vls_addr(obj->key));
+ (void)mk_addmember(bu_vls_addr(&obj_comb_name), &(pcomb.l), NULL,
db_str2op(&(obj->params->bool_op)));
+ (void)mk_addmember(bu_vls_addr(&obj_name), &((*ccomb).l), NULL,
db_str2op(&(obj->params->bool_op)));
+ } else {
+ (void)mk_addmember(bu_vls_addr(&obj_name), &((*ccomb).l), NULL,
db_str2op(&(obj->params->bool_op)));
+ }
//std::cout << bu_vls_addr(&obj_name) << ": " << obj->params->bool_op
<< "\n";
- (void)mk_addmember(bu_vls_addr(&obj_name), &(pcomb.l), NULL,
db_str2op(&(obj->params->bool_op)));
+ //(void)mk_addmember(bu_vls_addr(&obj_name), &(pcomb.l), NULL,
db_str2op(&(obj->params->bool_op)));
+ bu_vls_free(&obj_name);
}
+ bu_vls_free(&obj_comb_name);
// Free memory
for (unsigned int i = 0; i < BU_PTBL_LEN(subbreps); i++){
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
