| 217 |
|
raytrans(r); |
| 218 |
|
return(1); |
| 219 |
|
} |
| 220 |
< |
if (!islight(m->otype)) |
| 220 |
> |
if (!islight(m->otype)) { |
| 221 |
> |
setcolor(r->pcol, 1.0, 1.0, 1.0); |
| 222 |
|
return((*ofun[Lamb.otype].funp)(&Lamb, r)); |
| 223 |
+ |
} |
| 224 |
|
} |
| 225 |
|
return(0); /* not a qualifying surface */ |
| 226 |
|
} |
| 537 |
|
return(1); /* shouldn't happen */ |
| 538 |
|
if (r->ro == NULL) |
| 539 |
|
return(0); /* ditto */ |
| 540 |
< |
if ((mnew = findmaterial(o)) == NULL) |
| 541 |
< |
return(1); /* new has no material */ |
| 542 |
< |
if ((mray = findmaterial(r->ro)) == NULL) |
| 540 |
> |
mnew = findmaterial(o); |
| 541 |
> |
mray = findmaterial(r->ro); /* check material transparencies */ |
| 542 |
> |
if (mnew == NULL) { |
| 543 |
> |
if (mray != NULL) |
| 544 |
> |
return(1); /* new has no material */ |
| 545 |
> |
} else if (mray == NULL) { |
| 546 |
|
return(0); /* old has no material(!) */ |
| 547 |
< |
if (istransp(mnew->otype)) |
| 548 |
< |
return(1); /* new is transparent */ |
| 549 |
< |
if (istransp(mray->otype)) |
| 547 |
> |
} else if (istransp(mnew->otype)) { |
| 548 |
> |
if (!istransp(mray->otype)) |
| 549 |
> |
return(1); /* new is transparent */ |
| 550 |
> |
} else if (istransp(mray->otype)) { |
| 551 |
|
return(0); /* old is transparent */ |
| 552 |
+ |
} |
| 553 |
|
/* weakest priority to later modifier definition */ |
| 554 |
|
return (r->ro->omod >= o->omod); |
| 555 |
|
} |
