| 108 |
|
scalecolor(ctmp, dtmp); |
| 109 |
|
addcolor(cval, ctmp); |
| 110 |
|
} |
| 111 |
– |
|
| 112 |
– |
/* PMAP: skip direct specular refl via ambient bounce if already |
| 113 |
– |
* accounted for in photon map */ |
| 114 |
– |
if (ambRayInPmap(np->rp)) |
| 115 |
– |
return; |
| 111 |
|
|
| 112 |
+ |
if (ambRayInPmap(np->rp)) |
| 113 |
+ |
return; /* specular accounted for in photon map */ |
| 114 |
+ |
|
| 115 |
|
if (ldot > FTINY && np->specfl&SP_REFL) { |
| 116 |
|
/* |
| 117 |
|
* Compute specular reflection coefficient using |
| 274 |
|
|
| 275 |
|
getacoords(&nd); /* set up coordinates */ |
| 276 |
|
|
| 277 |
< |
/* PMAP: skip indirect specular via ambient bounce if already accounted |
| 280 |
< |
* for in photon map */ |
| 281 |
< |
if (!ambRayInPmap(r) && nd.specfl & (SP_REFL|SP_TRAN)) |
| 277 |
> |
if (nd.specfl & (SP_REFL|SP_TRAN)) |
| 278 |
|
agaussamp(&nd); |
| 279 |
|
|
| 280 |
|
if (nd.rdiff > FTINY) { /* ambient from this side */ |
| 329 |
|
if (normalize(np->v) == 0.0) { |
| 330 |
|
if (fabs(np->u_alpha - np->v_alpha) > 0.001) |
| 331 |
|
objerror(np->mp, WARNING, "illegal orientation vector"); |
| 332 |
< |
getperpendicular(np->u, np->pnorm); /* punting */ |
| 332 |
> |
getperpendicular(np->u, np->pnorm, 1); /* punting */ |
| 333 |
|
fcross(np->v, np->pnorm, np->u); |
| 334 |
|
np->u_alpha = np->v_alpha = sqrt( 0.5 * |
| 335 |
|
(np->u_alpha*np->u_alpha + np->v_alpha*np->v_alpha) ); |
