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 /dimension/realize.c | |
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 'dimension/realize.c')
-rw-r--r-- | dimension/realize.c | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/dimension/realize.c b/dimension/realize.c index 711090b..e558c5b 100644 --- a/dimension/realize.c +++ b/dimension/realize.c @@ -854,6 +854,39 @@ dmnsn_realize_plane(dmnsn_astnode astnode) return plane; } +/* Bulk-load a union */ +static dmnsn_object * +dmnsn_realize_union(dmnsn_astnode astnode, dmnsn_array *lights) +{ + dmnsn_assert(astnode.type == DMNSN_AST_UNION, "Expected a union."); + + dmnsn_astnode objects, modifiers; + dmnsn_array_get(astnode.children, 0, &objects); + dmnsn_array_get(astnode.children, 1, &modifiers); + + dmnsn_array *children = dmnsn_new_array(sizeof(dmnsn_object *)); + DMNSN_ARRAY_FOREACH (dmnsn_astnode *, onode, objects.children) { + if (onode->type == DMNSN_AST_LIGHT_SOURCE) { + dmnsn_light *light = dmnsn_realize_light_source(*onode); + dmnsn_realize_light_source_modifiers(modifiers, light); + dmnsn_array_push(lights, &light); + } else { + dmnsn_object *object = dmnsn_realize_object(*onode, lights); + if (object) + dmnsn_array_push(children, &object); + } + } + + dmnsn_object *csg = NULL; + if (dmnsn_array_size(children) > 0) { + csg = dmnsn_new_csg_union(children); + dmnsn_realize_object_modifiers(modifiers, csg); + } + + dmnsn_delete_array(children); + return csg; +} + typedef dmnsn_object *dmnsn_csg_object_fn(dmnsn_object *a, dmnsn_object *b); /* Generalized CSG realizer */ @@ -901,13 +934,6 @@ dmnsn_realize_csg(dmnsn_astnode astnode, dmnsn_array *lights, } static dmnsn_object * -dmnsn_realize_union(dmnsn_astnode astnode, dmnsn_array *lights) -{ - dmnsn_assert(astnode.type == DMNSN_AST_UNION, "Expected a union."); - return dmnsn_realize_csg(astnode, lights, &dmnsn_new_csg_union); -} - -static dmnsn_object * dmnsn_realize_intersection(dmnsn_astnode astnode, dmnsn_array *lights) { dmnsn_assert(astnode.type == DMNSN_AST_INTERSECTION, |