--- ray/src/ot/obj2mesh.c	2003/03/12 04:59:04	2.2
+++ ray/src/ot/obj2mesh.c	2003/07/14 05:00:45	2.7
@@ -1,11 +1,12 @@
 #ifndef lint
-static const char RCSid[] = "$Id: obj2mesh.c,v 2.2 2003/03/12 04:59:04 greg Exp $";
+static const char RCSid[] = "$Id: obj2mesh.c,v 2.7 2003/07/14 05:00:45 greg 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;
@@ -52,10 +58,16 @@ char  *argv[];
 			error(USER, errmsg);
 			break;
 		}
+
+	if (i < argc-2)
+		error(USER, "too many file arguments");
 					/* 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 +77,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 +86,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 +99,7 @@ char  *argv[];
 
 	writemesh(ourmesh, stdout);	/* write mesh to output */
 	
-printmeshstats(ourmesh, stderr);
+	/* printmeshstats(ourmesh, stderr); */
 
 	quit(0);
 }