From de8a9632a6859010cc9d9bb4bcff721d640cdbd5 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 14 Jun 2010 19:22:33 -0600 Subject: Bulk-load CSG unions. The old way made O(n) PR-trees for no particular reason. --- libdimension/csg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libdimension/csg.c') diff --git a/libdimension/csg.c b/libdimension/csg.c index 02c4d37..b48c2fa 100644 --- a/libdimension/csg.c +++ b/libdimension/csg.c @@ -76,13 +76,16 @@ dmnsn_csg_union_free_fn(void *ptr) dmnsn_delete_prtree(ptr); } +/* Bulk-load a union */ dmnsn_object * -dmnsn_new_csg_union(dmnsn_object *A, dmnsn_object *B) +dmnsn_new_csg_union(dmnsn_array *objects) { dmnsn_object *csg = dmnsn_new_object(); - dmnsn_array_push(csg->children, &A); - dmnsn_array_push(csg->children, &B); + DMNSN_ARRAY_FOREACH (dmnsn_object **, object, objects) { + dmnsn_array_push(csg->children, object); + } + csg->intersection_fn = &dmnsn_csg_union_intersection_fn; csg->inside_fn = &dmnsn_csg_union_inside_fn; csg->init_fn = &dmnsn_csg_union_init_fn; -- cgit v1.2.3