--- ray/src/cv/mgf2rad.c	1994/06/22 15:33:03	2.1
+++ ray/src/cv/mgf2rad.c	1994/07/08 16:10:09	2.7
@@ -17,15 +17,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define putv(v)		printf("%18.12g %18.12g %18.12g\n",(v)[0],(v)[1],(v)[2])
 
-#define isgrey(cxy)	((cxy)->cx > .31 && (cxy)->cx < .35 && \
-			(cxy)->cy > .31 && (cxy)->cy < .35)
+double	glowdist = FHUGE;		/* glow test distance */
 
-#define is0vect(v)	((v)[0] == 0. && (v)[1] == 0. && (v)[2] == 0.)
-
-#define BIGFLT		1e8
-
-double	glowdist = 1.5*BIGFLT;		/* glow test distance */
-
 double  emult = 1.;			/* emmitter multiplier */
 
 int	r_comment(), r_cone(), r_cyl(), r_face(), r_ies(), r_ring(), r_sph();
@@ -41,6 +34,8 @@ char	*argv[];
 	mg_ehand[MG_E_COMMENT] = r_comment;
 	mg_ehand[MG_E_COLOR] = c_hcolor;
 	mg_ehand[MG_E_CONE] = r_cone;
+	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_CYL] = r_cyl;
 	mg_ehand[MG_E_ED] = c_hmaterial;
@@ -53,6 +48,7 @@ char	*argv[];
 	mg_ehand[MG_E_RD] = c_hmaterial;
 	mg_ehand[MG_E_RING] = r_ring;
 	mg_ehand[MG_E_RS] = c_hmaterial;
+	mg_ehand[MG_E_SIDES] = c_hmaterial;
 	mg_ehand[MG_E_SPH] = r_sph;
 	mg_ehand[MG_E_TD] = c_hmaterial;
 	mg_ehand[MG_E_TS] = c_hmaterial;
@@ -104,7 +100,7 @@ r_comment(ac, av)		/* repeat a comment verbatim */
 register int	ac;
 register char	**av;
 {
-	fputs("\n#", stdout);	/* use Radiance comment character */
+	putchar('#');		/* use Radiance comment character */
 	while (--ac) {
 		putchar(' ');
 		fputs(*++av, stdout);
@@ -280,7 +276,7 @@ char	**av;
 		return(MG_EARGC);
 	if ((mat = material()) == NULL)
 		return(MG_EBADMAT);
-	if (ac < 5) {				/* check for surface normals */
+	if (ac <= 5) {				/* check for surface normals */
 		for (i = 1; i < ac; i++) {
 			if ((cv = c_getvert(av[i])) == NULL)
 				return(MG_EUNDEF);
@@ -344,8 +340,11 @@ char	**av;
 					/* put out xform command */
 	printf("\n!xform");
 	oname = object();
-	if (*oname)
-		printf(" -n %s", oname);
+	if (*oname) {
+		printf(" -n ");
+		for (op = oname; op[1]; op++)	/* remove trailing separator */
+			putchar(*op);
+	}
 	for (i = xa0; i < ac; i++)
 		printf(" %s", av[i]);
 	if (ac > xa0 && xf_argc > 0)
@@ -361,7 +360,6 @@ do_tri(mat, vn1, vn2, vn3)		/* put out smoothed triang
 char	*mat, *vn1, *vn2, *vn3;
 {
 	static int	ntris;
-	char	*mod = mat;
 	BARYCCM	bvecs;
 	FLOAT	bcoor[3][3];
 	C_VERTEX	*cv1, *cv2, *cv3;
@@ -375,21 +373,20 @@ char	*mat, *vn1, *vn2, *vn3;
 	xf_xfmpoint(v1, cv1->p);
 	xf_xfmpoint(v2, cv2->p);
 	xf_xfmpoint(v3, cv3->p);
-	if (comp_baryc(&bvecs, v1, v2, v3) == 0) {
-		printf("\n%s texfunc T-nor\n", mod);
-		mod = "T-nor";
-		printf("4 dx dy dz %s\n0\n", TCALNAME);
-		xf_rotvect(n1, cv1->n);
-		xf_rotvect(n2, cv2->n);
-		xf_rotvect(n3, cv3->n);
-		for (i = 0; i < 3; i++) {
-			bcoor[i][0] = n1[i];
-			bcoor[i][1] = n2[i];
-			bcoor[i][2] = n3[i];
-		}
-		put_baryc(&bvecs, bcoor, 3);
+	if (comp_baryc(&bvecs, v1, v2, v3) < 0)
+		return;				/* degenerate triangle! */
+	printf("\n%s texfunc T-nor\n", mat);
+	printf("4 dx dy dz %s\n0\n", TCALNAME);
+	xf_rotvect(n1, cv1->n);
+	xf_rotvect(n2, cv2->n);
+	xf_rotvect(n3, cv3->n);
+	for (i = 0; i < 3; i++) {
+		bcoor[i][0] = n1[i];
+		bcoor[i][1] = n2[i];
+		bcoor[i][2] = n3[i];
 	}
-	printf("\n%s polygon %st%d\n", mod, object(), ++ntris);
+	put_baryc(&bvecs, bcoor, 3);
+	printf("\nT-nor polygon %st%d\n", object(), ++ntris);
 	printf("0\n0\n9\n");
 	putv(v1);
 	putv(v2);
@@ -405,8 +402,8 @@ material()			/* get (and print) current material */
 	double	d;
 	register int	i;
 
-	if (c_cmaterial->name != NULL)
-		mname = c_cmaterial->name;
+	if (c_cmname != NULL)
+		mname = c_cmname;
 	if (!c_cmaterial->clock)
 		return(mname);		/* already current */
 				/* else update output */
@@ -414,7 +411,7 @@ material()			/* get (and print) current material */
 	if (c_cmaterial->ed > .1) {	/* emitter */
 		cvtcolor(radrgb, &c_cmaterial->ed_c,
 				emult*c_cmaterial->ed/WHTEFFICACY);
-		if (glowdist < BIGFLT) {	/* do a glow */
+		if (glowdist < FHUGE) {		/* do a glow */
 			printf("\nvoid glow %s\n0\n0\n", mname);
 			printf("4 %f %f %f %f\n", colval(radrgb,RED),
 					colval(radrgb,GRN),
@@ -429,12 +426,19 @@ material()			/* get (and print) current material */
 	}
 	d = c_cmaterial->rd + c_cmaterial->td +
 			c_cmaterial->rs + c_cmaterial->ts;
-	if (d <= 0. | d >= 1.)
+	if (d < 0. | d > 1.)
 		return(NULL);
-	if (c_cmaterial->td > .01 || c_cmaterial->ts > .01) {	/* trans */
+					/* check for trans */
+	if (c_cmaterial->td > .01 || c_cmaterial->ts > .01) {
 		double	ts, a5, a6;
 
-		ts = sqrt(c_cmaterial->ts);	/* because we use 2 sides */
+		if (c_cmaterial->sided) {
+			ts = sqrt(c_cmaterial->ts);	/* approximate */
+			a5 = .5;
+		} else {
+			ts = c_cmaterial->ts;
+			a5 = 1.;
+		}
 						/* average colors */
 		d = c_cmaterial->rd + c_cmaterial->td + ts;
 		cvtcolor(radrgb, &c_cmaterial->rd_c, c_cmaterial->rd/d);
@@ -444,14 +448,15 @@ material()			/* get (and print) current material */
 		addcolor(radrgb, c2);
 		if (c_cmaterial->rs + ts > .0001)
 			a5 = (c_cmaterial->rs*c_cmaterial->rs_a +
-					ts*.5*c_cmaterial->ts_a) /
+					ts*a5*c_cmaterial->ts_a) /
 					(c_cmaterial->rs + ts);
 		a6 = (c_cmaterial->td + ts) /
 				(c_cmaterial->rd + c_cmaterial->td + ts);
-		if (a6 < .999) {
+		if (a6 < .999)
 			d = c_cmaterial->rd/(1. - c_cmaterial->rs)/(1. - a6);
-			scalecolor(radrgb, d);
-		}
+		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),
 				colval(radrgb,GRN), colval(radrgb,BLU));
@@ -459,11 +464,10 @@ material()			/* get (and print) current material */
 				ts/(ts + c_cmaterial->td));
 		return(mname);
 	}
-	if (c_cmaterial->rs < .01 || isgrey(&c_cmaterial->rs_c)) { /* plastic */
-		if (c_cmaterial->rs > .999)
-			cvtcolor(radrgb, &c_cmaterial->rd_c, 1.);
-		else
-			cvtcolor(radrgb, &c_cmaterial->rd_c,
+					/* check for plastic */
+	if (c_cmaterial->rs < .1 && (c_cmaterial->rs < .01 ||
+					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),
@@ -472,18 +476,15 @@ material()			/* get (and print) current material */
 		return(mname);
 	}
 					/* else it's metal */
-	d = c_cmaterial->rd + c_cmaterial->rs;	/* average colors */
-	cvtcolor(radrgb, &c_cmaterial->rd_c, c_cmaterial->rd/d);
-	cvtcolor(c2, &c_cmaterial->rs_c, c_cmaterial->rs/d);
+						/* average colors */
+	cvtcolor(radrgb, &c_cmaterial->rd_c, c_cmaterial->rd);
+	cvtcolor(c2, &c_cmaterial->rs_c, c_cmaterial->rs);
 	addcolor(radrgb, c2);
-	if (c_cmaterial->rs < .999) {
-		d = c_cmaterial->rd/(1. - c_cmaterial->rs);
-		scalecolor(radrgb, d);
-	}
 	printf("\nvoid metal %s\n0\n0\n", mname);
 	printf("5 %f %f %f %f %f\n", colval(radrgb,RED),
 			colval(radrgb,GRN), colval(radrgb,BLU),
-			c_cmaterial->rs, c_cmaterial->rs_a);
+			c_cmaterial->rs/(c_cmaterial->rd + c_cmaterial->rs),
+			c_cmaterial->rs_a);
 	return(mname);
 }
 
@@ -495,6 +496,7 @@ double	intensity;
 {
 	static COLOR	ciexyz;
 
+	c_ccvt(ciec, C_CSXY);		/* get xy representation */
 	ciexyz[1] = intensity;
 	ciexyz[0] = ciec->cx/ciec->cy*ciexyz[1];
 	ciexyz[2] = ciexyz[1]*(1./ciec->cy - 1.) - ciexyz[0];