9 |
|
|
10 |
|
#include "ray.h" |
11 |
|
#include "otypes.h" |
12 |
+ |
#include "otspecial.h" |
13 |
|
#include "rtotypes.h" |
14 |
|
#include "source.h" |
15 |
|
#include "random.h" |
16 |
+ |
#include "pmapsrc.h" |
17 |
+ |
#include "pmapmat.h" |
18 |
|
|
16 |
– |
extern double ssampdist; /* scatter sampling distance */ |
17 |
– |
|
19 |
|
#ifndef MAXSSAMP |
20 |
|
#define MAXSSAMP 16 /* maximum samples per ray */ |
21 |
|
#endif |
43 |
|
static int cntcmp(const void *p1, const void *p2); |
44 |
|
|
45 |
|
|
46 |
< |
extern OBJREC * /* find an object's actual material */ |
46 |
< |
findmaterial(register OBJREC *o) |
47 |
< |
{ |
48 |
< |
while (!ismaterial(o->otype)) { |
49 |
< |
if (o->otype == MOD_ALIAS && o->oargs.nsargs) { |
50 |
< |
OBJECT aobj; |
51 |
< |
OBJREC *ao; |
52 |
< |
aobj = lastmod(objndx(o), o->oargs.sarg[0]); |
53 |
< |
if (aobj < 0) |
54 |
< |
objerror(o, USER, "bad reference"); |
55 |
< |
ao = objptr(aobj); |
56 |
< |
if (ismaterial(ao->otype)) |
57 |
< |
return(ao); |
58 |
< |
} |
59 |
< |
if (o->omod == OVOID) |
60 |
< |
return(NULL); |
61 |
< |
o = objptr(o->omod); |
62 |
< |
} |
63 |
< |
return(o); /* mixtures will return NULL */ |
64 |
< |
} |
65 |
< |
|
66 |
< |
|
67 |
< |
extern void |
46 |
> |
void |
47 |
|
marksources(void) /* find and mark source objects */ |
48 |
|
{ |
49 |
|
int foundsource = 0; |
50 |
|
int i; |
51 |
< |
register OBJREC *o, *m; |
52 |
< |
register int ns; |
51 |
> |
OBJREC *o, *m; |
52 |
> |
int ns; |
53 |
|
/* initialize dispatch table */ |
54 |
|
initstypes(); |
55 |
|
/* find direct sources */ |
61 |
|
continue; |
62 |
|
/* find material */ |
63 |
|
m = findmaterial(objptr(o->omod)); |
64 |
< |
if (m == NULL || !islight(m->otype)) |
64 |
> |
if (m == NULL) |
65 |
> |
continue; |
66 |
> |
if (m->otype == MAT_CLIP) { |
67 |
> |
markclip(m); /* special case for antimatter */ |
68 |
> |
continue; |
69 |
> |
} |
70 |
> |
if (!islight(m->otype)) |
71 |
|
continue; /* not source modifier */ |
72 |
|
|
73 |
|
if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : |
74 |
|
m->otype == MAT_SPOT ? 7 : 3)) |
75 |
|
objerror(m, USER, "bad # arguments"); |
76 |
|
|
77 |
+ |
if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) & |
78 |
+ |
(m->oargs.farg[2] <= FTINY)) |
79 |
+ |
continue; /* don't bother */ |
80 |
|
if (m->otype == MAT_GLOW && |
81 |
|
o->otype != OBJ_SOURCE && |
82 |
< |
m->oargs.farg[3] <= FTINY) |
83 |
< |
continue; /* don't bother */ |
84 |
< |
if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY && |
85 |
< |
m->oargs.farg[2] <= FTINY) |
98 |
< |
continue; /* don't bother */ |
99 |
< |
|
82 |
> |
m->oargs.farg[3] <= FTINY) { |
83 |
> |
foundsource += (ambounce > 0); |
84 |
> |
continue; /* don't track these */ |
85 |
> |
} |
86 |
|
if (sfun[o->otype].of == NULL || |
87 |
|
sfun[o->otype].of->setsrc == NULL) |
88 |
|
objerror(o, USER, "illegal material"); |
95 |
|
if (m->otype == MAT_GLOW) { |
96 |
|
source[ns].sflags |= SPROX; |
97 |
|
source[ns].sl.prox = m->oargs.farg[3]; |
98 |
< |
if (source[ns].sflags & SDISTANT) |
98 |
> |
if (source[ns].sflags & SDISTANT) { |
99 |
|
source[ns].sflags |= SSKIP; |
100 |
+ |
foundsource += (ambounce > 0); |
101 |
+ |
} |
102 |
|
} else if (m->otype == MAT_SPOT) { |
103 |
+ |
if (source[ns].sflags & SDISTANT) |
104 |
+ |
objerror(o, WARNING, |
105 |
+ |
"distant source is a spotlight"); |
106 |
|
source[ns].sflags |= SSPOT; |
107 |
|
if ((source[ns].sl.s = makespot(m)) == NULL) |
108 |
|
goto memerr; |
113 |
|
source[ns].sflags |= SSKIP; |
114 |
|
} |
115 |
|
} |
116 |
< |
#if SHADCACHE |
126 |
< |
initobscache(ns); |
127 |
< |
#endif |
128 |
< |
if (!(source[ns].sflags & SSKIP)) |
129 |
< |
foundsource++; |
116 |
> |
foundsource += !(source[ns].sflags & SSKIP); |
117 |
|
} |
118 |
|
if (!foundsource) { |
119 |
|
error(WARNING, "no light sources found"); |
120 |
|
return; |
121 |
|
} |
122 |
< |
markvirtuals(); /* find and add virtual sources */ |
122 |
> |
#if SHADCACHE |
123 |
> |
for (ns = 0; ns < nsources; ns++) /* initialize obstructor cache */ |
124 |
> |
initobscache(ns); |
125 |
> |
#endif |
126 |
> |
/* PMAP: disable virtual sources */ |
127 |
> |
if (!photonMapping) |
128 |
> |
markvirtuals(); /* find and add virtual sources */ |
129 |
> |
|
130 |
|
/* allocate our contribution arrays */ |
131 |
|
maxcntr = nsources + MAXSPART; /* start with this many */ |
132 |
|
srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB)); |
133 |
|
cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR)); |
134 |
< |
if ((srccnt == NULL) | (cntord == NULL)) |
135 |
< |
goto memerr; |
142 |
< |
return; |
134 |
> |
if ((srccnt != NULL) & (cntord != NULL)) |
135 |
> |
return; |
136 |
|
memerr: |
137 |
|
error(SYSTEM, "out of memory in marksources"); |
138 |
|
} |
139 |
|
|
140 |
|
|
141 |
< |
extern void |
141 |
> |
void |
142 |
> |
distantsources(void) /* only mark distant sources */ |
143 |
> |
{ |
144 |
> |
int i; |
145 |
> |
OBJREC *o, *m; |
146 |
> |
int ns; |
147 |
> |
/* initialize dispatch table */ |
148 |
> |
initstypes(); |
149 |
> |
/* sources needed for sourcehit() */ |
150 |
> |
for (i = 0; i < nsceneobjs; i++) { |
151 |
> |
|
152 |
> |
o = objptr(i); |
153 |
> |
|
154 |
> |
if ((o->otype != OBJ_SOURCE) | (o->omod == OVOID)) |
155 |
> |
continue; |
156 |
> |
/* find material */ |
157 |
> |
m = findmaterial(objptr(o->omod)); |
158 |
> |
if (m == NULL) |
159 |
> |
continue; |
160 |
> |
if (!islight(m->otype)) |
161 |
> |
continue; /* not source modifier */ |
162 |
> |
|
163 |
> |
if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : |
164 |
> |
m->otype == MAT_SPOT ? 7 : 3)) |
165 |
> |
objerror(m, USER, "bad # arguments"); |
166 |
> |
|
167 |
> |
if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) & |
168 |
> |
(m->oargs.farg[2] <= FTINY)) |
169 |
> |
continue; /* don't bother */ |
170 |
> |
if (sfun[o->otype].of == NULL || |
171 |
> |
sfun[o->otype].of->setsrc == NULL) |
172 |
> |
objerror(o, USER, "illegal material"); |
173 |
> |
|
174 |
> |
if ((ns = newsource()) < 0) |
175 |
> |
error(SYSTEM, "out of memory in distantsources"); |
176 |
> |
|
177 |
> |
setsource(&source[ns], o); |
178 |
> |
|
179 |
> |
if (m->otype == MAT_GLOW) { |
180 |
> |
source[ns].sflags |= SPROX|SSKIP; |
181 |
> |
source[ns].sl.prox = m->oargs.farg[3]; |
182 |
> |
} else if (m->otype == MAT_SPOT) |
183 |
> |
objerror(o, WARNING, "distant source is a spotlight"); |
184 |
> |
} |
185 |
> |
} |
186 |
> |
|
187 |
> |
|
188 |
> |
void |
189 |
|
freesources(void) /* free all source structures */ |
190 |
|
{ |
191 |
|
if (nsources > 0) { |
197 |
|
source = NULL; |
198 |
|
nsources = 0; |
199 |
|
} |
200 |
+ |
markclip(NULL); |
201 |
|
if (maxcntr <= 0) |
202 |
|
return; |
203 |
|
free((void *)srccnt); |
208 |
|
} |
209 |
|
|
210 |
|
|
211 |
< |
extern int |
211 |
> |
int |
212 |
|
srcray( /* send a ray to a source, return domega */ |
213 |
< |
register RAY *sr, /* returned source ray */ |
213 |
> |
RAY *sr, /* returned source ray */ |
214 |
|
RAY *r, /* ray which hit object */ |
215 |
|
SRCINDEX *si /* source sample index */ |
216 |
|
) |
217 |
|
{ |
218 |
< |
double d; /* distance to source */ |
219 |
< |
register SRCREC *srcp; |
218 |
> |
double d; /* distance to source */ |
219 |
> |
SRCREC *srcp; |
220 |
|
|
221 |
< |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
221 |
> |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
222 |
|
|
223 |
< |
while ((d = nextssamp(sr, si)) != 0.0) { |
224 |
< |
sr->rsrc = si->sn; /* remember source */ |
225 |
< |
srcp = source + si->sn; |
226 |
< |
if (srcp->sflags & SDISTANT) { |
227 |
< |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
228 |
< |
continue; |
229 |
< |
return(1); /* sample OK */ |
230 |
< |
} |
223 |
> |
if (r == NULL) |
224 |
> |
sr->rmax = 0.0; |
225 |
> |
|
226 |
> |
while ((d = nextssamp(sr, si)) != 0.0) { |
227 |
> |
sr->rsrc = si->sn; /* remember source */ |
228 |
> |
srcp = source + si->sn; |
229 |
> |
if (srcp->sflags & SDISTANT) { |
230 |
> |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
231 |
> |
continue; |
232 |
> |
return(1); /* sample OK */ |
233 |
> |
} |
234 |
|
/* local source */ |
235 |
|
/* check proximity */ |
236 |
< |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
193 |
< |
continue; |
194 |
< |
/* check angle */ |
195 |
< |
if (srcp->sflags & SSPOT) { |
196 |
< |
if (spotout(sr, srcp->sl.s)) |
236 |
> |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
237 |
|
continue; |
238 |
+ |
/* check angle */ |
239 |
+ |
if (srcp->sflags & SSPOT) { |
240 |
+ |
if (spotout(sr, srcp->sl.s)) |
241 |
+ |
continue; |
242 |
|
/* adjust solid angle */ |
243 |
< |
si->dom *= d*d; |
244 |
< |
d += srcp->sl.s->flen; |
245 |
< |
si->dom /= d*d; |
243 |
> |
si->dom *= d*d; |
244 |
> |
d += srcp->sl.s->flen; |
245 |
> |
si->dom /= d*d; |
246 |
> |
} |
247 |
> |
return(1); /* sample OK */ |
248 |
|
} |
249 |
< |
return(1); /* sample OK */ |
204 |
< |
} |
205 |
< |
return(0); /* no more samples */ |
249 |
> |
return(0); /* no more samples */ |
250 |
|
} |
251 |
|
|
252 |
|
|
253 |
< |
extern void |
253 |
> |
void |
254 |
|
srcvalue( /* punch ray to source and compute value */ |
255 |
< |
register RAY *r |
255 |
> |
RAY *r |
256 |
|
) |
257 |
|
{ |
258 |
< |
register SRCREC *sp; |
258 |
> |
SRCREC *sp; |
259 |
|
|
260 |
|
sp = &source[r->rsrc]; |
261 |
|
if (sp->sflags & SVIRTUAL) { /* virtual source */ |
307 |
|
} |
308 |
|
|
309 |
|
|
310 |
< |
extern int |
310 |
> |
int |
311 |
|
sourcehit( /* check to see if ray hit distant source */ |
312 |
< |
register RAY *r |
312 |
> |
RAY *r |
313 |
|
) |
314 |
|
{ |
315 |
|
int glowsrc = -1; |
316 |
|
int transrc = -1; |
317 |
|
int first, last; |
318 |
< |
register int i; |
318 |
> |
int i; |
319 |
|
|
320 |
|
if (r->rsrc >= 0) { /* check only one if aimed */ |
321 |
|
first = last = r->rsrc; |
340 |
|
* If it's a glow or transparent illum, just remember it. |
341 |
|
*/ |
342 |
|
if (source[i].sflags & SSKIP) { |
343 |
< |
glowsrc = i; |
343 |
> |
if (glowsrc < 0) |
344 |
> |
glowsrc = i; |
345 |
|
continue; |
346 |
|
} |
347 |
|
if (transillum(source[i].so->omod)) { |
348 |
< |
transrc = i; |
348 |
> |
if (transrc < 0) |
349 |
> |
transrc = i; |
350 |
|
continue; |
351 |
|
} |
352 |
|
r->ro = source[i].so; /* otherwise, use first hit */ |
383 |
|
const void *p2 |
384 |
|
) |
385 |
|
{ |
386 |
< |
register const CNTPTR *sc1 = (const CNTPTR *)p1; |
387 |
< |
register const CNTPTR *sc2 = (const CNTPTR *)p2; |
386 |
> |
const CNTPTR *sc1 = (const CNTPTR *)p1; |
387 |
> |
const CNTPTR *sc2 = (const CNTPTR *)p2; |
388 |
|
|
389 |
|
if (sc1->brt > sc2->brt) |
390 |
|
return(-1); |
394 |
|
} |
395 |
|
|
396 |
|
|
397 |
< |
extern void |
397 |
> |
void |
398 |
|
direct( /* add direct component */ |
399 |
|
RAY *r, /* ray that hit surface */ |
400 |
|
srcdirf_t *f, /* direct component coefficient function */ |
401 |
|
void *p /* data for f */ |
402 |
|
) |
403 |
|
{ |
404 |
< |
register int sn; |
405 |
< |
register CONTRIB *scp; |
404 |
> |
int sn; |
405 |
> |
CONTRIB *scp; |
406 |
|
SRCINDEX si; |
407 |
|
int nshadcheck, ncnts; |
408 |
|
int nhits; |
409 |
|
double prob, ourthresh, hwt; |
410 |
|
RAY sr; |
411 |
+ |
|
412 |
+ |
/* PMAP: Factor in direct photons (primarily for debugging/validation) */ |
413 |
+ |
if (directPhotonMapping) { |
414 |
+ |
(*f)(r -> rcol, p, r -> ron, PI); |
415 |
+ |
multDirectPmap(r); |
416 |
+ |
return; |
417 |
+ |
} |
418 |
+ |
|
419 |
|
/* NOTE: srccnt and cntord global so no recursion */ |
420 |
|
if (nsources <= 0) |
421 |
|
return; /* no sources?! */ |
434 |
|
cntord[sn].sndx = sn; |
435 |
|
scp = srccnt + sn; |
436 |
|
scp->sno = sr.rsrc; |
437 |
< |
/* compute coefficient */ |
384 |
< |
(*f)(scp->coef, p, sr.rdir, si.dom); |
385 |
< |
cntord[sn].brt = bright(scp->coef); |
386 |
< |
if (cntord[sn].brt <= 0.0) |
387 |
< |
continue; |
388 |
< |
#if SHADCACHE |
389 |
< |
/* check shadow cache */ |
437 |
> |
#if SHADCACHE /* check shadow cache */ |
438 |
|
if (si.np == 1 && srcblocked(&sr)) { |
439 |
|
cntord[sn].brt = 0.0; |
440 |
|
continue; |
441 |
|
} |
442 |
|
#endif |
443 |
+ |
/* compute coefficient */ |
444 |
+ |
(*f)(scp->coef, p, sr.rdir, si.dom); |
445 |
+ |
cntord[sn].brt = intens(scp->coef); |
446 |
+ |
if (cntord[sn].brt <= 0.0) |
447 |
+ |
continue; |
448 |
|
VCOPY(scp->dir, sr.rdir); |
449 |
|
copycolor(sr.rcoef, scp->coef); |
450 |
|
/* compute potential */ |
452 |
|
rayvalue(&sr); |
453 |
|
multcolor(sr.rcol, sr.rcoef); |
454 |
|
copycolor(scp->val, sr.rcol); |
455 |
< |
cntord[sn].brt = bright(scp->val); |
455 |
> |
cntord[sn].brt = bright(sr.rcol); |
456 |
|
} |
457 |
|
/* sort contributions */ |
458 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
459 |
|
{ /* find last */ |
460 |
< |
register int l, m; |
460 |
> |
int l, m; |
461 |
|
|
462 |
|
ncnts = l = sn; |
463 |
|
sn = 0; |
477 |
|
/* compute number to check */ |
478 |
|
nshadcheck = pow((double)ncnts, shadcert) + .5; |
479 |
|
/* modify threshold */ |
480 |
< |
ourthresh = shadthresh / r->rweight; |
480 |
> |
if (ncnts > MINSHADCNT) |
481 |
> |
ourthresh = shadthresh / r->rweight; |
482 |
> |
else |
483 |
> |
ourthresh = 0; |
484 |
|
/* test for shadows */ |
485 |
|
for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts; |
486 |
|
hwt += (double)source[scp->sno].nhits / |
493 |
|
break; |
494 |
|
scp = srccnt + cntord[sn].sndx; |
495 |
|
/* test for hit */ |
496 |
< |
rayorigin(&sr, SHADOW, r, scp->coef); |
496 |
> |
rayorigin(&sr, SHADOW, r, NULL); |
497 |
> |
copycolor(sr.rcoef, scp->coef); |
498 |
|
VCOPY(sr.rdir, scp->dir); |
499 |
|
sr.rsrc = scp->sno; |
500 |
|
/* keep statistics */ |
509 |
|
raycont(&sr); |
510 |
|
if (trace != NULL) |
511 |
|
(*trace)(&sr); /* trace execution */ |
455 |
– |
rayparticipate(&sr); |
512 |
|
if (bright(sr.rcol) <= FTINY) { |
513 |
|
#if SHADCACHE |
514 |
|
if ((scp <= srccnt || scp[-1].sno != scp->sno) |
518 |
|
#endif |
519 |
|
continue; /* missed! */ |
520 |
|
} |
521 |
+ |
rayparticipate(&sr); |
522 |
|
multcolor(sr.rcol, sr.rcoef); |
523 |
|
copycolor(scp->val, sr.rcol); |
524 |
|
} else if (trace != NULL && |
555 |
|
} |
556 |
|
|
557 |
|
|
558 |
< |
extern void |
558 |
> |
void |
559 |
|
srcscatter( /* compute source scattering into ray */ |
560 |
< |
register RAY *r |
560 |
> |
RAY *r |
561 |
|
) |
562 |
|
{ |
563 |
|
int oldsampndx; |
569 |
|
COLOR cvext; |
570 |
|
int i, j; |
571 |
|
|
572 |
< |
if (r->slights == NULL || r->slights[0] == 0 |
573 |
< |
|| r->gecc >= 1.-FTINY || r->rot >= FHUGE) |
572 |
> |
if (r->rot >= FHUGE*.99 || r->gecc >= 1.-FTINY) |
573 |
> |
return; /* this can never work */ |
574 |
> |
/* PMAP: do unconditional inscattering for volume photons */ |
575 |
> |
if (!volumePhotonMapping && (r->slights == NULL || r->slights[0] == 0)) |
576 |
|
return; |
577 |
+ |
|
578 |
|
if (ssampdist <= FTINY || (nsamps = r->rot/ssampdist + .5) < 1) |
579 |
|
nsamps = 1; |
580 |
|
#if MAXSSAMP |
583 |
|
#endif |
584 |
|
oldsampndx = samplendx; |
585 |
|
samplendx = random()&0x7fff; /* randomize */ |
586 |
< |
for (i = r->slights[0]; i > 0; i--) { /* for each source */ |
586 |
> |
for (i = volumePhotonMapping ? 1 : r->slights[0]; i > 0; i--) { |
587 |
> |
/* for each source OR once if volume photon map enabled */ |
588 |
|
for (j = 0; j < nsamps; j++) { /* for each sample position */ |
589 |
|
samplendx++; |
590 |
|
t = r->rot * (j+frandom())/nsamps; |
600 |
|
sr.rorg[0] = r->rorg[0] + r->rdir[0]*t; |
601 |
|
sr.rorg[1] = r->rorg[1] + r->rdir[1]*t; |
602 |
|
sr.rorg[2] = r->rorg[2] + r->rdir[2]*t; |
603 |
< |
sr.rmax = 0.; |
604 |
< |
initsrcindex(&si); /* sample ray to this source */ |
605 |
< |
si.sn = r->slights[i]; |
606 |
< |
nopart(&si, &sr); |
607 |
< |
if (!srcray(&sr, NULL, &si) || |
608 |
< |
sr.rsrc != r->slights[i]) |
609 |
< |
continue; /* no path */ |
603 |
> |
|
604 |
> |
if (!volumePhotonMapping) { |
605 |
> |
initsrcindex(&si); /* sample ray to this source */ |
606 |
> |
si.sn = r->slights[i]; |
607 |
> |
nopart(&si, &sr); |
608 |
> |
if (!srcray(&sr, NULL, &si) || |
609 |
> |
sr.rsrc != r->slights[i]) |
610 |
> |
continue; /* no path */ |
611 |
|
#if SHADCACHE |
612 |
< |
if (srcblocked(&sr)) /* check shadow cache */ |
613 |
< |
continue; |
612 |
> |
if (srcblocked(&sr)) /* check shadow cache */ |
613 |
> |
continue; |
614 |
|
#endif |
615 |
< |
copycolor(sr.cext, r->cext); |
616 |
< |
copycolor(sr.albedo, r->albedo); |
617 |
< |
sr.gecc = r->gecc; |
618 |
< |
sr.slights = r->slights; |
619 |
< |
rayvalue(&sr); /* eval. source ray */ |
620 |
< |
if (bright(sr.rcol) <= FTINY) { |
615 |
> |
copycolor(sr.cext, r->cext); |
616 |
> |
copycolor(sr.albedo, r->albedo); |
617 |
> |
sr.gecc = r->gecc; |
618 |
> |
sr.slights = r->slights; |
619 |
> |
rayvalue(&sr); /* eval. source ray */ |
620 |
> |
if (bright(sr.rcol) <= FTINY) { |
621 |
|
#if SHADCACHE |
622 |
< |
srcblocker(&sr); /* add blocker to cache */ |
622 |
> |
srcblocker(&sr); /* add blocker to cache */ |
623 |
|
#endif |
624 |
< |
continue; |
625 |
< |
} |
626 |
< |
if (r->gecc <= FTINY) /* compute P(theta) */ |
627 |
< |
d = 1.; |
628 |
< |
else { |
629 |
< |
d = DOT(r->rdir, sr.rdir); |
630 |
< |
d = 1. + r->gecc*r->gecc - 2.*r->gecc*d; |
631 |
< |
d = (1. - r->gecc*r->gecc) / (d*sqrt(d)); |
632 |
< |
} |
624 |
> |
continue; |
625 |
> |
} |
626 |
> |
if (r->gecc <= FTINY) /* compute P(theta) */ |
627 |
> |
d = 1.; |
628 |
> |
else { |
629 |
> |
d = DOT(r->rdir, sr.rdir); |
630 |
> |
d = 1. + r->gecc*r->gecc - 2.*r->gecc*d; |
631 |
> |
d = (1. - r->gecc*r->gecc) / (d*sqrt(d)); |
632 |
> |
} |
633 |
|
/* other factors */ |
634 |
< |
d *= si.dom * r->rot / (4.*PI*nsamps); |
634 |
> |
d *= si.dom * r->rot / (4.*PI*nsamps); |
635 |
> |
scalecolor(sr.rcol, d); |
636 |
> |
} else { |
637 |
> |
/* PMAP: Add ambient inscattering from |
638 |
> |
* volume photons; note we reverse the |
639 |
> |
* incident ray direction since we're |
640 |
> |
* now in *backward* raytracing mode! */ |
641 |
> |
sr.rdir [0] = -r -> rdir [0]; |
642 |
> |
sr.rdir [1] = -r -> rdir [1]; |
643 |
> |
sr.rdir [2] = -r -> rdir [2]; |
644 |
> |
sr.gecc = r -> gecc; |
645 |
> |
inscatterVolumePmap(&sr, sr.rcol); |
646 |
> |
scalecolor(sr.rcol, r -> rot / nsamps); |
647 |
> |
} |
648 |
|
multcolor(sr.rcol, r->cext); |
649 |
|
multcolor(sr.rcol, r->albedo); |
575 |
– |
scalecolor(sr.rcol, d); |
650 |
|
multcolor(sr.rcol, cvext); |
651 |
|
addcolor(r->rcol, sr.rcol); /* add it in */ |
652 |
|
} |
713 |
|
* The same is true for stray specular samples, since the specular |
714 |
|
* contribution from light sources is calculated separately. |
715 |
|
*/ |
716 |
< |
|
717 |
< |
#define badcomponent(m, r) (r->crtype&(AMBIENT|SPECULAR) && \ |
716 |
> |
/* PMAP: Also avoid counting sources via transferred ambient rays (e.g. |
717 |
> |
* through glass) when photon mapping is enabled, as these indirect |
718 |
> |
* components are already accounted for. |
719 |
> |
*/ |
720 |
> |
#define badcomponent(m, r) (srcRayInPmap(r) || \ |
721 |
> |
(r->crtype&(AMBIENT|SPECULAR) && \ |
722 |
|
!(r->crtype&SHADOW || r->rod < 0.0 || \ |
723 |
< |
/* not 100% correct */ distglow(m, r, r->rot))) |
723 |
> |
/* not 100% correct */ distglow(m, r, r->rot)))) |
724 |
|
|
725 |
|
/* passillum * |
726 |
|
* |
742 |
|
distglow(m, r, raydist(r,PRIMARY))) |
743 |
|
|
744 |
|
|
745 |
< |
extern int |
745 |
> |
int |
746 |
|
m_light( /* ray hit a light source */ |
747 |
< |
register OBJREC *m, |
748 |
< |
register RAY *r |
747 |
> |
OBJREC *m, |
748 |
> |
RAY *r |
749 |
|
) |
750 |
|
{ |
751 |
|
/* check for over-counting */ |