--- ray/src/rt/source.c 2005/04/19 01:15:07 2.50 +++ ray/src/rt/source.c 2022/06/08 17:18:41 2.79 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: source.c,v 2.50 2005/04/19 01:15:07 greg Exp $"; +static const char RCSid[] = "$Id: source.c,v 2.79 2022/06/08 17:18:41 greg Exp $"; #endif /* * source.c - routines dealing with illumination sources. @@ -9,12 +9,13 @@ static const char RCSid[] = "$Id: source.c,v 2.50 2005 #include "ray.h" #include "otypes.h" +#include "otspecial.h" #include "rtotypes.h" #include "source.h" #include "random.h" +#include "pmapsrc.h" +#include "pmapmat.h" -extern double ssampdist; /* scatter sampling distance */ - #ifndef MAXSSAMP #define MAXSSAMP 16 /* maximum samples per ray */ #endif @@ -35,42 +36,23 @@ typedef struct { float brt; /* brightness (for comparison) */ } CNTPTR; /* contribution pointer */ -static CONTRIB *srccnt; /* source contributions in direct() */ -static CNTPTR *cntord; /* source ordering in direct() */ +static CONTRIB *srccnt = NULL; /* source contributions in direct() */ +static CNTPTR *cntord = NULL; /* source ordering in direct() */ static int maxcntr = 0; /* size of contribution arrays */ static int cntcmp(const void *p1, const void *p2); -extern OBJREC * /* find an object's actual material */ -findmaterial(register OBJREC *o) -{ - while (!ismaterial(o->otype)) { - if (o->otype == MOD_ALIAS && o->oargs.nsargs) { - OBJECT aobj; - OBJREC *ao; - aobj = lastmod(objndx(o), o->oargs.sarg[0]); - if (aobj < 0) - objerror(o, USER, "bad reference"); - ao = objptr(aobj); - if (ismaterial(ao->otype)) - return(ao); - } - if (o->omod == OVOID) - return(NULL); - o = objptr(o->omod); - } - return(o); /* mixtures will return NULL */ -} - - -extern void +void marksources(void) /* find and mark source objects */ { - int foundsource = 0; + int indirect = 0; int i; - register OBJREC *o, *m; - register int ns; + OBJREC *o, *m; + int ns; + /* call us only once! */ + if (nsources) + error(CONSISTENCY, "Multiple calls to marksources!"); /* initialize dispatch table */ initstypes(); /* find direct sources */ @@ -81,22 +63,29 @@ marksources(void) /* find and mark source objects */ if (!issurface(o->otype) || o->omod == OVOID) continue; /* find material */ - m = findmaterial(objptr(o->omod)); - if (m == NULL || !islight(m->otype)) + m = findmaterial(o); + if (m == NULL) + continue; + if (m->otype == MAT_CLIP) { + markclip(m); /* special case for antimatter */ + continue; + } + if (!islight(m->otype)) continue; /* not source modifier */ if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : m->otype == MAT_SPOT ? 7 : 3)) objerror(m, USER, "bad # arguments"); + if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) & + (m->oargs.farg[2] <= FTINY)) + continue; /* don't bother */ if (m->otype == MAT_GLOW && o->otype != OBJ_SOURCE && - m->oargs.farg[3] <= FTINY) - continue; /* don't bother */ - if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY && - m->oargs.farg[2] <= FTINY) - continue; /* don't bother */ - + m->oargs.farg[3] <= FTINY) { + indirect += (ambounce > 0); + continue; /* don't track these */ + } if (sfun[o->otype].of == NULL || sfun[o->otype].of->setsrc == NULL) objerror(o, USER, "illegal material"); @@ -109,9 +98,14 @@ marksources(void) /* find and mark source objects */ if (m->otype == MAT_GLOW) { source[ns].sflags |= SPROX; source[ns].sl.prox = m->oargs.farg[3]; - if (source[ns].sflags & SDISTANT) + if (source[ns].sflags & SDISTANT) { source[ns].sflags |= SSKIP; + indirect += (ambounce > 0); + } } else if (m->otype == MAT_SPOT) { + if (source[ns].sflags & SDISTANT) + objerror(o, WARNING, + "distant source is a spotlight"); source[ns].sflags |= SSPOT; if ((source[ns].sl.s = makespot(m)) == NULL) goto memerr; @@ -122,30 +116,83 @@ marksources(void) /* find and mark source objects */ source[ns].sflags |= SSKIP; } } + maxcntr += !(source[ns].sflags & SSKIP); + } + if (!maxcntr) { + if (!indirect) + error(WARNING, "no light sources found"); + return; /* no direct calculation, it seems */ + } #if SHADCACHE + for (ns = 0; ns < nsources; ns++) /* initialize obstructor cache */ initobscache(ns); #endif - if (!(source[ns].sflags & SSKIP)) - foundsource++; - } - if (!foundsource) { - error(WARNING, "no light sources found"); - return; - } - markvirtuals(); /* find and add virtual sources */ + /* PMAP: disable virtual sources */ + if (!photonMapping) + markvirtuals(); /* find and add virtual sources */ + /* allocate our contribution arrays */ - maxcntr = nsources + MAXSPART; /* start with this many */ + maxcntr += MAXSPART; /* start with this many */ srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB)); cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR)); - if ((srccnt == NULL) | (cntord == NULL)) - goto memerr; - return; + if ((srccnt != NULL) & (cntord != NULL)) + return; memerr: error(SYSTEM, "out of memory in marksources"); } -extern void +void +distantsources(void) /* only mark distant sources */ +{ + int i; + OBJREC *o, *m; + int ns; + /* call us only once! */ + if (nsources) + error(CONSISTENCY, "Multiple calls to distantsources!"); + /* initialize dispatch table */ + initstypes(); + /* sources needed for sourcehit() */ + for (i = 0; i < nsceneobjs; i++) { + + o = objptr(i); + + if ((o->otype != OBJ_SOURCE) | (o->omod == OVOID)) + continue; + /* find material */ + m = findmaterial(o); + if (m == NULL) + continue; + if (!islight(m->otype)) + continue; /* not source modifier */ + + if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : + m->otype == MAT_SPOT ? 7 : 3)) + objerror(m, USER, "bad # arguments"); + + if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) & + (m->oargs.farg[2] <= FTINY)) + continue; /* don't bother */ + if (sfun[o->otype].of == NULL || + sfun[o->otype].of->setsrc == NULL) + objerror(o, USER, "illegal material"); + + if ((ns = newsource()) < 0) + error(SYSTEM, "out of memory in distantsources"); + + setsource(&source[ns], o); + + if (m->otype == MAT_GLOW) { + source[ns].sflags |= SPROX|SSKIP; + source[ns].sl.prox = m->oargs.farg[3]; + } else if (m->otype == MAT_SPOT) + objerror(o, WARNING, "distant source is a spotlight"); + } +} + + +void freesources(void) /* free all source structures */ { if (nsources > 0) { @@ -157,6 +204,7 @@ freesources(void) /* free all source structures */ source = NULL; nsources = 0; } + markclip(NULL); if (maxcntr <= 0) return; free((void *)srccnt); @@ -167,51 +215,54 @@ freesources(void) /* free all source structures */ } -extern int +int srcray( /* send a ray to a source, return domega */ - register RAY *sr, /* returned source ray */ + RAY *sr, /* returned source ray */ RAY *r, /* ray which hit object */ SRCINDEX *si /* source sample index */ ) { - double d; /* distance to source */ - register SRCREC *srcp; + double d; /* distance to source */ + SRCREC *srcp; - rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ + rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ - while ((d = nextssamp(sr, si)) != 0.0) { - sr->rsrc = si->sn; /* remember source */ - srcp = source + si->sn; - if (srcp->sflags & SDISTANT) { - if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) - continue; - return(1); /* sample OK */ - } + if (r == NULL) + sr->rmax = 0.0; + + while ((d = nextssamp(sr, si)) != 0.0) { + sr->rsrc = si->sn; /* remember source */ + srcp = source + si->sn; + if (srcp->sflags & SDISTANT) { + if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) + continue; + return(1); /* sample OK */ + } /* local source */ /* check proximity */ - if (srcp->sflags & SPROX && d > srcp->sl.prox) - continue; - /* check angle */ - if (srcp->sflags & SSPOT) { - if (spotout(sr, srcp->sl.s)) + if (srcp->sflags & SPROX && d > srcp->sl.prox) continue; + /* check angle */ + if (srcp->sflags & SSPOT) { + if (spotout(sr, srcp->sl.s)) + continue; /* adjust solid angle */ - si->dom *= d*d; - d += srcp->sl.s->flen; - si->dom /= d*d; + si->dom *= d*d; + d += srcp->sl.s->flen; + si->dom /= d*d; + } + return(1); /* sample OK */ } - return(1); /* sample OK */ - } - return(0); /* no more samples */ + return(0); /* no more samples */ } -extern void +void srcvalue( /* punch ray to source and compute value */ - register RAY *r + RAY *r ) { - register SRCREC *sp; + SRCREC *sp; sp = &source[r->rsrc]; if (sp->sflags & SVIRTUAL) { /* virtual source */ @@ -250,11 +301,10 @@ nomat: static int transillum( /* check if material is transparent illum */ - OBJECT obj + OBJREC *m ) { - OBJREC *m = findmaterial(objptr(obj)); - + m = findmaterial(m); if (m == NULL) return(1); if (m->otype != MAT_ILLUM) @@ -263,15 +313,15 @@ transillum( /* check if material is transparent illu } -extern int +int sourcehit( /* check to see if ray hit distant source */ - register RAY *r + RAY *r ) { int glowsrc = -1; int transrc = -1; int first, last; - register int i; + int i; if (r->rsrc >= 0) { /* check only one if aimed */ first = last = r->rsrc; @@ -287,8 +337,8 @@ sourcehit( /* check to see if ray hit distant source */ if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2) continue; - /* is it the only possibility? */ - if (first == last) { + /* is it what we aimed for? */ + if (i == r->rsrc) { r->ro = source[i].so; break; } @@ -296,11 +346,13 @@ sourcehit( /* check to see if ray hit distant source * If it's a glow or transparent illum, just remember it. */ if (source[i].sflags & SSKIP) { - glowsrc = i; + if (glowsrc < 0) + glowsrc = i; continue; } - if (transillum(source[i].so->omod)) { - transrc = i; + if (transillum(source[i].so)) { + if (transrc < 0) + transrc = i; continue; } r->ro = source[i].so; /* otherwise, use first hit */ @@ -318,15 +370,9 @@ sourcehit( /* check to see if ray hit distant source return(0); /* nothing usable */ } /* - * Make assignments. + * Assign object index */ r->robj = objndx(r->ro); - for (i = 0; i < 3; i++) - r->ron[i] = -r->rdir[i]; - r->rod = 1.0; - r->pert[0] = r->pert[1] = r->pert[2] = 0.0; - r->uv[0] = r->uv[1] = 0.0; - r->rox = NULL; return(1); } @@ -337,8 +383,8 @@ cntcmp( /* contribution compare (descending) */ const void *p2 ) { - register const CNTPTR *sc1 = (const CNTPTR *)p1; - register const CNTPTR *sc2 = (const CNTPTR *)p2; + const CNTPTR *sc1 = (const CNTPTR *)p1; + const CNTPTR *sc2 = (const CNTPTR *)p2; if (sc1->brt > sc2->brt) return(-1); @@ -348,25 +394,32 @@ cntcmp( /* contribution compare (descending) */ } -extern void +void direct( /* add direct component */ RAY *r, /* ray that hit surface */ srcdirf_t *f, /* direct component coefficient function */ void *p /* data for f */ ) { - register int sn; - register CONTRIB *scp; + int sn; + CONTRIB *scp; SRCINDEX si; int nshadcheck, ncnts; int nhits; double prob, ourthresh, hwt; RAY sr; + + /* PMAP: Factor in direct photons (primarily for debugging/validation) */ + if (directPhotonMapping) { + (*f)(r -> rcol, p, r -> ron, PI); + multDirectPmap(r); + return; + } /* NOTE: srccnt and cntord global so no recursion */ - if (nsources <= 0) - return; /* no sources?! */ - /* potential contributions */ - initsrcindex(&si); + if (maxcntr <= 0) + return; /* no direct?! */ + + initsrcindex(&si); /* potential contributions */ for (sn = 0; srcray(&sr, r, &si); sn++) { if (sn >= maxcntr) { maxcntr = sn + MAXSPART; @@ -380,30 +433,30 @@ direct( /* add direct component */ cntord[sn].sndx = sn; scp = srccnt + sn; scp->sno = sr.rsrc; - /* compute coefficient */ - (*f)(scp->coef, p, sr.rdir, si.dom); - cntord[sn].brt = bright(scp->coef); - if (cntord[sn].brt <= 0.0) - continue; -#if SHADCACHE - /* check shadow cache */ +#if SHADCACHE /* check shadow cache */ if (si.np == 1 && srcblocked(&sr)) { cntord[sn].brt = 0.0; continue; } #endif + /* compute coefficient */ + (*f)(scp->coef, p, sr.rdir, si.dom); + cntord[sn].brt = intens(scp->coef); + if (cntord[sn].brt <= 0.0) + continue; VCOPY(scp->dir, sr.rdir); copycolor(sr.rcoef, scp->coef); /* compute potential */ - srcvalue(&sr); + sr.revf = srcvalue; + rayvalue(&sr); multcolor(sr.rcol, sr.rcoef); copycolor(scp->val, sr.rcol); - cntord[sn].brt = bright(scp->val); + cntord[sn].brt = bright(sr.rcol); } /* sort contributions */ qsort(cntord, sn, sizeof(CNTPTR), cntcmp); { /* find last */ - register int l, m; + int l, m; ncnts = l = sn; sn = 0; @@ -430,13 +483,15 @@ direct( /* add direct component */ (double)source[scp->sno].ntests, sn++) { /* check threshold */ - if ((sn+nshadcheck>=ncnts ? cntord[sn].brt : + if (sn >= MINSHADCNT && + (sn+nshadcheck>=ncnts ? cntord[sn].brt : cntord[sn].brt-cntord[sn+nshadcheck].brt) - < ourthresh*bright(r->rcol)) + < ourthresh*bright(r->rcol)) break; scp = srccnt + cntord[sn].sndx; /* test for hit */ rayorigin(&sr, SHADOW, r, NULL); + copycolor(sr.rcoef, scp->coef); VCOPY(sr.rdir, scp->dir); sr.rsrc = scp->sno; /* keep statistics */ @@ -451,7 +506,6 @@ direct( /* add direct component */ raycont(&sr); if (trace != NULL) (*trace)(&sr); /* trace execution */ - rayparticipate(&sr); if (bright(sr.rcol) <= FTINY) { #if SHADCACHE if ((scp <= srccnt || scp[-1].sno != scp->sno) @@ -461,8 +515,15 @@ direct( /* add direct component */ #endif continue; /* missed! */ } + rayparticipate(&sr); + multcolor(sr.rcol, sr.rcoef); copycolor(scp->val, sr.rcol); - multcolor(scp->val, scp->coef); + } else if (trace != NULL && + (source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW)) + == (SDISTANT|SFOLLOW) && + sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) { + (*trace)(&sr); /* trace execution */ + /* skip call to rayparticipate() & scp->val update */ } /* add contribution if hit */ addcolor(r->rcol, scp->val); @@ -484,17 +545,16 @@ direct( /* add direct component */ 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); + if (prob < 1.0) + scalecolor(scp->val, prob); addcolor(r->rcol, scp->val); } } -extern void +void srcscatter( /* compute source scattering into ray */ - register RAY *r + RAY *r ) { int oldsampndx; @@ -506,9 +566,12 @@ srcscatter( /* compute source scattering into ray */ COLOR cvext; int i, j; - if (r->slights == NULL || r->slights[0] == 0 - || r->gecc >= 1.-FTINY || r->rot >= FHUGE) + if (r->rot >= FHUGE*.99 || r->gecc >= 1.-FTINY) + return; /* this can never work */ + /* PMAP: do unconditional inscattering for volume photons */ + if (!volumePhotonMapping && (r->slights == NULL || r->slights[0] == 0)) return; + if (ssampdist <= FTINY || (nsamps = r->rot/ssampdist + .5) < 1) nsamps = 1; #if MAXSSAMP @@ -517,7 +580,8 @@ srcscatter( /* compute source scattering into ray */ #endif oldsampndx = samplendx; samplendx = random()&0x7fff; /* randomize */ - for (i = r->slights[0]; i > 0; i--) { /* for each source */ + for (i = volumePhotonMapping ? 1 : r->slights[0]; i > 0; i--) { + /* for each source OR once if volume photon map enabled */ for (j = 0; j < nsamps; j++) { /* for each sample position */ samplendx++; t = r->rot * (j+frandom())/nsamps; @@ -533,40 +597,53 @@ srcscatter( /* compute source scattering into ray */ sr.rorg[0] = r->rorg[0] + r->rdir[0]*t; sr.rorg[1] = r->rorg[1] + r->rdir[1]*t; sr.rorg[2] = r->rorg[2] + r->rdir[2]*t; - sr.rmax = 0.; - initsrcindex(&si); /* sample ray to this source */ - si.sn = r->slights[i]; - nopart(&si, &sr); - if (!srcray(&sr, NULL, &si) || - sr.rsrc != r->slights[i]) - continue; /* no path */ + + if (!volumePhotonMapping) { + initsrcindex(&si); /* sample ray to this source */ + si.sn = r->slights[i]; + nopart(&si, &sr); + if (!srcray(&sr, NULL, &si) || + sr.rsrc != r->slights[i]) + continue; /* no path */ #if SHADCACHE - if (srcblocked(&sr)) /* check shadow cache */ - continue; + if (srcblocked(&sr)) /* check shadow cache */ + continue; #endif - copycolor(sr.cext, r->cext); - copycolor(sr.albedo, r->albedo); - sr.gecc = r->gecc; - sr.slights = r->slights; - rayvalue(&sr); /* eval. source ray */ - if (bright(sr.rcol) <= FTINY) { + copycolor(sr.cext, r->cext); + copycolor(sr.albedo, r->albedo); + sr.gecc = r->gecc; + sr.slights = r->slights; + rayvalue(&sr); /* eval. source ray */ + if (bright(sr.rcol) <= FTINY) { #if SHADCACHE - srcblocker(&sr); /* add blocker to cache */ + srcblocker(&sr); /* add blocker to cache */ #endif - continue; - } - if (r->gecc <= FTINY) /* compute P(theta) */ - d = 1.; - else { - d = DOT(r->rdir, sr.rdir); - d = 1. + r->gecc*r->gecc - 2.*r->gecc*d; - d = (1. - r->gecc*r->gecc) / (d*sqrt(d)); - } + continue; + } + if (r->gecc <= FTINY) /* compute P(theta) */ + d = 1.; + else { + d = DOT(r->rdir, sr.rdir); + d = 1. + r->gecc*r->gecc - 2.*r->gecc*d; + d = (1. - r->gecc*r->gecc) / (d*sqrt(d)); + } /* other factors */ - d *= si.dom * r->rot / (4.*PI*nsamps); + d *= si.dom * r->rot / (4.*PI*nsamps); + scalecolor(sr.rcol, d); + } else { + /* PMAP: Add ambient inscattering from + * volume photons; note we reverse the + * incident ray direction since we're + * now in *backward* raytracing mode! */ + sr.rdir [0] = -r -> rdir [0]; + sr.rdir [1] = -r -> rdir [1]; + sr.rdir [2] = -r -> rdir [2]; + sr.gecc = r -> gecc; + inscatterVolumePmap(&sr, sr.rcol); + scalecolor(sr.rcol, r -> rot / nsamps); + } multcolor(sr.rcol, r->cext); multcolor(sr.rcol, r->albedo); - scalecolor(sr.rcol, d); multcolor(sr.rcol, cvext); addcolor(r->rcol, sr.rcol); /* add it in */ } @@ -592,17 +669,16 @@ srcscatter( /* compute source scattering into ray */ */ static int -weaksrcmat(OBJECT obj) /* identify material */ +weaksrcmat(OBJREC *m) /* identify material */ { - OBJREC *m = findmaterial(objptr(obj)); - + m = findmaterial(m); if (m == NULL) return(0); return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW)); } #define illumblock(m, r) (!(source[r->rsrc].sflags&SVIRTUAL) && \ r->rod > 0.0 && \ - weaksrcmat(source[r->rsrc].so->omod)) + weaksrcmat(source[r->rsrc].so)) /* wrongsource * * @@ -633,10 +709,14 @@ weaksrcmat(OBJECT obj) /* identify material */ * The same is true for stray specular samples, since the specular * contribution from light sources is calculated separately. */ - -#define badcomponent(m, r) (r->crtype&(AMBIENT|SPECULAR) && \ +/* PMAP: Also avoid counting sources via transferred ambient rays (e.g. + * through glass) when photon mapping is enabled, as these indirect + * components are already accounted for. + */ +#define badcomponent(m, r) (srcRayInPmap(r) || \ + (r->crtype&(AMBIENT|SPECULAR) && \ !(r->crtype&SHADOW || r->rod < 0.0 || \ - /* not 100% correct */ distglow(m, r, r->rot))) + /* not 100% correct */ distglow(m, r, r->rot)))) /* passillum * * @@ -658,10 +738,10 @@ weaksrcmat(OBJECT obj) /* identify material */ distglow(m, r, raydist(r,PRIMARY))) -extern int +int m_light( /* ray hit a light source */ - register OBJREC *m, - register RAY *r + OBJREC *m, + RAY *r ) { /* check for over-counting */ @@ -686,9 +766,11 @@ m_light( /* ray hit a light source */ return(1); } /* otherwise treat as source */ - /* check for behind */ - if (r->rod < 0.0) + if (r->rod < 0.0) { /* check for behind */ + if (!backvis) + raytrans(r); /* used to return black */ return(1); + } /* check for outside spot */ if (m->otype==MAT_SPOT && spotout(r, makespot(m))) return(1);