--- ray/src/cv/mgf2rad.c	1994/07/21 15:04:23	2.9
+++ ray/src/cv/mgf2rad.c	1995/04/14 10:47:50	2.15
@@ -23,6 +23,8 @@ double	glowdist = FHUGE;		/* glow test distance */
 
 double  emult = 1.;			/* emitter multiplier */
 
+FILE	*matfp = stdout;		/* material output file */
+
 int	r_comment(), r_cone(), r_cyl(), r_face(), r_ies(), r_ring(), r_sph();
 char	*material(), *object(), *addarg();
 
@@ -39,10 +41,12 @@ char	*argv[];
 	mg_ehand[MG_E_CMIX] = c_hcolor;
 	mg_ehand[MG_E_CSPEC] = c_hcolor;
 	mg_ehand[MG_E_CXY] = c_hcolor;
+	mg_ehand[MG_E_CCT] = c_hcolor;
 	mg_ehand[MG_E_CYL] = r_cyl;
 	mg_ehand[MG_E_ED] = c_hmaterial;
 	mg_ehand[MG_E_FACE] = r_face;
 	mg_ehand[MG_E_IES] = r_ies;
+	mg_ehand[MG_E_IR] = c_hmaterial;
 	mg_ehand[MG_E_MATERIAL] = c_hmaterial;
 	mg_ehand[MG_E_NORMAL] = c_hvertex;
 	mg_ehand[MG_E_OBJECT] = obj_handler;
@@ -63,17 +67,25 @@ char	*argv[];
 		printf(" %s", argv[i]);
 		switch (argv[i][1]) {
 		case 'g':			/* glow distance (meters) */
-			if (argv[i][2] || badarg(argc-i, argv+i, "f"))
+			if (argv[i][2] || badarg(argc-i-1, argv+i+1, "f"))
 				goto userr;
 			glowdist = atof(argv[++i]);
 			printf(" %s", argv[i]);
 			break;
 		case 'e':			/* emitter multiplier */
-			if (argv[i][2] || badarg(argc-i, argv+i, "f"))
+			if (argv[i][2] || badarg(argc-i-1, argv+i+1, "f"))
 				goto userr;
 			emult = atof(argv[++i]);
 			printf(" %s", argv[i]);
 			break;
+		case 'm':			/* materials file */
+			matfp = fopen(argv[++i], "a");
+			if (matfp == NULL) {
+				fprintf(stderr, "%s: cannot append\n", argv[i]);
+				exit(1);
+			}
+			printf(" %s", argv[i]);
+			break;
 		default:
 			goto userr;
 		}
@@ -91,7 +103,7 @@ char	*argv[];
 		}
 	exit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-g dist][-m mult] [file.mgf] ..\n",
+	fprintf(stderr, "Usage: %s [-g dist][-e mult][-m matf] [file.mgf] ..\n",
 			argv[0]);
 	exit(1);
 }
@@ -304,12 +316,13 @@ char	**av;
 }
 
 
+int
 r_ies(ac, av)				/* convert an IES luminaire file */
 int	ac;
 char	**av;
 {
 	int	xa0 = 2;
-	char	combuf[72];
+	char	combuf[128];
 	char	fname[48];
 	char	*oname;
 	register char	*op;
@@ -318,17 +331,23 @@ char	**av;
 	if (ac < 2)
 		return(MG_EARGC);
 	(void)strcpy(combuf, "ies2rad");
-	op = combuf + 7;
+	op = combuf + 7;		/* get -m option (must be first) */
 	if (ac-xa0 >= 2 && !strcmp(av[xa0], "-m")) {
 		if (!isflt(av[xa0+1]))
 			return(MG_ETYPE);
 		op = addarg(addarg(op, "-m"), av[xa0+1]);
 		xa0 += 2;
 	}
-	if (access(av[1], 0) == -1)
+	*op++ = ' ';			/* build IES filename */
+	i = 0;
+	if (mg_file != NULL &&
+			(oname = strrchr(mg_file->fname, '/')) != NULL) {
+		i = oname - mg_file->fname + 1;
+		(void)strcpy(op, mg_file->fname);
+	}
+	(void)strcpy(op+i, av[1]);
+	if (access(op, 0) == -1)
 		return(MG_ENOFILE);
-	*op++ = ' ';			/* IES filename goes last */
-	(void)strcpy(op, av[1]);
 	system(combuf);			/* run ies2rad */
 					/* now let's find the output file */
 	if ((op = strrchr(av[1], '/')) == NULL)
@@ -417,15 +436,15 @@ material()			/* get (and print) current material */
 	c_cmaterial->clock = 0;
 	if (c_cmaterial->ed > .1) {	/* emitter */
 		cvtcolor(radrgb, &c_cmaterial->ed_c,
-				emult*c_cmaterial->ed/WHTEFFICACY);
+				emult*c_cmaterial->ed/(PI*WHTEFFICACY));
 		if (glowdist < FHUGE) {		/* do a glow */
-			printf("\nvoid glow %s\n0\n0\n", mname);
-			printf("4 %f %f %f %f\n", colval(radrgb,RED),
+			fprintf(matfp, "\nvoid glow %s\n0\n0\n", mname);
+			fprintf(matfp, "4 %f %f %f %f\n", colval(radrgb,RED),
 					colval(radrgb,GRN),
 					colval(radrgb,BLU), glowdist);
 		} else {
-			printf("\nvoid light %s\n0\n0\n", mname);
-			printf("3 %f %f %f\n", colval(radrgb,RED),
+			fprintf(matfp, "\nvoid light %s\n0\n0\n", mname);
+			fprintf(matfp, "3 %f %f %f\n", colval(radrgb,RED),
 					colval(radrgb,GRN),
 					colval(radrgb,BLU));
 		}
@@ -435,6 +454,33 @@ material()			/* get (and print) current material */
 			c_cmaterial->rs + c_cmaterial->ts;
 	if (d < 0. | d > 1.)
 		return(NULL);
+					/* check for glass/dielectric */
+	if (c_cmaterial->nr > 1.1 &&
+			c_cmaterial->ts > .25 && c_cmaterial->rs <= .125 &&
+			c_cmaterial->td <= .01 && c_cmaterial->rd <= .01 &&
+			c_cmaterial->rs_a <= .01 && c_cmaterial->ts_a <= .01) {
+		cvtcolor(radrgb, &c_cmaterial->ts_c,
+				c_cmaterial->ts + c_cmaterial->rs);
+		if (c_cmaterial->sided) {		/* dielectric */
+			colval(radrgb,RED) = pow(colval(radrgb,RED),
+							1./C_1SIDEDTHICK);
+			colval(radrgb,GRN) = pow(colval(radrgb,GRN),
+							1./C_1SIDEDTHICK);
+			colval(radrgb,BLU) = pow(colval(radrgb,BLU),
+							1./C_1SIDEDTHICK);
+			fprintf(matfp, "\nvoid dielectric %s\n0\n0\n", mname);
+			fprintf(matfp, "5 %g %g %g %f 0\n", colval(radrgb,RED),
+					colval(radrgb,GRN), colval(radrgb,BLU),
+					c_cmaterial->nr);
+			return(mname);
+		}
+							/* glass */
+		fprintf(matfp, "\nvoid glass %s\n0\n0\n", mname);
+		fprintf(matfp, "4 %f %f %f %f\n", colval(radrgb,RED),
+				colval(radrgb,GRN), colval(radrgb,BLU),
+				c_cmaterial->nr);
+		return(mname);
+		}
 					/* check for trans */
 	if (c_cmaterial->td > .01 || c_cmaterial->ts > .01) {
 		double	ts, a5, a6;
@@ -464,10 +510,10 @@ material()			/* get (and print) current material */
 		else
 			d = c_cmaterial->td + ts;
 		scalecolor(radrgb, d);
-		printf("\nvoid trans %s\n0\n0\n", mname);
-		printf("7 %f %f %f\n", colval(radrgb,RED),
+		fprintf(matfp, "\nvoid trans %s\n0\n0\n", mname);
+		fprintf(matfp, "7 %f %f %f\n", colval(radrgb,RED),
 				colval(radrgb,GRN), colval(radrgb,BLU));
-		printf("\t%f %f %f %f\n", c_cmaterial->rs, a5, a6,
+		fprintf(matfp, "\t%f %f %f %f\n", c_cmaterial->rs, a5, a6,
 				ts/(ts + c_cmaterial->td));
 		return(mname);
 	}
@@ -476,8 +522,8 @@ material()			/* get (and print) current material */
 					c_isgrey(&c_cmaterial->rs_c))) {
 		cvtcolor(radrgb, &c_cmaterial->rd_c,
 					c_cmaterial->rd/(1.-c_cmaterial->rs));
-		printf("\nvoid plastic %s\n0\n0\n", mname);
-		printf("5 %f %f %f %f %f\n", colval(radrgb,RED),
+		fprintf(matfp, "\nvoid plastic %s\n0\n0\n", mname);
+		fprintf(matfp, "5 %f %f %f %f %f\n", colval(radrgb,RED),
 				colval(radrgb,GRN), colval(radrgb,BLU),
 				c_cmaterial->rs, c_cmaterial->rs_a);
 		return(mname);
@@ -487,8 +533,8 @@ material()			/* get (and print) current material */
 	cvtcolor(radrgb, &c_cmaterial->rd_c, c_cmaterial->rd);
 	cvtcolor(c2, &c_cmaterial->rs_c, c_cmaterial->rs);
 	addcolor(radrgb, c2);
-	printf("\nvoid metal %s\n0\n0\n", mname);
-	printf("5 %f %f %f %f %f\n", colval(radrgb,RED),
+	fprintf(matfp, "\nvoid metal %s\n0\n0\n", mname);
+	fprintf(matfp, "5 %f %f %f %f %f\n", colval(radrgb,RED),
 			colval(radrgb,GRN), colval(radrgb,BLU),
 			c_cmaterial->rs/(c_cmaterial->rd + c_cmaterial->rs),
 			c_cmaterial->rs_a);