46 |
|
findmaterial(register OBJREC *o) |
47 |
|
{ |
48 |
|
while (!ismaterial(o->otype)) { |
49 |
– |
if (ismixture(o->otype)) |
50 |
– |
return(NULL); /* reject mixed materials */ |
49 |
|
if (o->otype == MOD_ALIAS && o->oargs.nsargs) { |
50 |
|
OBJECT aobj; |
51 |
|
OBJREC *ao; |
55 |
|
ao = objptr(aobj); |
56 |
|
if (ismaterial(ao->otype)) |
57 |
|
return(ao); |
58 |
+ |
if (ao->otype == MOD_ALIAS) { |
59 |
+ |
o = ao; |
60 |
+ |
continue; |
61 |
+ |
} |
62 |
|
} |
63 |
|
if (o->omod == OVOID) |
64 |
|
return(NULL); |
65 |
|
o = objptr(o->omod); |
66 |
|
} |
67 |
< |
return(o); |
67 |
> |
return(o); /* mixtures will return NULL */ |
68 |
|
} |
69 |
|
|
70 |
|
|
86 |
|
continue; |
87 |
|
/* find material */ |
88 |
|
m = findmaterial(objptr(o->omod)); |
89 |
< |
if (m == NULL || !islight(m->otype)) |
89 |
> |
if (m == NULL) |
90 |
> |
continue; |
91 |
> |
if (m->otype == MAT_CLIP) { |
92 |
> |
markclip(m); /* special case for antimatter */ |
93 |
> |
continue; |
94 |
> |
} |
95 |
> |
if (!islight(m->otype)) |
96 |
|
continue; /* not source modifier */ |
97 |
|
|
98 |
|
if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : |
184 |
|
SRCINDEX *si /* source sample index */ |
185 |
|
) |
186 |
|
{ |
187 |
< |
double d; /* distance to source */ |
188 |
< |
register SRCREC *srcp; |
187 |
> |
double d; /* distance to source */ |
188 |
> |
register SRCREC *srcp; |
189 |
|
|
190 |
< |
rayorigin(sr, r, SHADOW, 1.0); /* ignore limits */ |
190 |
> |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
191 |
|
|
192 |
< |
while ((d = nextssamp(sr, si)) != 0.0) { |
193 |
< |
sr->rsrc = si->sn; /* remember source */ |
194 |
< |
srcp = source + si->sn; |
195 |
< |
if (srcp->sflags & SDISTANT) { |
196 |
< |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
197 |
< |
continue; |
198 |
< |
return(1); /* sample OK */ |
199 |
< |
} |
192 |
> |
if (r == NULL) |
193 |
> |
sr->rmax = 0.0; |
194 |
> |
|
195 |
> |
while ((d = nextssamp(sr, si)) != 0.0) { |
196 |
> |
sr->rsrc = si->sn; /* remember source */ |
197 |
> |
srcp = source + si->sn; |
198 |
> |
if (srcp->sflags & SDISTANT) { |
199 |
> |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
200 |
> |
continue; |
201 |
> |
return(1); /* sample OK */ |
202 |
> |
} |
203 |
|
/* local source */ |
204 |
|
/* check proximity */ |
205 |
< |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
195 |
< |
continue; |
196 |
< |
/* check angle */ |
197 |
< |
if (srcp->sflags & SSPOT) { |
198 |
< |
if (spotout(sr, srcp->sl.s)) |
205 |
> |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
206 |
|
continue; |
207 |
+ |
/* check angle */ |
208 |
+ |
if (srcp->sflags & SSPOT) { |
209 |
+ |
if (spotout(sr, srcp->sl.s)) |
210 |
+ |
continue; |
211 |
|
/* adjust solid angle */ |
212 |
< |
si->dom *= d*d; |
213 |
< |
d += srcp->sl.s->flen; |
214 |
< |
si->dom /= d*d; |
212 |
> |
si->dom *= d*d; |
213 |
> |
d += srcp->sl.s->flen; |
214 |
> |
si->dom /= d*d; |
215 |
> |
} |
216 |
> |
return(1); /* sample OK */ |
217 |
|
} |
218 |
< |
return(1); /* sample OK */ |
206 |
< |
} |
207 |
< |
return(0); /* no more samples */ |
218 |
> |
return(0); /* no more samples */ |
219 |
|
} |
220 |
|
|
221 |
|
|
309 |
|
* If it's a glow or transparent illum, just remember it. |
310 |
|
*/ |
311 |
|
if (source[i].sflags & SSKIP) { |
312 |
< |
glowsrc = i; |
312 |
> |
if (glowsrc < 0) |
313 |
> |
glowsrc = i; |
314 |
|
continue; |
315 |
|
} |
316 |
|
if (transillum(source[i].so->omod)) { |
317 |
< |
transrc = i; |
317 |
> |
if (transrc < 0) |
318 |
> |
transrc = i; |
319 |
|
continue; |
320 |
|
} |
321 |
|
r->ro = source[i].so; /* otherwise, use first hit */ |
397 |
|
scp->sno = sr.rsrc; |
398 |
|
/* compute coefficient */ |
399 |
|
(*f)(scp->coef, p, sr.rdir, si.dom); |
400 |
< |
cntord[sn].brt = bright(scp->coef); |
400 |
> |
cntord[sn].brt = intens(scp->coef); |
401 |
|
if (cntord[sn].brt <= 0.0) |
402 |
|
continue; |
403 |
|
#if SHADCACHE |
408 |
|
} |
409 |
|
#endif |
410 |
|
VCOPY(scp->dir, sr.rdir); |
411 |
+ |
copycolor(sr.rcoef, scp->coef); |
412 |
|
/* compute potential */ |
413 |
|
sr.revf = srcvalue; |
414 |
|
rayvalue(&sr); |
415 |
+ |
multcolor(sr.rcol, sr.rcoef); |
416 |
|
copycolor(scp->val, sr.rcol); |
417 |
< |
multcolor(scp->val, scp->coef); |
403 |
< |
cntord[sn].brt = bright(scp->val); |
417 |
> |
cntord[sn].brt = bright(sr.rcol); |
418 |
|
} |
419 |
|
/* sort contributions */ |
420 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
452 |
|
break; |
453 |
|
scp = srccnt + cntord[sn].sndx; |
454 |
|
/* test for hit */ |
455 |
< |
rayorigin(&sr, r, SHADOW, 1.0); |
455 |
> |
rayorigin(&sr, SHADOW, r, NULL); |
456 |
> |
copycolor(sr.rcoef, scp->coef); |
457 |
|
VCOPY(sr.rdir, scp->dir); |
458 |
|
sr.rsrc = scp->sno; |
459 |
|
/* keep statistics */ |
466 |
|
source[scp->sno].sflags & SFOLLOW )) { |
467 |
|
/* follow entire path */ |
468 |
|
raycont(&sr); |
454 |
– |
rayparticipate(&sr); |
469 |
|
if (trace != NULL) |
470 |
|
(*trace)(&sr); /* trace execution */ |
471 |
|
if (bright(sr.rcol) <= FTINY) { |
477 |
|
#endif |
478 |
|
continue; /* missed! */ |
479 |
|
} |
480 |
+ |
rayparticipate(&sr); |
481 |
+ |
multcolor(sr.rcol, sr.rcoef); |
482 |
|
copycolor(scp->val, sr.rcol); |
483 |
< |
multcolor(scp->val, scp->coef); |
483 |
> |
} else if (trace != NULL && |
484 |
> |
(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW)) |
485 |
> |
== (SDISTANT|SFOLLOW) && |
486 |
> |
sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) { |
487 |
> |
(*trace)(&sr); /* trace execution */ |
488 |
> |
/* skip call to rayparticipate() & scp->val update */ |
489 |
|
} |
490 |
|
/* add contribution if hit */ |
491 |
|
addcolor(r->rcol, scp->val); |
507 |
|
scp = srccnt + cntord[sn].sndx; |
508 |
|
prob = hwt * (double)source[scp->sno].nhits / |
509 |
|
(double)source[scp->sno].ntests; |
510 |
< |
if (prob > 1.0) |
511 |
< |
prob = 1.0; |
491 |
< |
scalecolor(scp->val, prob); |
510 |
> |
if (prob < 1.0) |
511 |
> |
scalecolor(scp->val, prob); |
512 |
|
addcolor(r->rcol, scp->val); |
513 |
|
} |
514 |
|
} |
555 |
|
sr.rorg[0] = r->rorg[0] + r->rdir[0]*t; |
556 |
|
sr.rorg[1] = r->rorg[1] + r->rdir[1]*t; |
557 |
|
sr.rorg[2] = r->rorg[2] + r->rdir[2]*t; |
538 |
– |
sr.rmax = 0.; |
558 |
|
initsrcindex(&si); /* sample ray to this source */ |
559 |
|
si.sn = r->slights[i]; |
560 |
|
nopart(&si, &sr); |
686 |
|
) |
687 |
|
{ |
688 |
|
/* check for over-counting */ |
689 |
< |
if (badcomponent(m, r)) |
689 |
> |
if (badcomponent(m, r)) { |
690 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
691 |
|
return(1); |
692 |
< |
if (wrongsource(m, r)) |
692 |
> |
} |
693 |
> |
if (wrongsource(m, r)) { |
694 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
695 |
|
return(1); |
696 |
+ |
} |
697 |
|
/* check for passed illum */ |
698 |
|
if (passillum(m, r)) { |
699 |
|
if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID)) |
701 |
|
raytrans(r); |
702 |
|
return(1); |
703 |
|
} |
704 |
+ |
/* check for invisibility */ |
705 |
+ |
if (srcignore(m, r)) { |
706 |
+ |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
707 |
+ |
return(1); |
708 |
+ |
} |
709 |
|
/* otherwise treat as source */ |
710 |
|
/* check for behind */ |
711 |
|
if (r->rod < 0.0) |
684 |
– |
return(1); |
685 |
– |
/* check for invisibility */ |
686 |
– |
if (srcignore(m, r)) |
712 |
|
return(1); |
713 |
|
/* check for outside spot */ |
714 |
|
if (m->otype==MAT_SPOT && spotout(r, makespot(m))) |