196 |
|
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
197 |
|
error(SYSTEM, errmsg); |
198 |
|
} |
199 |
< |
#ifdef getc_unlocked |
199 |
> |
#if 0 |
200 |
|
flockfile(ambfp); /* application-level lock */ |
201 |
|
#endif |
202 |
|
#ifdef F_SETLKW |
667 |
|
|
668 |
|
/* PMAP: Factor in ambient from global photon map (if enabled) and return |
669 |
|
* as all ambient components accounted for */ |
670 |
< |
if (ambGlobalPmap(aval, r, rdepth)) |
670 |
> |
if (ambPmap(aval, r, rdepth)) |
671 |
|
return; |
672 |
|
|
673 |
|
/* PMAP: Otherwise factor in ambient from caustic photon map |
674 |
< |
* (ambCausticPmap() returns zero if caustic photons disabled) and |
674 |
> |
* (ambPmapCaustic() returns zero if caustic photons disabled) and |
675 |
|
* continue with RADIANCE ambient calculation */ |
676 |
|
copycolor(caustic, aval); |
677 |
< |
ambCausticPmap(caustic, r, rdepth); |
677 |
> |
ambPmapCaustic(caustic, r, rdepth); |
678 |
|
|
679 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
680 |
|
goto dumbamb; |