--- ray/src/rt/source.c 1989/06/08 09:35:43 1.9 +++ ray/src/rt/source.c 1990/12/28 20:37:08 1.29 @@ -1,4 +1,4 @@ -/* Copyright (c) 1986 Regents of the University of California */ +/* Copyright (c) 1990 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -27,11 +27,15 @@ static char SCCSid[] = "$SunId$ LBL"; extern double dstrsrc; /* source distribution amount */ extern double shadthresh; /* relative shadow threshold */ +extern double shadcert; /* shadow testing certainty */ SRCREC *source = NULL; /* our list of sources */ int nsources = 0; /* the number of sources */ +static CONTRIB *srccnt; /* source contributions in direct() */ +static CNTPTR *cntord; /* source ordering in direct() */ + marksources() /* find and mark source objects */ { register OBJREC *o, *m; @@ -46,10 +50,7 @@ marksources() /* find and mark source objects */ m = objptr(o->omod); - if (m->otype != MAT_LIGHT && - m->otype != MAT_ILLUM && - m->otype != MAT_GLOW && - m->otype != MAT_SPOT) + if (!islight(m->otype)) continue; if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : @@ -67,7 +68,7 @@ marksources() /* find and mark source objects */ source = (SRCREC *)realloc((char *)source, (unsigned)(nsources+1)*sizeof(SRCREC)); if (source == NULL) - error(SYSTEM, "out of memory in marksources"); + goto memerr; newsource(&source[nsources], o); @@ -82,6 +83,17 @@ marksources() /* find and mark source objects */ } nsources++; } + if (nsources <= 0) { + error(WARNING, "no light sources found"); + return; + } + srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB)); + cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR)); + if (srccnt != NULL && cntord != NULL) + return; + /* fall through */ +memerr: + error(SYSTEM, "out of memory in marksources"); } @@ -225,26 +237,24 @@ register int sn; /* source number */ /* domega constant */ return(source[sn].ss2); - else { /* check proximity */ - if (source[sn].sflags & SPROX && - d > source[sn].sl.prox) - return(0.0); - - if (norm != NULL) - ddot /= d; - else - ddot = 1.0; + if (source[sn].sflags & SPROX && + d > source[sn].sl.prox) + return(0.0); + /* compute dot product */ + if (norm != NULL) + ddot /= d; + else + ddot = 1.0; /* check angle */ - if (source[sn].sflags & SSPOT) { - if (source[sn].sl.s->siz < 2.0*PI * + if (source[sn].sflags & SSPOT) { + if (source[sn].sl.s->siz < 2.0*PI * (1.0 + DOT(source[sn].sl.s->aim,sr->rdir))) - return(0.0); - d += source[sn].sl.s->flen; - } - /* return domega */ - return(ddot*source[sn].ss2/(d*d)); + return(0.0); + d += source[sn].sl.s->flen; /* adjust length */ } + /* compute domega */ + return(ddot*source[sn].ss2/(d*d)); } @@ -276,8 +286,7 @@ register RAY *r; for (i = 0; i < 3; i++) r->ron[i] = -r->rdir[i]; r->rod = 1.0; - r->rofs = 1.0; setident4(r->rofx); - r->robs = 1.0; setident4(r->robx); + r->rox = NULL; return(1); } return(0); @@ -301,17 +310,17 @@ RAY *r; /* ray that hit surface */ int (*f)(); /* direct component coefficient function */ char *p; /* data for f */ { + extern double pow(); register int sn; - register CONTRIB *srccnt; - register CNTPTR *cntord; - int ncnts; - double ourthresh, prob, hwt, test2, hit2; + int nshadcheck, ncnts; + int nhits; + double prob, ourthresh, hwt; RAY sr; - - srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB)); - cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR)); - if (srccnt == NULL || cntord == NULL) - error(SYSTEM, "out of memory in direct"); + /* NOTE: srccnt and cntord global so no recursion */ + if (nsources <= 0) + return; /* no sources?! */ + /* compute number to check */ + nshadcheck = pow((double)nsources, shadcert) + .5; /* modify threshold */ ourthresh = shadthresh / r->rweight; /* potential contributions */ @@ -325,55 +334,60 @@ char *p; /* data for f */ /* compute coefficient */ (*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom); cntord[sn].brt = bright(srccnt[sn].val); - if (cntord[sn].brt <= FTINY) + if (cntord[sn].brt <= 0.0) continue; /* compute intersection */ if (!( source[sn].sflags & SDISTANT ? sourcehit(&sr) : (*ofun[source[sn].so->otype].funp) - (source[sn].so, &sr) )) + (source[sn].so, &sr) )) { + sprintf(errmsg, + "aiming failure for light source \"%s\"", + source[sn].so->oname); + error(WARNING, errmsg); + cntord[sn].brt = 0.0; continue; + } /* compute contribution */ - rayshade(&sr, sr.ro->omod); + raycont(&sr); multcolor(srccnt[sn].val, sr.rcol); cntord[sn].brt = bright(srccnt[sn].val); } /* sort contributions */ qsort(cntord, nsources, sizeof(CNTPTR), cntcmp); - hit2 = 0.0; test2 = FTINY; - /* find last */ - sn = 0; ncnts = nsources; - while (sn < ncnts-1) { - register int m; - m = (sn + ncnts) >> 1; - if (cntord[m].brt > 0.0) - sn = m; - else - ncnts = m; + { /* find last */ + register int l, m; + + sn = 0; ncnts = l = nsources; + while ((m = (sn + ncnts) >> 1) != l) { + if (cntord[m].brt > 0.0) + sn = m; + else + ncnts = m; + l = m; + } } - /* accumulate tail */ - for (sn = ncnts-1; sn > 0; sn--) - cntord[sn-1].brt += cntord[sn].brt; - /* shadow testing */ + /* accumulate tail */ + for (sn = ncnts-1; sn > 0; sn--) + cntord[sn-1].brt += cntord[sn].brt; + /* test for shadows */ + nhits = 0; for (sn = 0; sn < ncnts; sn++) { - /* tail below threshold? */ - if (cntord[sn].brt < ourthresh*bright(r->rcol)) + /* check threshold */ + if ((sn+nshadcheck>=ncnts ? cntord[sn].brt : + cntord[sn].brt-cntord[sn+nshadcheck].brt) + < ourthresh*bright(r->rcol)) break; /* get statistics */ - hwt = (double)source[cntord[sn].sno].nhits / - (double)source[cntord[sn].sno].ntests; - test2 += hwt; source[cntord[sn].sno].ntests++; /* test for hit */ rayorigin(&sr, r, SHADOW, 1.0); VCOPY(sr.rdir, srccnt[cntord[sn].sno].dir); + sr.rsrc = cntord[sn].sno; if (localhit(&sr, &thescene) && sr.ro != source[cntord[sn].sno].so) { /* check for transmission */ - if (sr.clipset != NULL && inset(sr.clipset,sr.ro->omod)) - raytrans(&sr); /* object is clipped */ - else - rayshade(&sr, sr.ro->omod); + raycont(&sr); if (bright(sr.rcol) <= FTINY) continue; /* missed! */ (*f)(srccnt[cntord[sn].sno].val, p, @@ -383,14 +397,18 @@ char *p; /* data for f */ } /* add contribution if hit */ addcolor(r->rcol, srccnt[cntord[sn].sno].val); - hit2 += hwt; + nhits++; source[cntord[sn].sno].nhits++; } - /* weighted hit rate */ - hwt = hit2 / test2; + /* surface hit rate */ + if (sn > 0) + hwt = (double)nhits / (double)sn; + else + hwt = 0.5; #ifdef DEBUG - fprintf(stderr, "%d tested, %d untested, %f hit rate\n", + sprintf(errmsg, "%d tested, %d untested, %f hit rate\n", sn, ncnts-sn, hwt); + eputs(errmsg); #endif /* add in untested sources */ for ( ; sn < ncnts; sn++) { @@ -399,8 +417,6 @@ char *p; /* data for f */ scalecolor(srccnt[cntord[sn].sno].val, prob); addcolor(r->rcol, srccnt[cntord[sn].sno].val); } - free(srccnt); - free(cntord); } @@ -420,9 +436,6 @@ m_light(m, r) /* ray hit a light source */ register OBJREC *m; register RAY *r; { - /* check for behind */ - if (r->rod < 0.0) - return; /* check for over-counting */ if (wrongsource(m, r) || badambient(m, r)) return; @@ -436,6 +449,9 @@ register RAY *r; /* otherwise treat as source */ } else { + /* check for behind */ + if (r->rod < 0.0) + return; /* get distribution pattern */ raytexture(r, m->omod); /* get source color */ @@ -444,8 +460,7 @@ register RAY *r; m->oargs.farg[2]); /* modify value */ multcolor(r->rcol, r->pcol); + /* assign distance */ + r->rt = r->rot; } } - - -o_source() {} /* intersection with a source is done elsewhere */