7 |
|
* External symbols declared in source.h |
8 |
|
*/ |
9 |
|
|
10 |
– |
#include "copyright.h" |
11 |
– |
|
10 |
|
#include "ray.h" |
13 |
– |
|
11 |
|
#include "otypes.h" |
12 |
< |
|
12 |
> |
#include "rtotypes.h" |
13 |
|
#include "source.h" |
17 |
– |
|
14 |
|
#include "random.h" |
15 |
|
|
16 |
|
extern double ssampdist; /* scatter sampling distance */ |
39 |
|
static CNTPTR *cntord; /* source ordering in direct() */ |
40 |
|
static int maxcntr = 0; /* size of contribution arrays */ |
41 |
|
|
42 |
+ |
static int cntcmp(const void *p1, const void *p2); |
43 |
|
|
44 |
< |
void |
45 |
< |
marksources() /* find and mark source objects */ |
44 |
> |
|
45 |
> |
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 |
+ |
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); /* mixtures will return NULL */ |
68 |
+ |
} |
69 |
+ |
|
70 |
+ |
|
71 |
+ |
extern void |
72 |
+ |
marksources(void) /* find and mark source objects */ |
73 |
+ |
{ |
74 |
|
int foundsource = 0; |
75 |
|
int i; |
76 |
|
register OBJREC *o, *m; |
85 |
|
if (!issurface(o->otype) || o->omod == OVOID) |
86 |
|
continue; |
87 |
|
/* find material */ |
88 |
< |
m = objptr(o->omod); |
89 |
< |
while (!ismaterial(m->otype)) |
90 |
< |
if (ismixture(m->otype) || m->omod == OVOID) { |
91 |
< |
m = NULL; |
92 |
< |
break; |
93 |
< |
} else |
94 |
< |
m = objptr(m->omod); |
95 |
< |
if (m == NULL || !islight(m->otype)) |
88 |
> |
m = findmaterial(objptr(o->omod)); |
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 : |
99 |
|
m->otype == MAT_SPOT ? 7 : 3)) |
100 |
|
objerror(m, USER, "bad # arguments"); |
101 |
|
|
78 |
– |
if (m->otype == MAT_GLOW && |
79 |
– |
o->otype != OBJ_SOURCE && |
80 |
– |
m->oargs.farg[3] <= FTINY) |
81 |
– |
continue; /* don't bother */ |
102 |
|
if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY && |
103 |
|
m->oargs.farg[2] <= FTINY) |
104 |
|
continue; /* don't bother */ |
105 |
< |
|
105 |
> |
if (m->otype == MAT_GLOW && |
106 |
> |
o->otype != OBJ_SOURCE && |
107 |
> |
m->oargs.farg[3] <= FTINY) { |
108 |
> |
foundsource += (ambounce > 0); |
109 |
> |
continue; /* don't track these */ |
110 |
> |
} |
111 |
|
if (sfun[o->otype].of == NULL || |
112 |
|
sfun[o->otype].of->setsrc == NULL) |
113 |
|
objerror(o, USER, "illegal material"); |
120 |
|
if (m->otype == MAT_GLOW) { |
121 |
|
source[ns].sflags |= SPROX; |
122 |
|
source[ns].sl.prox = m->oargs.farg[3]; |
123 |
< |
if (source[ns].sflags & SDISTANT) |
123 |
> |
if (source[ns].sflags & SDISTANT) { |
124 |
|
source[ns].sflags |= SSKIP; |
125 |
+ |
foundsource += (ambounce > 0); |
126 |
+ |
} |
127 |
|
} else if (m->otype == MAT_SPOT) { |
128 |
|
source[ns].sflags |= SSPOT; |
129 |
|
if ((source[ns].sl.s = makespot(m)) == NULL) |
135 |
|
source[ns].sflags |= SSKIP; |
136 |
|
} |
137 |
|
} |
138 |
< |
if (!(source[ns].sflags & SSKIP)) |
139 |
< |
foundsource++; |
138 |
> |
#if SHADCACHE |
139 |
> |
initobscache(ns); |
140 |
> |
#endif |
141 |
> |
foundsource += !(source[ns].sflags & SSKIP); |
142 |
|
} |
143 |
|
if (!foundsource) { |
144 |
|
error(WARNING, "no light sources found"); |
157 |
|
} |
158 |
|
|
159 |
|
|
160 |
< |
void |
161 |
< |
freesources() /* free all source structures */ |
160 |
> |
extern void |
161 |
> |
freesources(void) /* free all source structures */ |
162 |
|
{ |
163 |
|
if (nsources > 0) { |
164 |
+ |
#if SHADCACHE |
165 |
+ |
while (nsources--) |
166 |
+ |
freeobscache(&source[nsources]); |
167 |
+ |
#endif |
168 |
|
free((void *)source); |
169 |
|
source = NULL; |
170 |
|
nsources = 0; |
171 |
|
} |
172 |
+ |
markclip(NULL); |
173 |
|
if (maxcntr <= 0) |
174 |
|
return; |
175 |
|
free((void *)srccnt); |
180 |
|
} |
181 |
|
|
182 |
|
|
183 |
< |
int |
184 |
< |
srcray(sr, r, si) /* send a ray to a source, return domega */ |
185 |
< |
register RAY *sr; /* returned source ray */ |
186 |
< |
RAY *r; /* ray which hit object */ |
187 |
< |
SRCINDEX *si; /* source sample index */ |
183 |
> |
extern int |
184 |
> |
srcray( /* send a ray to a source, return domega */ |
185 |
> |
register RAY *sr, /* returned source ray */ |
186 |
> |
RAY *r, /* ray which hit object */ |
187 |
> |
SRCINDEX *si /* source sample index */ |
188 |
> |
) |
189 |
|
{ |
190 |
< |
double d; /* distance to source */ |
191 |
< |
register SRCREC *srcp; |
190 |
> |
double d; /* distance to source */ |
191 |
> |
register SRCREC *srcp; |
192 |
|
|
193 |
< |
rayorigin(sr, r, SHADOW, 1.0); /* ignore limits */ |
193 |
> |
rayorigin(sr, SHADOW, r, NULL); /* ignore limits */ |
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 |
< |
} |
195 |
> |
if (r == NULL) |
196 |
> |
sr->rmax = 0.0; |
197 |
> |
|
198 |
> |
while ((d = nextssamp(sr, si)) != 0.0) { |
199 |
> |
sr->rsrc = si->sn; /* remember source */ |
200 |
> |
srcp = source + si->sn; |
201 |
> |
if (srcp->sflags & SDISTANT) { |
202 |
> |
if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s)) |
203 |
> |
continue; |
204 |
> |
return(1); /* sample OK */ |
205 |
> |
} |
206 |
|
/* local source */ |
207 |
|
/* check proximity */ |
208 |
< |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
171 |
< |
continue; |
172 |
< |
/* check angle */ |
173 |
< |
if (srcp->sflags & SSPOT) { |
174 |
< |
if (spotout(sr, srcp->sl.s)) |
208 |
> |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
209 |
|
continue; |
210 |
+ |
/* check angle */ |
211 |
+ |
if (srcp->sflags & SSPOT) { |
212 |
+ |
if (spotout(sr, srcp->sl.s)) |
213 |
+ |
continue; |
214 |
|
/* adjust solid angle */ |
215 |
< |
si->dom *= d*d; |
216 |
< |
d += srcp->sl.s->flen; |
217 |
< |
si->dom /= d*d; |
215 |
> |
si->dom *= d*d; |
216 |
> |
d += srcp->sl.s->flen; |
217 |
> |
si->dom /= d*d; |
218 |
> |
} |
219 |
> |
return(1); /* sample OK */ |
220 |
|
} |
221 |
< |
return(1); /* sample OK */ |
182 |
< |
} |
183 |
< |
return(0); /* no more samples */ |
221 |
> |
return(0); /* no more samples */ |
222 |
|
} |
223 |
|
|
224 |
|
|
225 |
< |
void |
226 |
< |
srcvalue(r) /* punch ray to source and compute value */ |
227 |
< |
register RAY *r; |
225 |
> |
extern void |
226 |
> |
srcvalue( /* punch ray to source and compute value */ |
227 |
> |
register RAY *r |
228 |
> |
) |
229 |
|
{ |
230 |
|
register SRCREC *sp; |
231 |
|
|
264 |
|
} |
265 |
|
|
266 |
|
|
267 |
< |
int |
268 |
< |
sourcehit(r) /* check to see if ray hit distant source */ |
269 |
< |
register RAY *r; |
267 |
> |
static int |
268 |
> |
transillum( /* check if material is transparent illum */ |
269 |
> |
OBJECT obj |
270 |
> |
) |
271 |
|
{ |
272 |
+ |
OBJREC *m = findmaterial(objptr(obj)); |
273 |
+ |
|
274 |
+ |
if (m == NULL) |
275 |
+ |
return(1); |
276 |
+ |
if (m->otype != MAT_ILLUM) |
277 |
+ |
return(0); |
278 |
+ |
return(!m->oargs.nsargs || !strcmp(m->oargs.sarg[0], VOIDID)); |
279 |
+ |
} |
280 |
+ |
|
281 |
+ |
|
282 |
+ |
extern int |
283 |
+ |
sourcehit( /* check to see if ray hit distant source */ |
284 |
+ |
register RAY *r |
285 |
+ |
) |
286 |
+ |
{ |
287 |
+ |
int glowsrc = -1; |
288 |
+ |
int transrc = -1; |
289 |
|
int first, last; |
290 |
|
register int i; |
291 |
|
|
294 |
|
} else { /* otherwise check all */ |
295 |
|
first = 0; last = nsources-1; |
296 |
|
} |
297 |
< |
for (i = first; i <= last; i++) |
298 |
< |
if ((source[i].sflags & (SDISTANT|SVIRTUAL)) == SDISTANT) |
299 |
< |
/* |
300 |
< |
* Check to see if ray is within |
301 |
< |
* solid angle of source. |
302 |
< |
*/ |
303 |
< |
if (2.0*PI * (1.0 - DOT(source[i].sloc,r->rdir)) |
304 |
< |
<= source[i].ss2) { |
305 |
< |
r->ro = source[i].so; |
306 |
< |
if (!(source[i].sflags & SSKIP)) |
307 |
< |
break; |
308 |
< |
} |
309 |
< |
|
310 |
< |
if (r->ro != NULL) { |
311 |
< |
r->robj = objndx(r->ro); |
312 |
< |
for (i = 0; i < 3; i++) |
313 |
< |
r->ron[i] = -r->rdir[i]; |
314 |
< |
r->rod = 1.0; |
315 |
< |
r->pert[0] = r->pert[1] = r->pert[2] = 0.0; |
316 |
< |
r->uv[0] = r->uv[1] = 0.0; |
317 |
< |
r->rox = NULL; |
318 |
< |
return(1); |
297 |
> |
for (i = first; i <= last; i++) { |
298 |
> |
if ((source[i].sflags & (SDISTANT|SVIRTUAL)) != SDISTANT) |
299 |
> |
continue; |
300 |
> |
/* |
301 |
> |
* Check to see if ray is within |
302 |
> |
* solid angle of source. |
303 |
> |
*/ |
304 |
> |
if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2) |
305 |
> |
continue; |
306 |
> |
/* is it the only possibility? */ |
307 |
> |
if (first == last) { |
308 |
> |
r->ro = source[i].so; |
309 |
> |
break; |
310 |
> |
} |
311 |
> |
/* |
312 |
> |
* If it's a glow or transparent illum, just remember it. |
313 |
> |
*/ |
314 |
> |
if (source[i].sflags & SSKIP) { |
315 |
> |
if (glowsrc < 0) |
316 |
> |
glowsrc = i; |
317 |
> |
continue; |
318 |
> |
} |
319 |
> |
if (transillum(source[i].so->omod)) { |
320 |
> |
if (transrc < 0) |
321 |
> |
transrc = i; |
322 |
> |
continue; |
323 |
> |
} |
324 |
> |
r->ro = source[i].so; /* otherwise, use first hit */ |
325 |
> |
break; |
326 |
|
} |
327 |
< |
return(0); |
327 |
> |
/* |
328 |
> |
* Do we need fallback? |
329 |
> |
*/ |
330 |
> |
if (r->ro == NULL) { |
331 |
> |
if (transrc >= 0 && r->crtype & (AMBIENT|SPECULAR)) |
332 |
> |
return(0); /* avoid overcounting */ |
333 |
> |
if (glowsrc >= 0) |
334 |
> |
r->ro = source[glowsrc].so; |
335 |
> |
else |
336 |
> |
return(0); /* nothing usable */ |
337 |
> |
} |
338 |
> |
/* |
339 |
> |
* Make assignments. |
340 |
> |
*/ |
341 |
> |
r->robj = objndx(r->ro); |
342 |
> |
for (i = 0; i < 3; i++) |
343 |
> |
r->ron[i] = -r->rdir[i]; |
344 |
> |
r->rod = 1.0; |
345 |
> |
r->pert[0] = r->pert[1] = r->pert[2] = 0.0; |
346 |
> |
r->uv[0] = r->uv[1] = 0.0; |
347 |
> |
r->rox = NULL; |
348 |
> |
return(1); |
349 |
|
} |
350 |
|
|
351 |
|
|
352 |
|
static int |
353 |
< |
cntcmp(sc1, sc2) /* contribution compare (descending) */ |
354 |
< |
register CNTPTR *sc1, *sc2; |
353 |
> |
cntcmp( /* contribution compare (descending) */ |
354 |
> |
const void *p1, |
355 |
> |
const void *p2 |
356 |
> |
) |
357 |
|
{ |
358 |
+ |
register const CNTPTR *sc1 = (const CNTPTR *)p1; |
359 |
+ |
register const CNTPTR *sc2 = (const CNTPTR *)p2; |
360 |
+ |
|
361 |
|
if (sc1->brt > sc2->brt) |
362 |
|
return(-1); |
363 |
|
if (sc1->brt < sc2->brt) |
366 |
|
} |
367 |
|
|
368 |
|
|
369 |
< |
void |
370 |
< |
direct(r, f, p) /* add direct component */ |
371 |
< |
RAY *r; /* ray that hit surface */ |
372 |
< |
void (*f)(); /* direct component coefficient function */ |
373 |
< |
char *p; /* data for f */ |
369 |
> |
extern void |
370 |
> |
direct( /* add direct component */ |
371 |
> |
RAY *r, /* ray that hit surface */ |
372 |
> |
srcdirf_t *f, /* direct component coefficient function */ |
373 |
> |
void *p /* data for f */ |
374 |
> |
) |
375 |
|
{ |
285 |
– |
extern void (*trace)(); |
376 |
|
register int sn; |
377 |
|
register CONTRIB *scp; |
378 |
|
SRCINDEX si; |
400 |
|
scp->sno = sr.rsrc; |
401 |
|
/* compute coefficient */ |
402 |
|
(*f)(scp->coef, p, sr.rdir, si.dom); |
403 |
< |
cntord[sn].brt = bright(scp->coef); |
403 |
> |
cntord[sn].brt = intens(scp->coef); |
404 |
|
if (cntord[sn].brt <= 0.0) |
405 |
|
continue; |
406 |
+ |
#if SHADCACHE |
407 |
+ |
/* check shadow cache */ |
408 |
+ |
if (si.np == 1 && srcblocked(&sr)) { |
409 |
+ |
cntord[sn].brt = 0.0; |
410 |
+ |
continue; |
411 |
+ |
} |
412 |
+ |
#endif |
413 |
|
VCOPY(scp->dir, sr.rdir); |
414 |
+ |
copycolor(sr.rcoef, scp->coef); |
415 |
|
/* compute potential */ |
416 |
|
sr.revf = srcvalue; |
417 |
|
rayvalue(&sr); |
418 |
+ |
multcolor(sr.rcol, sr.rcoef); |
419 |
|
copycolor(scp->val, sr.rcol); |
420 |
< |
multcolor(scp->val, scp->coef); |
322 |
< |
cntord[sn].brt = bright(scp->val); |
420 |
> |
cntord[sn].brt = bright(sr.rcol); |
421 |
|
} |
422 |
|
/* sort contributions */ |
423 |
|
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
455 |
|
break; |
456 |
|
scp = srccnt + cntord[sn].sndx; |
457 |
|
/* test for hit */ |
458 |
< |
rayorigin(&sr, r, SHADOW, 1.0); |
458 |
> |
rayorigin(&sr, SHADOW, r, NULL); |
459 |
> |
copycolor(sr.rcoef, scp->coef); |
460 |
|
VCOPY(sr.rdir, scp->dir); |
461 |
|
sr.rsrc = scp->sno; |
462 |
|
/* keep statistics */ |
469 |
|
source[scp->sno].sflags & SFOLLOW )) { |
470 |
|
/* follow entire path */ |
471 |
|
raycont(&sr); |
373 |
– |
rayparticipate(&sr); |
472 |
|
if (trace != NULL) |
473 |
|
(*trace)(&sr); /* trace execution */ |
474 |
< |
if (bright(sr.rcol) <= FTINY) |
474 |
> |
if (bright(sr.rcol) <= FTINY) { |
475 |
> |
#if SHADCACHE |
476 |
> |
if ((scp <= srccnt || scp[-1].sno != scp->sno) |
477 |
> |
&& (scp >= srccnt+ncnts-1 || |
478 |
> |
scp[1].sno != scp->sno)) |
479 |
> |
srcblocker(&sr); |
480 |
> |
#endif |
481 |
|
continue; /* missed! */ |
482 |
+ |
} |
483 |
+ |
rayparticipate(&sr); |
484 |
+ |
multcolor(sr.rcol, sr.rcoef); |
485 |
|
copycolor(scp->val, sr.rcol); |
486 |
< |
multcolor(scp->val, scp->coef); |
486 |
> |
} else if (trace != NULL && |
487 |
> |
(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW)) |
488 |
> |
== (SDISTANT|SFOLLOW) && |
489 |
> |
sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) { |
490 |
> |
(*trace)(&sr); /* trace execution */ |
491 |
> |
/* skip call to rayparticipate() & scp->val update */ |
492 |
|
} |
493 |
|
/* add contribution if hit */ |
494 |
|
addcolor(r->rcol, scp->val); |
510 |
|
scp = srccnt + cntord[sn].sndx; |
511 |
|
prob = hwt * (double)source[scp->sno].nhits / |
512 |
|
(double)source[scp->sno].ntests; |
513 |
< |
if (prob > 1.0) |
514 |
< |
prob = 1.0; |
403 |
< |
scalecolor(scp->val, prob); |
513 |
> |
if (prob < 1.0) |
514 |
> |
scalecolor(scp->val, prob); |
515 |
|
addcolor(r->rcol, scp->val); |
516 |
|
} |
517 |
|
} |
518 |
|
|
519 |
|
|
520 |
< |
void |
521 |
< |
srcscatter(r) /* compute source scattering into ray */ |
522 |
< |
register RAY *r; |
520 |
> |
extern void |
521 |
> |
srcscatter( /* compute source scattering into ray */ |
522 |
> |
register RAY *r |
523 |
> |
) |
524 |
|
{ |
525 |
|
int oldsampndx; |
526 |
|
int nsamps; |
558 |
|
sr.rorg[0] = r->rorg[0] + r->rdir[0]*t; |
559 |
|
sr.rorg[1] = r->rorg[1] + r->rdir[1]*t; |
560 |
|
sr.rorg[2] = r->rorg[2] + r->rdir[2]*t; |
449 |
– |
sr.rmax = 0.; |
561 |
|
initsrcindex(&si); /* sample ray to this source */ |
562 |
|
si.sn = r->slights[i]; |
563 |
|
nopart(&si, &sr); |
564 |
|
if (!srcray(&sr, NULL, &si) || |
565 |
|
sr.rsrc != r->slights[i]) |
566 |
|
continue; /* no path */ |
567 |
+ |
#if SHADCACHE |
568 |
+ |
if (srcblocked(&sr)) /* check shadow cache */ |
569 |
+ |
continue; |
570 |
+ |
#endif |
571 |
|
copycolor(sr.cext, r->cext); |
572 |
|
copycolor(sr.albedo, r->albedo); |
573 |
|
sr.gecc = r->gecc; |
574 |
|
sr.slights = r->slights; |
575 |
|
rayvalue(&sr); /* eval. source ray */ |
576 |
< |
if (bright(sr.rcol) <= FTINY) |
576 |
> |
if (bright(sr.rcol) <= FTINY) { |
577 |
> |
#if SHADCACHE |
578 |
> |
srcblocker(&sr); /* add blocker to cache */ |
579 |
> |
#endif |
580 |
|
continue; |
581 |
+ |
} |
582 |
|
if (r->gecc <= FTINY) /* compute P(theta) */ |
583 |
|
d = 1.; |
584 |
|
else { |
616 |
|
*/ |
617 |
|
|
618 |
|
static int |
619 |
< |
weaksrcmat(int obj) /* identify material */ |
619 |
> |
weaksrcmat(OBJECT obj) /* identify material */ |
620 |
|
{ |
621 |
< |
register OBJREC *o = objptr(obj); |
621 |
> |
OBJREC *m = findmaterial(objptr(obj)); |
622 |
|
|
623 |
< |
while (!ismaterial(o->otype)) /* find material */ |
624 |
< |
o = objptr(o->omod); |
506 |
< |
return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW)); |
623 |
> |
if (m == NULL) return(0); |
624 |
> |
return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW)); |
625 |
|
} |
626 |
|
|
627 |
|
#define illumblock(m, r) (!(source[r->rsrc].sflags&SVIRTUAL) && \ |
682 |
|
distglow(m, r, raydist(r,PRIMARY))) |
683 |
|
|
684 |
|
|
685 |
< |
int |
686 |
< |
m_light(m, r) /* ray hit a light source */ |
687 |
< |
register OBJREC *m; |
688 |
< |
register RAY *r; |
685 |
> |
extern int |
686 |
> |
m_light( /* ray hit a light source */ |
687 |
> |
register OBJREC *m, |
688 |
> |
register RAY *r |
689 |
> |
) |
690 |
|
{ |
691 |
|
/* check for over-counting */ |
692 |
< |
if (badcomponent(m, r)) |
692 |
> |
if (badcomponent(m, r)) { |
693 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
694 |
|
return(1); |
695 |
< |
if (wrongsource(m, r)) |
695 |
> |
} |
696 |
> |
if (wrongsource(m, r)) { |
697 |
> |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
698 |
|
return(1); |
699 |
+ |
} |
700 |
|
/* check for passed illum */ |
701 |
|
if (passillum(m, r)) { |
702 |
|
if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID)) |
704 |
|
raytrans(r); |
705 |
|
return(1); |
706 |
|
} |
707 |
+ |
/* check for invisibility */ |
708 |
+ |
if (srcignore(m, r)) { |
709 |
+ |
setcolor(r->rcoef, 0.0, 0.0, 0.0); |
710 |
+ |
return(1); |
711 |
+ |
} |
712 |
|
/* otherwise treat as source */ |
713 |
|
/* check for behind */ |
714 |
|
if (r->rod < 0.0) |
587 |
– |
return(1); |
588 |
– |
/* check for invisibility */ |
589 |
– |
if (srcignore(m, r)) |
715 |
|
return(1); |
716 |
|
/* check for outside spot */ |
717 |
|
if (m->otype==MAT_SPOT && spotout(r, makespot(m))) |