--- ray/src/rt/source.c 1992/08/28 15:10:50 2.5 +++ ray/src/rt/source.c 1994/01/12 21:25:59 2.14 @@ -1,4 +1,4 @@ -/* Copyright (c) 1992 Regents of the University of California */ +/* Copyright (c) 1993 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -81,7 +81,7 @@ marksources() /* find and mark source objects */ if (m->otype == MAT_GLOW) { source[ns].sflags |= SPROX; source[ns].sl.prox = m->oargs.farg[3]; - if (o->otype == OBJ_SOURCE) + if (source[ns].sflags & SDISTANT) source[ns].sflags |= SSKIP; } else if (m->otype == MAT_SPOT) { source[ns].sflags |= SSPOT; @@ -236,8 +236,8 @@ int (*f)(); /* direct component coefficient functio char *p; /* data for f */ { extern int (*trace)(); - extern double pow(); register int sn; + register CONTRIB *scp; SRCINDEX si; int nshadcheck, ncnts; int nhits; @@ -259,19 +259,20 @@ char *p; /* data for f */ error(SYSTEM, "out of memory in direct"); } cntord[sn].sndx = sn; - srccnt[sn].sno = sr.rsrc; + scp = srccnt + sn; + scp->sno = sr.rsrc; /* compute coefficient */ - (*f)(srccnt[sn].coef, p, sr.rdir, si.dom); - cntord[sn].brt = bright(srccnt[sn].coef); + (*f)(scp->coef, p, sr.rdir, si.dom); + cntord[sn].brt = bright(scp->coef); if (cntord[sn].brt <= 0.0) continue; - VCOPY(srccnt[sn].dir, sr.rdir); + VCOPY(scp->dir, sr.rdir); /* compute potential */ sr.revf = srcvalue; rayvalue(&sr); - copycolor(srccnt[sn].val, sr.rcol); - multcolor(srccnt[sn].val, srccnt[sn].coef); - cntord[sn].brt = bright(srccnt[sn].val); + copycolor(scp->val, sr.rcol); + multcolor(scp->val, scp->coef); + cntord[sn].brt = bright(scp->val); } /* sort contributions */ qsort(cntord, sn, sizeof(CNTPTR), cntcmp); @@ -298,53 +299,57 @@ char *p; /* data for f */ /* modify threshold */ ourthresh = shadthresh / r->rweight; /* test for shadows */ - nhits = 0; - for (sn = 0; sn < ncnts; sn++) { + for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts; + hwt += (double)source[scp->sno].nhits / + (double)source[scp->sno].ntests, + sn++) { /* check threshold */ if ((sn+nshadcheck>=ncnts ? cntord[sn].brt : cntord[sn].brt-cntord[sn+nshadcheck].brt) < ourthresh*bright(r->rcol)) break; + scp = srccnt + cntord[sn].sndx; /* test for hit */ rayorigin(&sr, r, SHADOW, 1.0); - VCOPY(sr.rdir, srccnt[cntord[sn].sndx].dir); - sr.rsrc = srccnt[cntord[sn].sndx].sno; - source[sr.rsrc].ntests++; /* keep statistics */ + VCOPY(sr.rdir, scp->dir); + sr.rsrc = scp->sno; + source[scp->sno].ntests++; /* keep statistics */ if (localhit(&sr, &thescene) && - ( sr.ro != source[sr.rsrc].so || - source[sr.rsrc].sflags & SFOLLOW )) { + ( sr.ro != source[scp->sno].so || + source[scp->sno].sflags & SFOLLOW )) { /* follow entire path */ raycont(&sr); if (trace != NULL) (*trace)(&sr); /* trace execution */ if (bright(sr.rcol) <= FTINY) continue; /* missed! */ - copycolor(srccnt[cntord[sn].sndx].val, sr.rcol); - multcolor(srccnt[cntord[sn].sndx].val, - srccnt[cntord[sn].sndx].coef); + copycolor(scp->val, sr.rcol); + multcolor(scp->val, scp->coef); } /* add contribution if hit */ - addcolor(r->rcol, srccnt[cntord[sn].sndx].val); + addcolor(r->rcol, scp->val); nhits++; - source[sr.rsrc].nhits++; + source[scp->sno].nhits++; } - /* surface hit rate */ - if (sn > 0) - hwt = (double)nhits / (double)sn; + /* source hit rate */ + if (hwt > FTINY) + hwt = (double)nhits / hwt; else hwt = 0.5; #ifdef DEBUG - sprintf(errmsg, "%d tested, %d untested, %f hit rate\n", + sprintf(errmsg, "%d tested, %d untested, %f conditional hit rate\n", sn, ncnts-sn, hwt); eputs(errmsg); #endif /* add in untested sources */ for ( ; sn < ncnts; sn++) { - sr.rsrc = srccnt[cntord[sn].sndx].sno; - prob = hwt * (double)source[sr.rsrc].nhits / - (double)source[sr.rsrc].ntests; - scalecolor(srccnt[cntord[sn].sndx].val, prob); - addcolor(r->rcol, srccnt[cntord[sn].sndx].val); + scp = srccnt + cntord[sn].sndx; + prob = hwt * (double)source[scp->sno].nhits / + (double)source[scp->sno].ntests; + if (prob > 1.0) + prob = 1.0; + scalecolor(scp->val, prob); + addcolor(r->rcol, scp->val); } } @@ -354,34 +359,44 @@ char *p; /* data for f */ * because they are very nasty and difficult to understand. */ -/* wrongillum * +/* illumblock * * * We cannot allow an illum to pass to another illum, because that * would almost certainly constitute overcounting. * However, we do allow an illum to pass to another illum * that is actually going to relay to a virtual light source. + * We also prevent an illum from passing to a glow; this provides a + * convenient mechanism for defining detailed light source + * geometry behind (or inside) an effective radiator. */ -#define wrongillum(m, r) (!(source[r->rsrc].sflags&SVIRTUAL) && \ - objptr(source[r->rsrc].so->omod)->otype==MAT_ILLUM) +static int weaksrcmod(obj) int obj; /* efficiency booster function */ +{register OBJREC *o = objptr(obj); +return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);} +#define illumblock(m, r) (!(source[r->rsrc].sflags&SVIRTUAL) && \ + r->rod > 0.0 && \ + weaksrcmod(source[r->rsrc].so->omod)) + /* wrongsource * * * This source is the wrong source (ie. overcounted) if we are * aimed to a different source than the one we hit and the one - * we hit is not an illum which should be passed. + * we hit is not an illum that should be passed. */ #define wrongsource(m, r) (r->rsrc>=0 && source[r->rsrc].so!=r->ro && \ - (m->otype!=MAT_ILLUM || wrongillum(m,r))) + (m->otype!=MAT_ILLUM || illumblock(m,r))) /* distglow * * * A distant glow is an object that sometimes acts as a light source, * but is too far away from the test point to be one in this case. + * (Glows with negative radii should NEVER participate in illumination.) */ #define distglow(m, r) (m->otype==MAT_GLOW && \ + m->oargs.farg[3] >= -FTINY && \ r->rot > m->oargs.farg[3]) /* badcomponent * @@ -397,13 +412,6 @@ char *p; /* data for f */ !(r->crtype&SHADOW || r->rod < 0.0 || \ distglow(m, r))) -/* overcount * - * - * All overcounting possibilities are contained here. - */ - -#define overcount(m, r) (badcomponent(m,r) || wrongsource(m,r)) - /* passillum * * * An illum passes to another material type when we didn't hit it @@ -417,10 +425,10 @@ char *p; /* data for f */ /* srcignore * * - * The -di flag renders light sources invisible, and here is the test. + * The -dv flag is normally on for sources to be visible. */ -#define srcignore(m, r) (directinvis && !(r->crtype&SHADOW) && \ +#define srcignore(m, r) (!directvis && !(r->crtype&SHADOW) && \ !distglow(m, r)) @@ -429,26 +437,27 @@ register OBJREC *m; register RAY *r; { /* check for over-counting */ - if (overcount(m, r)) - return; + if (badcomponent(m, r)) + return(1); + if (wrongsource(m,r)) + return(1); /* 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])); - return; + if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID)) + return(rayshade(r, modifier(m->oargs.sarg[0]))); + raytrans(r); + return(1); } /* otherwise treat as source */ /* check for behind */ if (r->rod < 0.0) - return; + return(1); /* check for invisibility */ if (srcignore(m, r)) - return; + return(1); /* check for outside spot */ - if (m->otype==MAT_SPOT && spotout(r, (SPOT *)m->os, r->rot>=FHUGE)) - return; + if (m->otype==MAT_SPOT && spotout(r, makespot(m), r->rot>=FHUGE)) + return(1); /* get distribution pattern */ raytexture(r, m->omod); /* get source color */ @@ -457,4 +466,5 @@ register RAY *r; m->oargs.farg[2]); /* modify value */ multcolor(r->rcol, r->pcol); + return(1); }