--- ray/src/rt/source.c 1990/12/13 10:44:04 1.24 +++ ray/src/rt/source.c 1991/06/14 14:58:49 1.32 @@ -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"; @@ -32,7 +32,10 @@ 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; @@ -65,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); @@ -80,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"); } @@ -95,6 +109,7 @@ register OBJREC *so; register int i; src->sflags = 0; + src->aimsuccess = 2*AIMREQT-1; /* bitch on second failure */ src->nhits = 1; src->ntests = 2; /* start probability = 1/2 */ src->so = so; @@ -200,9 +215,13 @@ register int sn; /* source number */ } if (dstrsrc > FTINY) { /* distribute source direction */ - for (i = 0; i < 3; i++) - vd[i] = dstrsrc * source[sn].ss * (1.0 - 2.0*frandom()); - + dimlist[ndims++] = sn; + for (i = 0; i < 3; i++) { + dimlist[ndims] = i + 8831; + vd[i] = dstrsrc * source[sn].ss * + (1.0 - 2.0*urand(ilhash(dimlist,ndims+1)+samplendx)); + } + ndims--; if (norm != NULL) { /* project offset */ d = DOT(vd, norm); for (i = 0; i < 3; i++) @@ -223,26 +242,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)); } @@ -274,8 +291,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,18 +317,13 @@ char *p; /* data for f */ { extern double pow(); register int sn; - register CONTRIB *srccnt; - register CNTPTR *cntord; int nshadcheck, ncnts; - double prob, ourthresh, hwt, test2, hit2; + int nhits; + double prob, ourthresh, hwt; RAY sr; - + /* NOTE: srccnt and cntord global so no recursion */ if (nsources <= 0) - return; - srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB)); - cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR)); - if (srccnt == NULL || cntord == NULL) - error(SYSTEM, "out of memory in direct"); + return; /* no sources?! */ /* compute number to check */ nshadcheck = pow((double)nsources, shadcert) + .5; /* modify threshold */ @@ -331,11 +342,25 @@ char *p; /* data for f */ if (cntord[sn].brt <= 0.0) continue; /* compute intersection */ - if (!( source[sn].sflags & SDISTANT ? + if (source[sn].sflags & SDISTANT ? sourcehit(&sr) : (*ofun[source[sn].so->otype].funp) - (source[sn].so, &sr) )) + (source[sn].so, &sr)) { + if (source[sn].aimsuccess >= 0) + source[sn].aimsuccess++; + } else { + cntord[sn].brt = 0.0; + if (source[sn].aimsuccess < 0) + continue; /* bitched already */ + source[sn].aimsuccess -= AIMREQT; + if (source[sn].aimsuccess >= 0) + continue; /* leniency */ + sprintf(errmsg, + "aiming failure for light source \"%s\"", + source[sn].so->oname); + error(WARNING, errmsg); continue; + } /* compute contribution */ raycont(&sr); multcolor(srccnt[sn].val, sr.rcol); @@ -358,19 +383,15 @@ char *p; /* data for f */ /* accumulate tail */ for (sn = ncnts-1; sn > 0; sn--) cntord[sn-1].brt += cntord[sn].brt; - /* start with prob=.5 */ - hit2 = 0.5; test2 = 1.0; /* test for shadows */ + nhits = 0; for (sn = 0; sn < ncnts; sn++) { /* check threshold */ if ((sn+nshadcheck>=ncnts ? cntord[sn].brt : - cntord[sn].brt-cntord[sn+nshadcheck].brt) < - ourthresh*bright(r->rcol)) + 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); @@ -389,11 +410,14 @@ 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 sprintf(errmsg, "%d tested, %d untested, %f hit rate\n", sn, ncnts-sn, hwt); @@ -406,9 +430,6 @@ char *p; /* data for f */ scalecolor(srccnt[cntord[sn].sno].val, prob); addcolor(r->rcol, srccnt[cntord[sn].sno].val); } - - free((char *)srccnt); - free((char *)cntord); } @@ -452,7 +473,5 @@ register RAY *r; m->oargs.farg[2]); /* modify value */ multcolor(r->rcol, r->pcol); - /* assign distance */ - r->rt = r->rot; } }