csg 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784943c8c9eb32a649a7ba5e7a790a3d4259f1c3
-  data.tar.gz: 96875e39ffda6fdfc89abcc3996074f28d0488bc
+  metadata.gz: 032ae67480be4a8091aaceae652d8f7ba608c799
+  data.tar.gz: e9c632170b74ef2bc33a62f4f54f6a39be8176e2
 SHA512:
-  metadata.gz: 7809b5e3ae350514a021cd6ef5a1f675a18f09a842179ea159e6fff8186b6ef5d20ffb43f6098336604d1bef055b74f33a8caafe4b5e7882ea2d961b416267c4
-  data.tar.gz: 896000a3d67966e67ea9ac8e2a715f529415ac5d75c4374351d5e7e6d9f63f69b1b8f3dc7f8b94a61dc26c24febad555ab35683f2ecb66f8efe8b9cec956c3e9
+  metadata.gz: 59540582ac22f6e0beb5158c023e2e492ac470ca52e324c807d14869c1d1d8b00dbb8825d2b52ffdcd271aa553b263e918a4004e7af00a500bdfd75aeea32e00
+  data.tar.gz: e53ca53c28394c684e3647660350725a2db98cc4a232f652aa4d785ae8a0d9c3b23e35e0a3b725f69ee4fb53ccf4024b784aa76f5e25e67af35e25b9af5cf443

data/Makefile

@@ -8,7 +8,7 @@ SOURCES = $(wildcard $(ROOT)/src/*.c)
 OBJS = $(patsubst %.c,%.o,$(SOURCES))
 CPPFLAGS = $(OPTCPPFLAGS)
 LIBS = -lm $(OPTLIBS)
-CFLAGS = -g -std=c99 $(INCLUDE) -Wall -Werror $(OPTFLAGS)
+CFLAGS = -D_POSIX_C_SOURCE=200112L -g -std=c99 $(INCLUDE) -Wall -Werror $(OPTFLAGS)
 
 ifeq ($(shell uname),Darwin)
 LIB_TARGET = libcsg.dylib
@@ -42,6 +42,6 @@ libcsg: $(LIB_TARGET)
 
 loc:
 	@echo "=> Source:"
-	find src/ -name '*.[ch]' -not -name 'dbg.*' | xargs wc -l csgtool.c
+	find src/ -name '*.[ch]' -not -name 'dbg.*' -not -name 'klist.*' | xargs wc -l csgtool.c
 	@echo "=> Tests:"
 	find tests/ -name '*.[ch]' -not -path '*clar*' | xargs wc -l

data/src/reader.c

@@ -1,5 +1,6 @@
 #include "stl.h"
 #include "reader.h"
+#include "stl_mesh.h"
 
 // API
 mesh_t* reader_load(char *path) {

data/src/stl.c

@@ -1,5 +1,6 @@
 #include <ctype.h>
 #include <fcntl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -7,6 +8,7 @@
 #include "dbg.h"
 
 #include "stl.h"
+#include "util.h"
 
 void stl_free(stl_object *obj) {
 		if(obj == NULL) return;
@@ -72,61 +74,7 @@ error:
 		exit(-1);
 }
 
-/*
- * Allocate, read, and return a anull terminated string from `fd'.
- * Return NULL in caes of error
- */
-char* read_line(int fd, int downcase, int trim) {
-		const size_t max_line = 100;
-		char *buffer = calloc(max_line + 1, sizeof(char));
-		int rc = -1;
-		check_mem(buffer);
-
-		rc = read(fd, buffer, max_line);
-		check(rc != -1, "Failed to read.");
-
-		char *ret = NULL;
-		while((ret = strchr(buffer, '\r'))) {
-				*ret = ' ';
-		}
-
-		char *newline = strchr(buffer, '\n');
-		if(newline != NULL) *newline = '\0';
-
-		if((strlen(buffer) == 0) && (rc == 0)) goto eof;
-
-		rc = lseek(fd, -(rc - strlen(buffer) - 1), SEEK_CUR);
-		check(rc != -1, "Failed to seek.");
-
-		if(trim) {
-				char *new = NULL;
-				int start = 0;
-				int end = strlen(buffer) ;
-				while(isspace(buffer[start++]));
-				while(isspace(buffer[--end]));
-				if(start > 0) start--;
-				buffer[++end] = '\0';
-				check_mem((new = calloc(strlen(buffer + start) + 1, 1)));
-				memcpy(new, buffer + start, end - start);
-				free(buffer);
-				buffer = new;
-		}
-
-		if(downcase) {
-				for(int i = 0; i < strlen(buffer); i++) {
-						buffer[i] = tolower(buffer[i]);
-				}
-		}
-
-
-		return buffer;
-eof:
-error:
-		if(buffer) free(buffer);
-		return NULL;
-}
-
-stl_facet *stl_read_text_facet(const char *declaration, int fd) {
+stl_facet *stl_read_text_facet(const char *declaration, FILE *f) {
 		stl_facet *facet = (stl_facet*)calloc(1, sizeof(stl_facet));
 		int rc = -1;
 		char *line = NULL;
@@ -135,11 +83,11 @@ stl_facet *stl_read_text_facet(const char *declaration, int fd) {
 		rc = sscanf(declaration, "facet normal %f %f %f", &facet->normal[0], &facet->normal[1], &facet->normal[2]);
 		check(rc == 3, "stl_Read_text_facet(%s): Normal line malformed", declaration);
 
-		check((line = read_line(fd, 1, 1)), "Malformed facet, no line follows valid normal declaration");
+		check((line = next_line(f, true, true)), "Malformed facet, no line follows valid normal declaration");
 		check(strcmp(line, "outer loop") == 0, "Malformed facet, no loop declaration following valid normal.");
 
 		for(int i = 0; i < 3; i++) {
-				check((line = read_line(fd, 1, 1)), "Failed to read vertex %d", i);
+				check((line = next_line(f, true, true)), "Failed to read vertex %d", i);
 				rc = sscanf(line, "vertex %f %f %f", &facet->vertices[i][0], &facet->vertices[i][1], &facet->vertices[i][2]);
 				check(rc == 3, "Vertex declaration [%s] did not contain (x, y, z) point.", line);
 
@@ -147,10 +95,10 @@ stl_facet *stl_read_text_facet(const char *declaration, int fd) {
 				line = NULL;
 		}
 
-		check((line = read_line(fd, 1, 1)), "No line following vertex declarations.");
+		check((line = next_line(f, true, true)), "No line following vertex declarations.");
 		check(strcmp(line, "endloop") == 0, "Vertex declarations not followed by 'endloop'. Got: '%s'", line);
 		free(line);
-		check((line = read_line(fd, 1, 1)), "No line following endloop.");
+		check((line = next_line(f, true, true)), "No line following endloop.");
 		check(strcmp(line, "endfacet") == 0, "endloop not followed by 'endfacet'");
 		free(line);
 		line = NULL;
@@ -163,48 +111,62 @@ error:
 }
 
 stl_object *stl_read_text_object(int fd) {
-		stl_object *obj = NULL;
-		char *line = read_line(fd, 0, 1);
-		klist_t(stl_facet) *facets = kl_init(stl_facet);
+	FILE *f = NULL;
+	stl_object *obj = NULL;
+	char *line = NULL;
+	klist_t(stl_facet) *facets = NULL;
+
+	check((f = fdopen(fd, "r")) != NULL, "Failed to open fd(%d) as FILE", fd);
+	check((facets = kl_init(stl_facet)) != NULL, "Failed to create facel list.");
+
+	// Read first non-blank-line
+	line = next_line(f, false, true);
+
+	check(line != NULL, "Failed to read STL/ASCII header.");
+	check((obj = stl_alloc(NULL, 0)), "Failed to allocated new STL object.");
+	snprintf(obj->header, sizeof(obj->header), "[STL/ASCII]: '%s'", line);
+	// debug("Header: [%s]", obj->header);
+	free(line);
+
+	size_t lines = 0;
+	while((line = read_line(f, true, true))) {
+		lines++;
+
+		// Skip blanks
+		if(strlen(line) == 0) {
+			free(line);
+			continue;
+		}
 
-		check(line != NULL, "Failed to read STL/ASCII header.");
-		check((obj = stl_alloc(NULL, 0)), "Failed to allocated new STL object.");
-		snprintf(obj->header, sizeof(obj->header), "[STL/ASCII]: '%s'", line);
-		log_info("Header: [%s]", obj->header);
-		free(line);
+		if(strncmp(line, "facet", strlen("facet")) == 0) {
+			stl_facet *facet = stl_read_text_facet(line, f);
+			check(facet != NULL, "Failed to read facet on line %zd", lines);
+			*kl_pushp(stl_facet, facets) = facet;
+		}
+		else if(strncmp(line, "endsolid", strlen("endfacet")) == 0) {
+			check(facets->size > 0, "No facets loaded.");
+			// debug("ASCII solid ended. Loaded %zd facets", facets->size);
 
-		size_t lines = 0;
-		while((line = read_line(fd, 1, 1))) {
-				lines++;
-				if(strncmp(line, "facet", strlen("facet")) == 0) {
-						stl_facet *facet = stl_read_text_facet(line, fd);
-						check(facet != NULL, "Failed to read facet on line %zd", lines);
-						*kl_pushp(stl_facet, facets) = facet;
-				}
-				else if(strncmp(line, "endsolid", strlen("endfacet")) == 0) {
-						check(facets->size > 0, "No facets loaded.");
-						log_info("ASCII solid ended. Loaded %zd facets", facets->size);
-
-						obj->facet_count = facets->size;
-						obj->facets = calloc(facets->size, sizeof(stl_facet));
-						check_mem(obj->facets);
-
-						stl_facet *facet = NULL;
-						for(int i = 0; kl_shift(stl_facet, facets, &facet) != -1; i++) {
-								obj->facets[i] = *facet;
-						}
-				}
-				else {
-						sentinel("Unexpected line[%zd]: '%s'", lines, line);
-				}
-				free(line);
+			obj->facet_count = facets->size;
+			obj->facets = calloc(facets->size, sizeof(stl_facet));
+			check_mem(obj->facets);
+
+			stl_facet *facet = NULL;
+			for(int i = 0; kl_shift(stl_facet, facets, &facet) != -1; i++) {
+				obj->facets[i] = *facet;
+			}
+		}
+		else {
+			sentinel("Unexpected line[%zd]: '%s'", lines, line);
 		}
+		free(line);
+	}
 
-		kl_destroy(stl_facet, facets);
-		return obj;
+	kl_destroy(stl_facet, facets);
+	return obj;
 error:
-		kl_destroy(stl_facet, facets);
-		return NULL;
+	kl_destroy(stl_facet, facets);
+	return NULL;
 }
 
 stl_object *stl_read_object(int fd) {
@@ -244,6 +206,7 @@ stl_object *stl_read_file(char *path, int recompute_normals) {
 		check((fd = open(path, O_RDONLY)) != -1, "Unable to open '%s'", path);
 
 		obj = reader(fd);
+		check(obj != NULL, "Failed to read STL from %s", path);
 
 		char buffer[10];
 		int rc = read(fd, buffer, sizeof(buffer));
@@ -330,56 +293,3 @@ error:
 		if(fd != -1) close(fd);
 		return NULL;
 }
-
-// Mesh type prototype methods
-int stl_mesh_init(void *self, void *data) {
-	stl_mesh_t *mesh = (stl_mesh_t*)self;
-	if(data == NULL) {
-		check_mem(mesh->stl = stl_alloc(NULL, 0));
-	}
-	else {
-		mesh->stl = (stl_object*)data;
-	}
-	return 0;
-error:
-	return -1;
-}
-
-void stl_mesh_destroy(void *self) {
-	stl_mesh_t *mesh = (stl_mesh_t*)self;
-	stl_free(mesh->stl);
-	free(self);
-}
-
-int stl_mesh_poly_count(void *self) {
-	stl_mesh_t *mesh = (stl_mesh_t*)self;
-	return mesh->stl->facet_count;
-}
-
-klist_t(poly)* stl_mesh_to_polygons(void *self) {
-	stl_mesh_t *mesh = (stl_mesh_t*)self;
-	int count = mesh->_(poly_count)(mesh);
-	klist_t(poly)* polys = kl_init(poly);
-
-	for(int i = 0; i < count; i++) {
-		poly_t *poly = poly_make_triangle(mesh->stl->facets[i].vertices[0],
-										  mesh->stl->facets[i].vertices[1],
-										  mesh->stl->facets[i].vertices[2]);
-		check_mem(poly);
-		*kl_pushp(poly, polys) = poly;
-	}
-
-
-	return polys;
-error:
-	if(polys != NULL) kl_destroy(poly, polys);
-	return NULL;
-}
-
-// Mesh type definitions
-mesh_t stl_mesh_t_Proto = {
-	.init = stl_mesh_init,
-	.destroy = stl_mesh_destroy,
-	.poly_count = stl_mesh_poly_count,
-	.to_polygons = stl_mesh_to_polygons
-};

data/src/stl.h

@@ -42,7 +42,7 @@ stl_facet *stl_read_facet(int fd);
 stl_object *stl_read_object(int fd);
 
 // Text file readers
-stl_facet *stl_read_text_facet(const char *declaration, int fd);
+stl_facet *stl_read_text_facet(const char *declaration, FILE *f);
 stl_object *stl_read_text_object(int fd);
 
 // Binary file writers
@@ -56,12 +56,6 @@ KLIST_INIT(stl_object, stl_object*, mp_stl_free)
 #define mp_std_free(x) free(kl_val(x))
 KLIST_INIT(stl_facet, stl_facet*, mp_std_free)
 
-// mesh_t type and prototype
-extern mesh_t stl_mesh_t_Proto;
 
-typedef struct s_stl_mesh_t {
-	mesh_t proto;
-	stl_object *stl;
-} stl_mesh_t;
 
 #endif

data/src/stl_mesh.c

@@ -0,0 +1,54 @@
+#include "stl_mesh.h"
+
+// Mesh type prototype methods
+int stl_mesh_init(void *self, void *data) {
+	stl_mesh_t *mesh = (stl_mesh_t*)self;
+	if(data == NULL) {
+		check_mem(mesh->stl = stl_alloc(NULL, 0));
+	}
+	else {
+		mesh->stl = (stl_object*)data;
+	}
+	return 0;
+error:
+	return -1;
+}
+
+void stl_mesh_destroy(void *self) {
+	stl_mesh_t *mesh = (stl_mesh_t*)self;
+	stl_free(mesh->stl);
+	free(self);
+}
+
+int stl_mesh_poly_count(void *self) {
+	stl_mesh_t *mesh = (stl_mesh_t*)self;
+	return mesh->stl->facet_count;
+}
+
+klist_t(poly)* stl_mesh_to_polygons(void *self) {
+	stl_mesh_t *mesh = (stl_mesh_t*)self;
+	int count = mesh->_(poly_count)(mesh);
+	klist_t(poly)* polys = kl_init(poly);
+
+	for(int i = 0; i < count; i++) {
+		poly_t *poly = poly_make_triangle(mesh->stl->facets[i].vertices[0],
+										  mesh->stl->facets[i].vertices[1],
+										  mesh->stl->facets[i].vertices[2]);
+		check_mem(poly);
+		*kl_pushp(poly, polys) = poly;
+	}
+
+
+	return polys;
+error:
+	if(polys != NULL) kl_destroy(poly, polys);
+	return NULL;
+}
+
+// Mesh type definitions
+mesh_t stl_mesh_t_Proto = {
+	.init = stl_mesh_init,
+	.destroy = stl_mesh_destroy,
+	.poly_count = stl_mesh_poly_count,
+	.to_polygons = stl_mesh_to_polygons
+};

data/src/stl_mesh.h

@@ -0,0 +1,15 @@
+#include "stl.h"
+#include "mesh.h"
+
+#ifndef __STL_MESH_H
+#define __STL_MESH_H
+
+// mesh_t type and prototype
+extern mesh_t stl_mesh_t_Proto;
+
+typedef struct s_stl_mesh_t {
+	mesh_t proto;
+	stl_object *stl;
+} stl_mesh_t;
+
+#endif

data/src/util.c

@@ -0,0 +1,149 @@
+#include "ctype.h"
+
+#include "util.h"
+
+char *str_dup(char *str) {
+	char *copy_str = NULL;
+	check_mem(copy_str = calloc(strlen(str) + 1, sizeof(char)));
+	strncpy(copy_str, str, strlen(str));
+	return copy_str;
+error:
+	return NULL;
+}
+
+char *str_ltrim(char *str, bool copy) {
+	if(!copy) {
+		// Find the first non-space char in the string
+		char *start = str;
+		while(*start && isspace(*start)) {
+			start++;
+		}
+
+		// Do nothing if the string starts on a sane char
+		if(start != str) {
+			// Shift the string and NULL-cap it if we found a subset
+			// otherwise NULL the head of the string
+			if((start - str) != strlen(str)) {
+				memmove(str, start, strlen(start));
+				str[strlen(start)] = '\0';
+			}
+			else {
+				str[0] = '\0';
+			}
+		}
+		return str;
+	}
+	else {
+		char *copy_str = NULL;
+		check_mem(copy_str = str_dup(str));
+		return str_ltrim(copy_str, false);
+	}
+error:
+	return NULL;
+}
+
+char *str_rtrim(char *str, bool copy) {
+	if(!copy) {
+		char *end = str + strlen(str) - 1;
+		while((end > str) && isspace(*end)) {
+			*end-- = '\0';
+		}
+		return str;
+	}
+	else {
+		char *copy_str = NULL;
+		check_mem(copy_str = str_dup(str));
+		return str_ltrim(copy_str, false);
+	}
+error:
+	return NULL;
+}
+
+char *str_trim(char *str, bool copy) {
+	char *trim_str = copy ? str_dup(str) : str;
+	check_mem(trim_str);
+
+	// Since we have already made a copy if we need one,
+	// we can just chain these two together, since non-copy
+	// operations can't throw out a NULL and the pointer itself
+	// cannot change.
+	return str_ltrim(str_rtrim(trim_str, false), false);
+error:
+	return NULL;
+}
+
+char *read_line(FILE *f, bool downcase, bool trim) {
+	char read_buffer[512] = {0};
+	char *line = NULL;
+	char *rc = NULL;
+
+	// Sanity check the stream before we go on,
+	// an EOF here is not fatal, so we'll return early
+	// instead of jumping into the error machinery.
+	if(feof(f) != 0) return NULL;
+	check(ferror(f) == 0, "Error in stream(%p).", f);
+
+	// Try reading, with the hope that we get the entire line at once.
+	// Short circuit EOF, so we don't emit noise if we can avoid it.
+	rc = fgets(read_buffer, sizeof(read_buffer), f);
+	if((rc == NULL) && feof(f)) return NULL;
+
+	check_debug(rc != NULL, "Failed to read line from FILE(%p)", f);
+	check_mem(line = calloc(strlen(read_buffer) + 1, sizeof(char)));
+	strncpy(line, read_buffer, strlen(read_buffer));
+
+	// See if we need to finish reading the line
+	while(line[strlen(line) - 1] != '\n') {
+		rc = fgets(read_buffer, sizeof(read_buffer), f);
+		if((rc == NULL) && feof(f)) {
+			// We got everything that we can get, so we'll
+			// call it a "line"
+			break;
+		}
+		else {
+			// Append the new data to the end of the line
+			char *new_line = NULL;
+			check(rc != NULL, "Error finishing line from FILE(%p)", f);
+			check_mem(new_line = calloc(strlen(line) + strlen(read_buffer) + 1, sizeof(char)));
+
+			strncpy(new_line, line, strlen(line));
+			strncpy(new_line + strlen(new_line), read_buffer, strlen(read_buffer));
+
+			free(line);
+			line = new_line;
+		}
+	}
+
+	// Post processing
+	if((line != NULL) && (strlen(line) > 0)) {
+		if(trim == true) {
+			line = str_trim(line, false);
+		}
+
+		if(downcase == true) {
+			for(int i = 0; i < strlen(line); i++) {
+				line[i] = tolower(line[i]);
+			}
+		}
+	}
+
+	return line;
+error:
+	if(line != NULL) free(line);
+	if(feof(f)) debug("FILE(%p) EOF", f);
+	if(ferror(f)) debug("FILE(%p): ERROR. %s", f, clean_errno());
+	return NULL;
+}
+
+char *next_line(FILE *f, bool downcase, bool trim) {
+	char *line = NULL;
+
+	// Read lines until we get one that isn't blank,
+	while(((line = read_line(f, downcase, trim)) != NULL) &&
+		  (strlen(line) == 0)) {
+		free(line);
+		line = NULL;
+	}
+
+	return line;
+}

data/src/util.h

@@ -0,0 +1,27 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "dbg.h"
+
+#ifndef __UTIL_H
+#define __UTIL_H
+
+
+char *str_dup(char *str);
+
+char *str_ltrim(char *str, bool copy);
+char *str_rtrim(char *str, bool copy);
+char *str_trim(char *str, bool copy);
+
+/*
+ * Allocate, read, and return a '\0' terminated string from `fd'.
+ * Return NULL in caes of error
+ */
+char *read_line(FILE *f, bool downcase, bool trim);
+
+// Call `read_line` until we don't get blank lines
+// Gets the "next" non-blank line
+char *next_line(FILE *f, bool downcase, bool trim);
+
+#endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Yaroslav Shirokov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -44,6 +44,8 @@ files:
 - src/poly.c
 - src/reader.c
 - src/stl.c
+- src/stl_mesh.c
+- src/util.c
 - src/vector.c
 - src/bsp.h
 - src/bsp_mesh.h
@@ -55,6 +57,8 @@ files:
 - src/poly.h
 - src/reader.h
 - src/stl.h
+- src/stl_mesh.h
+- src/util.h
 - src/vector.h
 - ext/Rakefile
 homepage: https://github.com/sshirokov/csgtool/