56 |
|
struct stat octstat, pmstat; |
57 |
|
PhotonMap *pm; |
58 |
|
PhotonMapType type; |
59 |
< |
|
59 |
> |
|
60 |
|
for (t = 0; t < NUM_PMAP_TYPES; t++) |
61 |
< |
if (setPmapParam(&pm, parm + t)) { |
61 |
> |
if (setPmapParam(&pm, parm + t)) { |
62 |
|
/* Check if photon map newer than octree */ |
63 |
|
if (pm -> fileName && octname && |
64 |
|
!stat(pm -> fileName, &pmstat) && !stat(octname, &octstat) && |
67 |
|
pm -> fileName); |
68 |
|
error(USER, errmsg); |
69 |
|
} |
70 |
< |
|
70 |
> |
|
71 |
|
/* Load photon map from file and get its type */ |
72 |
|
if ((type = loadPhotonMap(pm, pm -> fileName)) == PMAP_TYPE_NONE) |
73 |
|
error(USER, "failed loading photon map"); |
75 |
|
/* Assign to appropriate photon map type (deleting previously |
76 |
|
* loaded photon map of same type if necessary) */ |
77 |
|
if (pmaps [type]) { |
78 |
+ |
sprintf(errmsg, "multiple %s photon maps, dropping previous", |
79 |
+ |
pmapName [type]); |
80 |
+ |
error(WARNING, errmsg); |
81 |
|
deletePhotons(pmaps [type]); |
82 |
|
free(pmaps [type]); |
83 |
|
} |
84 |
|
pmaps [type] = pm; |
85 |
< |
|
86 |
< |
/* Check for invalid density estimate bandwidth */ |
85 |
> |
|
86 |
> |
/* Check for valid density estimate bandwidths */ |
87 |
> |
if ((pm -> minGather > 1 || pm -> maxGather > 1) && |
88 |
> |
(type == PMAP_TYPE_PRECOMP)) { |
89 |
> |
/* Force bwidth to 1 for precomputed pmap */ |
90 |
> |
error(WARNING, "ignoring bandwidth for precomp photon map"); |
91 |
> |
pm -> minGather = pm -> maxGather = 1; |
92 |
> |
} |
93 |
> |
|
94 |
> |
if ((pm -> maxGather > pm -> minGather) && |
95 |
> |
(type == PMAP_TYPE_VOLUME)) { |
96 |
> |
/* Biascomp for volume pmaps (see volumePhotonDensity() below) |
97 |
> |
is considered redundant, and there's probably no point in |
98 |
> |
recovering by using the lower bandwidth, since it's probably |
99 |
> |
not what the user wants, so bail out. */ |
100 |
> |
sprintf(errmsg, |
101 |
> |
"bias compensation is not available with %s photon maps", |
102 |
> |
pmapName [type]); |
103 |
> |
error(USER, errmsg); |
104 |
> |
} |
105 |
> |
|
106 |
|
if (pm -> maxGather > pm -> numPhotons) { |
107 |
< |
error(WARNING, "adjusting density estimate bandwidth"); |
108 |
< |
pm -> minGather = pm -> maxGather = pm -> numPhotons; |
107 |
> |
/* Clamp lookup bandwidth to total number of photons (minus one, |
108 |
> |
since density estimate gets extra photon to obtain averaged |
109 |
> |
radius) */ |
110 |
> |
sprintf( |
111 |
> |
errmsg, "clamping density estimate bandwidth to %ld", |
112 |
> |
pm -> numPhotons |
113 |
> |
); |
114 |
> |
error(WARNING, errmsg); |
115 |
> |
pm -> minGather = pm -> maxGather = pm -> numPhotons - 1; |
116 |
|
} |
117 |
|
} |
118 |
|
} |
210 |
|
if (r -> ro && islight(objptr(r -> ro -> omod) -> otype)) |
211 |
|
return; |
212 |
|
|
213 |
< |
find1Photon(preCompPmap, r, &p); |
214 |
< |
getPhotonFlux(&p, irrad); |
213 |
> |
if (find1Photon(preCompPmap, r, &p)) |
214 |
> |
/* p contains a found photon, so get its irradiance, otherwise it |
215 |
> |
* remains zero under the assumption all photons are too distant |
216 |
> |
* to contribute significantly */ |
217 |
> |
getPhotonFlux(&p, irrad); |
218 |
|
} |
219 |
|
|
220 |
|
|