diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2010-06-14 19:22:33 -0600 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2010-06-14 19:22:33 -0600 |
| commit | de8a9632a6859010cc9d9bb4bcff721d640cdbd5 (patch) | |
| tree | 70969c63dcc7afe3751b1dbd026846fbe3680bf4 /libdimension | |
| parent | ee485871988b606966cd6779f818ef67067ef3f3 (diff) | |
| download | dimension-de8a9632a6859010cc9d9bb4bcff721d640cdbd5.tar.xz | |
Bulk-load CSG unions.
The old way made O(n) PR-trees for no particular reason.
Diffstat (limited to 'libdimension')
| -rw-r--r-- | libdimension/csg.c | 9 | ||||
| -rw-r--r-- | libdimension/dimension/csg.h | 2 |
2 files changed, 7 insertions, 4 deletions
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; diff --git a/libdimension/dimension/csg.h b/libdimension/dimension/csg.h index 383efb4..176467a 100644 --- a/libdimension/dimension/csg.h +++ b/libdimension/dimension/csg.h @@ -25,7 +25,7 @@ #ifndef DIMENSION_CSG_H #define DIMENSION_CSG_H -dmnsn_object *dmnsn_new_csg_union(dmnsn_object *A, dmnsn_object *B); +dmnsn_object *dmnsn_new_csg_union(dmnsn_array *objects); dmnsn_object *dmnsn_new_csg_intersection(dmnsn_object *A, dmnsn_object *B); dmnsn_object *dmnsn_new_csg_difference(dmnsn_object *A, dmnsn_object *B); dmnsn_object *dmnsn_new_csg_merge(dmnsn_object *A, dmnsn_object *B); |