| 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 |
|
} |
| 523 |
|
rayreject( /* check if candidate hit is worse than current */ |
| 524 |
|
OBJREC *o, |
| 525 |
|
RAY *r, |
| 526 |
< |
double t |
| 526 |
> |
double t, |
| 527 |
> |
double rod |
| 528 |
|
) |
| 529 |
|
{ |
| 530 |
|
OBJREC *mnew, *mray; |
| 538 |
|
return(1); /* shouldn't happen */ |
| 539 |
|
if (r->ro == NULL) |
| 540 |
|
return(0); /* ditto */ |
| 541 |
< |
if ((mnew = findmaterial(o)) == NULL) |
| 542 |
< |
return(1); /* new has no material */ |
| 543 |
< |
if ((mray = findmaterial(r->ro)) == NULL) |
| 544 |
< |
return(0); /* old has no material(!) */ |
| 545 |
< |
if (istransp(mnew->otype)) |
| 546 |
< |
return(1); /* new is transparent */ |
| 547 |
< |
if (istransp(mray->otype)) |
| 548 |
< |
return(0); /* old is transparent */ |
| 549 |
< |
/* weakest priority to later modifier definition */ |
| 541 |
> |
mnew = findmaterial(o); |
| 542 |
> |
mray = findmaterial(r->ro); /* check material transparencies */ |
| 543 |
> |
if (mnew == NULL) { |
| 544 |
> |
if (mray != NULL) |
| 545 |
> |
return(1); /* old has material, new does not */ |
| 546 |
> |
} else if (mray == NULL) { |
| 547 |
> |
return(0); /* new has material, old does not */ |
| 548 |
> |
} else if (istransp(mnew->otype)) { |
| 549 |
> |
if (!istransp(mray->otype)) |
| 550 |
> |
return(1); /* new is transparent, old is not */ |
| 551 |
> |
} else if (istransp(mray->otype)) { |
| 552 |
> |
return(0); /* old is transparent, new is not */ |
| 553 |
> |
} |
| 554 |
> |
if (rod <= 0) { /* check which side we hit */ |
| 555 |
> |
if (r->rod > 0) |
| 556 |
> |
return(1); /* old hit front, new did not */ |
| 557 |
> |
} else if (r->rod <= 0) { |
| 558 |
> |
return(0); /* new hit front, old did not */ |
| 559 |
> |
} |
| 560 |
> |
/* earlier modifier definition wins tie */ |
| 561 |
|
return (r->ro->omod >= o->omod); |
| 562 |
|
} |
| 563 |
|
|
