--- ray/src/rt/srcsupp.c 1991/06/20 16:36:46 1.2 +++ ray/src/rt/srcsupp.c 1991/08/26 10:11:08 1.12 @@ -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)); } @@ -150,7 +152,6 @@ SPOT * makespot(m) /* make a spotlight */ register OBJREC *m; { - extern double cos(); register SPOT *ns; if ((ns = (SPOT *)malloc(sizeof(SPOT))) == NULL) @@ -169,22 +170,27 @@ FVECT ocent; OBJREC *op; { double maxrad2; - double d2; + double d; register int i, j; register FACE *f; f = getface(op); + if (f->area == 0.) + return(0.); for (i = 0; i < 3; i++) { ocent[i] = 0.; for (j = 0; j < f->nv; j++) ocent[i] += VERTEX(f,j)[i]; ocent[i] /= (double)f->nv; } + d = DOT(ocent,f->norm); + for (i = 0; i < 3; i++) + ocent[i] += (f->offset - d)*f->norm[i]; maxrad2 = 0.; for (j = 0; j < f->nv; j++) { - d2 = dist2(VERTEX(f,j), ocent); - if (d2 > maxrad2) - maxrad2 = d2; + d = dist2(VERTEX(f,j), ocent); + if (d > maxrad2) + maxrad2 = d; } return(maxrad2); } @@ -229,6 +235,151 @@ OBJREC *op; } +commonspot(sp1, sp2, org) /* set sp1 to intersection of sp1 and sp2 */ +register SPOT *sp1, *sp2; +FVECT org; +{ + FVECT cent; + double rad2, cos1, cos2; + + cos1 = 1. - sp1->siz/(2.*PI); + cos2 = 1. - sp2->siz/(2.*PI); + if (sp2->siz >= 2.*PI-FTINY) /* BIG, just check overlap */ + return(DOT(sp1->aim,sp2->aim) >= cos1*cos2 - + sqrt((1.-cos1*cos1)*(1.-cos2*cos2))); + /* compute and check disks */ + rad2 = intercircle(cent, sp1->aim, sp2->aim, + 1./(cos1*cos1) - 1., 1./(cos2*cos2) - 1.); + if (rad2 <= FTINY || normalize(cent) == 0.) + return(0); + VCOPY(sp1->aim, cent); + sp1->siz = 2.*PI*(1. - 1./sqrt(1.+rad2)); + return(1); +} + + +commonbeam(sp1, sp2, dir) /* set sp1 to intersection of sp1 and sp2 */ +register SPOT *sp1, *sp2; +FVECT dir; +{ + FVECT cent, c1, c2; + double rad2, d; + register int i; + /* move centers to common plane */ + d = DOT(sp1->aim, dir); + for (i = 0; i < 3; i++) + c1[i] = sp1->aim[i] - d*dir[i]; + d = DOT(sp2->aim, dir); + for (i = 0; i < 3; i++) + c2[i] = sp2->aim[i] - d*dir[i]; + /* compute overlap */ + rad2 = intercircle(cent, c1, c2, sp1->siz/PI, sp2->siz/PI); + if (rad2 <= FTINY) + return(0); + VCOPY(sp1->aim, cent); + sp1->siz = PI*rad2; + return(1); +} + + +checkspot(sp, nrm) /* check spotlight for behind source */ +register SPOT *sp; /* spotlight */ +FVECT nrm; /* source surface normal */ +{ + double d, d1; + + d = DOT(sp->aim, nrm); + if (d > FTINY) /* center in front? */ + return(1); + /* else check horizon */ + d1 = 1. - sp->siz/(2.*PI); + return(1.-FTINY-d*d < d1*d1); +} + + +double +spotdisk(oc, op, sp, pos) /* intersect spot with object op */ +FVECT oc; +OBJREC *op; +register SPOT *sp; +FVECT pos; +{ + FVECT onorm; + double offs, d, dist; + register int i; + + offs = getplaneq(onorm, op); + d = -DOT(onorm, sp->aim); + if (d >= -FTINY && d <= FTINY) + return(0.); + dist = (DOT(pos, onorm) - offs)/d; + if (dist < 0.) + return(0.); + for (i = 0; i < 3; i++) + oc[i] = pos[i] + dist*sp->aim[i]; + return(sp->siz*dist*dist/PI/(d*d)); +} + + +double +beamdisk(oc, op, sp, dir) /* intersect beam with object op */ +FVECT oc; +OBJREC *op; +register SPOT *sp; +FVECT dir; +{ + FVECT onorm; + double offs, d, dist; + register int i; + + offs = getplaneq(onorm, op); + d = -DOT(onorm, dir); + if (d >= -FTINY && d <= FTINY) + return(0.); + dist = (DOT(sp->aim, onorm) - offs)/d; + for (i = 0; i < 3; i++) + oc[i] = sp->aim[i] + dist*dir[i]; + return(sp->siz/PI/(d*d)); +} + + +double +intercircle(cc, c1, c2, r1s, r2s) /* intersect two circles */ +FVECT cc; /* midpoint (return value) */ +FVECT c1, c2; /* circle centers */ +double r1s, r2s; /* radii squared */ +{ + double a2, d2, l; + FVECT disp; + register int i; + + for (i = 0; i < 3; i++) + disp[i] = c2[i] - c1[i]; + d2 = DOT(disp,disp); + /* circle within overlap? */ + if (r1s < r2s) { + if (r2s >= r1s + d2) { + VCOPY(cc, c1); + return(r1s); + } + } else { + if (r1s >= r2s + d2) { + VCOPY(cc, c2); + return(r2s); + } + } + a2 = .25*(2.*(r1s+r2s) - d2 - (r2s-r1s)*(r2s-r1s)/d2); + /* no overlap? */ + if (a2 <= 0.) + return(0.); + /* overlap, compute center */ + l = sqrt((r1s - a2)/d2); + for (i = 0; i < 3; i++) + cc[i] = c1[i] + l*disp[i]; + return(a2); +} + + sourcehit(r) /* check to see if ray hit distant source */ register RAY *r; { @@ -241,7 +392,7 @@ register RAY *r; first = 0; last = nsources-1; } for (i = first; i <= last; i++) - if (source[i].sflags & SDISTANT) + if ((source[i].sflags & (SDISTANT|SVIRTUAL)) == SDISTANT) /* * Check to see if ray is within * solid angle of source. @@ -264,17 +415,24 @@ register RAY *r; } -#define wrongsource(m, r) (m->otype!=MAT_ILLUM && \ - r->rsrc>=0 && \ - source[r->rsrc].so!=r->ro) +#define wrongsource(m, r) (r->rsrc>=0 && \ + source[r->rsrc].so!=r->ro && \ + (m->otype!=MAT_ILLUM || \ + objptr(source[r->rsrc].so->omod)->otype==MAT_ILLUM)) +#define distglow(m, r) (m->otype==MAT_GLOW && \ + r->rot > m->oargs.farg[3]) + #define badambient(m, r) ((r->crtype&(AMBIENT|SHADOW))==AMBIENT && \ - !(m->otype==MAT_GLOW&&r->rot>m->oargs.farg[3])) + !distglow(m, r)) #define passillum(m, r) (m->otype==MAT_ILLUM && \ !(r->rsrc>=0&&source[r->rsrc].so==r->ro)) +#define srcignore(m, r) (directinvis && !(r->crtype&SHADOW) && \ + !distglow(m, r)) + m_light(m, r) /* ray hit a light source */ register OBJREC *m; register RAY *r; @@ -284,24 +442,25 @@ register RAY *r; return; /* check for passed illum */ if (passillum(m, r)) { - if (m->oargs.nsargs < 1 || !strcmp(m->oargs.sarg[0], VOIDID)) raytrans(r); else rayshade(r, modifier(m->oargs.sarg[0])); - - /* otherwise treat as source */ - } else { + return; + } + /* otherwise treat as source */ /* check for behind */ - if (r->rod < 0.0) - return; + if (r->rod < 0.0) + return; + /* check for invisibility */ + if (srcignore(m, r)) + return; /* get distribution pattern */ - raytexture(r, m->omod); + raytexture(r, m->omod); /* get source color */ - setcolor(r->rcol, m->oargs.farg[0], - m->oargs.farg[1], - m->oargs.farg[2]); + setcolor(r->rcol, m->oargs.farg[0], + m->oargs.farg[1], + m->oargs.farg[2]); /* modify value */ - multcolor(r->rcol, r->pcol); - } + multcolor(r->rcol, r->pcol); }