csg 0.0.0 → 0.0.1

data/src/bsp.c

@@ -307,7 +307,8 @@ klist_t(poly) *bsp_clip_polygon_array(bsp_node_t *node, poly_t **polygons, size_
 	poly_t *p = NULL;
 	int rc = -1;
 
-	poly_t **poly_buffer = NULL;
+	poly_t *static_poly_buffer[STATIC_POLY_BUFFER_SIZE];
+	poly_t **poly_buffer = static_poly_buffer;
 	poly_t **front_array = NULL;
 	poly_t **back_array = NULL;
 	int n_front = 0;
@@ -317,7 +318,9 @@ klist_t(poly) *bsp_clip_polygon_array(bsp_node_t *node, poly_t **polygons, size_
 	if(n_polys == 0) return result;
 
 	if(node->divider != NULL) {
-		check_mem(poly_buffer = malloc((sizeof(poly_t*) * n_polys) * 2));
+		if((n_polys * 2) > STATIC_POLY_BUFFER_SIZE) {
+			check_mem(poly_buffer = malloc((sizeof(poly_t*) * n_polys) * 2));
+		}
 		front_array = poly_buffer;
 		back_array = poly_buffer + n_polys;
 		// Sort this node's polygons into the front or back
@@ -350,7 +353,7 @@ klist_t(poly) *bsp_clip_polygon_array(bsp_node_t *node, poly_t **polygons, size_
 			check(result != NULL, "Failed to clip back tree");
 		}
 
-		if(poly_buffer) free(poly_buffer);
+		if(poly_buffer != static_poly_buffer) free(poly_buffer);
 		// Clean up the result halves, now that they're copied into `result`
 	}
 	else {
@@ -363,7 +366,7 @@ klist_t(poly) *bsp_clip_polygon_array(bsp_node_t *node, poly_t **polygons, size_
 
 	return result;
 error:
-	if(poly_buffer) free(poly_buffer);
+	if(poly_buffer != static_poly_buffer) free(poly_buffer);
 	if(result) kl_destroy(poly, result);
 	return NULL;
 }
@@ -374,7 +377,8 @@ klist_t(poly) *bsp_clip_polygons(bsp_node_t *node, klist_t(poly) *polygons, klis
 	poly_t *p = NULL;
 	int rc = -1;
 
-	poly_t **poly_buffer = NULL;
+	poly_t *static_poly_buffer[STATIC_POLY_BUFFER_SIZE];
+	poly_t **poly_buffer = static_poly_buffer;
 	poly_t **front_array = NULL;
 	poly_t **back_array = NULL;
 	int n_front = 0;
@@ -384,7 +388,9 @@ klist_t(poly) *bsp_clip_polygons(bsp_node_t *node, klist_t(poly) *polygons, klis
 	if(polygons->size == 0) return result;
 
 	if(node->divider != NULL) {
-		check_mem(poly_buffer = malloc(sizeof(poly_t*) * polygons->size * 2));
+		if((polygons->size * 2) > STATIC_POLY_BUFFER_SIZE) {
+			check_mem(poly_buffer = malloc(sizeof(poly_t*) * polygons->size * 2));
+		}
 		front_array = poly_buffer;
 		back_array = poly_buffer + polygons->size;
 		// Sort this node's polygons into the front or back
@@ -416,7 +422,7 @@ klist_t(poly) *bsp_clip_polygons(bsp_node_t *node, klist_t(poly) *polygons, klis
 			check(result != NULL, "Failed to clip back tree");
 		}
 
-		if(poly_buffer) free(poly_buffer);
+		if(poly_buffer != static_poly_buffer) free(poly_buffer);
 		// Clean up the result halves, now that they're copied into `result`
 	}
 	else {
@@ -429,7 +435,7 @@ klist_t(poly) *bsp_clip_polygons(bsp_node_t *node, klist_t(poly) *polygons, klis
 
 	return result;
 error:
-	if(poly_buffer) free(poly_buffer);
+	if(poly_buffer != static_poly_buffer) free(poly_buffer);
 	if(result) kl_destroy(poly, result);
 	return NULL;
 }

data/src/bsp.h

@@ -4,6 +4,17 @@
 #ifndef __BSP_H
 #define __BSP_H
 
+// This many polygon pointers are allocated
+// on the stack during bsp_clip_polygons and bsp_clip_polygon_array
+// Only when more than this is requested do we reach
+// into the heap for more polygon pointers.
+// Setting this to zero disables the optimization.
+// Exceptionally large values will limit the recursion
+// limit.
+#ifndef STATIC_POLY_BUFFER_SIZE
+#define STATIC_POLY_BUFFER_SIZE 200
+#endif
+
 typedef struct s_bsp_node {
 	klist_t(poly) *polygons;
 	poly_t *divider;

data/src/export.c

@@ -26,7 +26,6 @@ stl_object *bsp_to_stl(bsp_node_t *tree) {
 
 	polys = bsp_to_polygons(tree, 1, NULL);
 	check(polys != NULL, "Failed to generate polygons from bsp_node_t(%p)", tree);
-	check(polys->size > 0, "No polygons returned from tree(%p)", tree);
 
 	stl = stl_from_polys(polys);
 	check(stl != NULL, "Failed to build stl from %zd polygons", polys->size);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csg
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi