--- ray/src/cv/mgf2rad.c 1994/07/08 16:10:09 2.7 +++ ray/src/cv/mgf2rad.c 1995/04/13 14:43:33 2.14 @@ -17,10 +17,14 @@ static char SCCSid[] = "$SunId$ LBL"; #define putv(v) printf("%18.12g %18.12g %18.12g\n",(v)[0],(v)[1],(v)[2]) +#define invert (xf_context != NULL && xf_context->rev) + double glowdist = FHUGE; /* glow test distance */ -double emult = 1.; /* emmitter multiplier */ +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(); @@ -37,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; @@ -61,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; } @@ -89,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); } @@ -293,7 +307,7 @@ char **av; printf("\n%s polygon %sf%d\n", mat, object(), ++nfaces); printf("0\n0\n%d\n", 3*(ac-1)); for (i = 1; i < ac; i++) { - if ((cv = c_getvert(av[i])) == NULL) + if ((cv = c_getvert(av[invert ? ac-i : i])) == NULL) return(MG_EUNDEF); xf_xfmpoint(v, cv->p); putv(v); @@ -367,9 +381,14 @@ char *mat, *vn1, *vn2, *vn3; FVECT n1, n2, n3; register int i; /* the following is repeat code, so assume it's OK */ - cv1 = c_getvert(vn1); cv2 = c_getvert(vn2); - cv3 = c_getvert(vn3); + if (invert) { + cv3 = c_getvert(vn1); + cv1 = c_getvert(vn3); + } else { + cv1 = c_getvert(vn1); + cv3 = c_getvert(vn3); + } xf_xfmpoint(v1, cv1->p); xf_xfmpoint(v2, cv2->p); xf_xfmpoint(v3, cv3->p); @@ -410,15 +429,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)); } @@ -428,6 +447,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; @@ -457,10 +503,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); } @@ -469,8 +515,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); @@ -480,8 +526,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);