--- ray/src/rt/srcsupp.c 1991/06/25 13:11:55 1.6 +++ ray/src/rt/srcsupp.c 1991/07/16 15:56:48 1.9 @@ -27,7 +27,7 @@ SRCFUNC sfun[NUMOTYPE]; /* source dispatch table */ initstypes() /* initialize source dispatch table */ { - extern VSMATERIAL mirror_vs; + extern VSMATERIAL mirror_vs, direct1_vs, direct2_vs; extern int fsetsrc(), ssetsrc(), sphsetsrc(), rsetsrc(); extern double fgetplaneq(), rgetplaneq(); extern double fgetmaxdisk(), rgetmaxdisk(); @@ -37,6 +37,8 @@ initstypes() /* initialize source dispatch table */ static SOBJECT rsobj = {rsetsrc, rgetplaneq, rgetmaxdisk}; sfun[MAT_MIRROR].mf = &mirror_vs; + sfun[MAT_DIRECT1].mf = &direct1_vs; + sfun[MAT_DIRECT2].mf = &direct2_vs; sfun[OBJ_FACE].of = &fsobj; sfun[OBJ_SOURCE].of = &ssobj; sfun[OBJ_SPHERE].of = &sphsobj; @@ -105,7 +107,7 @@ register OBJREC *so; theta = PI/180.0/2.0 * so->oargs.farg[3]; if (theta <= FTINY) objerror(so, USER, "zero size"); - src->ss = theta >= PI/4 ? 1.0 : tan(theta); + src->ss = theta >= PI/4.0 ? 1.0 : tan(theta); src->ss2 = 2.0*PI * (1.0 - cos(theta)); } @@ -288,10 +290,10 @@ FVECT nrm; /* source surface normal */ d = DOT(sp->aim, nrm); if (d > FTINY) /* center in front? */ - return(0); + return(1); /* else check horizon */ d1 = 1. - sp->siz/(2.*PI); - return(1.-FTINY-d*d > d1*d1); + return(1.-FTINY-d*d < d1*d1); }