--- ray/src/ot/obj2mesh.c	2003/03/11 17:08:55	2.1
+++ ray/src/ot/obj2mesh.c	2003/06/08 12:03:10	2.6
@@ -1,11 +1,12 @@
 #ifndef lint
-static const char RCSid[] = "$Id: obj2mesh.c,v 2.1 2003/03/11 17:08:55 greg Exp $";
+static const char RCSid[] = "$Id: obj2mesh.c,v 2.6 2003/06/08 12:03:10 schorsch Exp $";
 #endif
 /*
  *  Main program to compile a Wavefront .OBJ file into a Radiance mesh
  */
 
 #include "copyright.h"
+#include "platform.h"
 #include "standard.h"
 #include "cvmesh.h"
 #include "otypes.h"
@@ -31,7 +32,9 @@ main(argc, argv)		/* compile a .OBJ file into a mesh *
 int  argc;
 char  *argv[];
 {
-	int  i;
+	int  nmatf = 0;
+	char  *matinp[32];
+	int  i, j;
 
 	progname = argv[0];
 	ofun[OBJ_FACE].funp = o_face;
@@ -44,6 +47,9 @@ char  *argv[];
 		case 'r':				/* resolution limit */
 			resolu = atoi(argv[++i]);
 			break;
+		case 'a':				/* material file */
+			matinp[nmatf++] = argv[++i];
+			break;
 		case 'w':				/* supress warnings */
 			nowarn = 1;
 			break;
@@ -54,8 +60,11 @@ char  *argv[];
 		}
 					/* initialize mesh */
 	cvinit(i==argc-2 ? argv[i+1] : "<stdout>");
-
-	if (i == argc)			/* read .OBJ file into triangles */
+					/* load material input */
+	for (j = 0; j < nmatf; j++)
+		readobj(matinp[j]);
+					/* read .OBJ file into triangles */
+	if (i == argc)
 		wfreadobj(NULL);
 	else
 		wfreadobj(argv[i]);
@@ -65,9 +74,7 @@ char  *argv[];
 	if (i == argc-2)		/* open output file */
 		if (freopen(argv[i+1], "w", stdout) == NULL)
 			error(SYSTEM, "cannot open output file");
-#ifdef MSDOS
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_FILE_BINARY(stdout);
 	newheader("RADIANCE", stdout);	/* new binary file header */
 	printargs(i<argc ? i+1 : argc, argv, stdout);
 	fputformat(MESHFMT, stdout);
@@ -76,7 +83,8 @@ char  *argv[];
 	mincusize = ourmesh->mcube.cusize / resolu - FTINY;
 
 	for (i = 0; i < nobjects; i++)	/* add triangles to octree */
-		addface(&ourmesh->mcube, i);
+		if (objptr(i)->otype == OBJ_FACE)
+			addface(&ourmesh->mcube, i);
 
 					/* optimize octree */
 	ourmesh->mcube.cutree = combine(ourmesh->mcube.cutree);
@@ -88,7 +96,7 @@ char  *argv[];
 
 	writemesh(ourmesh, stdout);	/* write mesh to output */
 	
-printmeshstats(ourmesh, stderr);
+	/* printmeshstats(ourmesh, stderr); */
 
 	quit(0);
 }
@@ -138,16 +146,13 @@ addface(cu, obj)			/* add a face to a cube */
 register CUBE  *cu;
 OBJECT	obj;
 {
-	CUBE  cukid;
-	OCTREE	ot;
-	OBJECT	oset[MAXSET+1];
-	register int  i, j;
 
 	if (o_face(objptr(obj), cu) == O_MISS)
 		return;
 
 	if (istree(cu->cutree)) {
-						/* do children */
+		CUBE  cukid;			/* do children */
+		int  i, j;
 		cukid.cusize = cu->cusize * 0.5;
 		for (i = 0; i < 8; i++) {
 			cukid.cutree = octkid(cu->cutree, i);
@@ -162,19 +167,32 @@ OBJECT	obj;
 		return;
 	}
 	if (isempty(cu->cutree)) {
-						/* singular set */
+		OBJECT	oset[2];		/* singular set */
 		oset[0] = 1; oset[1] = obj;
 		cu->cutree = fullnode(oset);
 		return;
 	}
 					/* add to full node */
+	add2full(cu, obj);
+}
+
+
+add2full(cu, obj)			/* add object to full node */
+register CUBE  *cu;
+OBJECT	obj;
+{
+	OCTREE	ot;
+	OBJECT	oset[MAXSET+1];
+	CUBE  cukid;
+	register int  i, j;
+
 	objset(oset, cu->cutree);
 	cukid.cusize = cu->cusize * 0.5;
 
 	if (oset[0] < objlim || cukid.cusize < mincusize) {
 						/* add to set */
 		if (oset[0] >= MAXSET) {
-			sprintf(errmsg, "set overflow in addface (%s)",
+			sprintf(errmsg, "set overflow in addobject (%s)",
 					objptr(obj)->oname);
 			error(INTERNAL, errmsg);
 		}