68 |
|
o->otype != OBJ_SOURCE && |
69 |
|
m->oargs.farg[3] <= FTINY) |
70 |
|
continue; /* don't bother */ |
71 |
+ |
if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY && |
72 |
+ |
m->oargs.farg[2] <= FTINY) |
73 |
+ |
continue; /* don't bother */ |
74 |
|
|
75 |
|
if (sfun[o->otype].of == NULL || |
76 |
|
sfun[o->otype].of->setsrc == NULL) |
155 |
|
|
156 |
|
|
157 |
|
srcvalue(r) /* punch ray to source and compute value */ |
158 |
< |
RAY *r; |
158 |
> |
register RAY *r; |
159 |
|
{ |
160 |
|
register SRCREC *sp; |
161 |
|
|
164 |
|
/* check intersection */ |
165 |
|
if (!(*ofun[sp->so->otype].funp)(sp->so, r)) |
166 |
|
return; |
167 |
< |
raycont(r); /* compute contribution */ |
167 |
> |
if (!rayshade(r, r->ro->omod)) /* compute contribution */ |
168 |
> |
goto nomat; |
169 |
|
return; |
170 |
|
} |
171 |
|
/* compute intersection */ |
173 |
|
(*ofun[sp->so->otype].funp)(sp->so, r)) { |
174 |
|
if (sp->sa.success >= 0) |
175 |
|
sp->sa.success++; |
176 |
< |
raycont(r); /* compute contribution */ |
176 |
> |
if (!rayshade(r, r->ro->omod)) /* compute contribution */ |
177 |
> |
goto nomat; |
178 |
|
return; |
179 |
|
} |
180 |
+ |
/* we missed our mark! */ |
181 |
|
if (sp->sa.success < 0) |
182 |
|
return; /* bitched already */ |
183 |
|
sp->sa.success -= AIMREQT; |
186 |
|
sprintf(errmsg, "aiming failure for light source \"%s\"", |
187 |
|
sp->so->oname); |
188 |
|
error(WARNING, errmsg); /* issue warning */ |
189 |
+ |
return; |
190 |
+ |
nomat: |
191 |
+ |
objerror(r->ro, USER, "material not found"); |
192 |
|
} |
193 |
|
|
194 |
|
|
327 |
|
( sr.ro != source[scp->sno].so || |
328 |
|
source[scp->sno].sflags & SFOLLOW )) { |
329 |
|
/* follow entire path */ |
330 |
< |
raycont(&sr); |
330 |
> |
if (!raycont(&sr)) |
331 |
> |
objerror(sr.ro, USER, "material not found"); |
332 |
|
if (trace != NULL) |
333 |
|
(*trace)(&sr); /* trace execution */ |
334 |
|
if (bright(sr.rcol) <= FTINY) |
448 |
|
{ |
449 |
|
/* check for over-counting */ |
450 |
|
if (badcomponent(m, r)) |
451 |
< |
return; |
451 |
> |
return(1); |
452 |
|
if (wrongsource(m,r)) |
453 |
< |
return; |
453 |
> |
return(1); |
454 |
|
/* check for passed illum */ |
455 |
|
if (passillum(m, r)) { |
456 |
< |
if (m->oargs.nsargs < 1 || !strcmp(m->oargs.sarg[0], VOIDID)) |
457 |
< |
raytrans(r); |
458 |
< |
else |
459 |
< |
rayshade(r, modifier(m->oargs.sarg[0])); |
450 |
< |
return; |
456 |
> |
if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID)) |
457 |
> |
return(rayshade(r, modifier(m->oargs.sarg[0]))); |
458 |
> |
raytrans(r); |
459 |
> |
return(1); |
460 |
|
} |
461 |
|
/* otherwise treat as source */ |
462 |
|
/* check for behind */ |
463 |
|
if (r->rod < 0.0) |
464 |
< |
return; |
464 |
> |
return(1); |
465 |
|
/* check for invisibility */ |
466 |
|
if (srcignore(m, r)) |
467 |
< |
return; |
467 |
> |
return(1); |
468 |
|
/* check for outside spot */ |
469 |
|
if (m->otype==MAT_SPOT && spotout(r, makespot(m), r->rot>=FHUGE)) |
470 |
< |
return; |
470 |
> |
return(1); |
471 |
|
/* get distribution pattern */ |
472 |
|
raytexture(r, m->omod); |
473 |
|
/* get source color */ |
476 |
|
m->oargs.farg[2]); |
477 |
|
/* modify value */ |
478 |
|
multcolor(r->rcol, r->pcol); |
479 |
+ |
return(1); |
480 |
|
} |