| 19 |
|
#include "otypes.h" |
| 20 |
|
#include "source.h" |
| 21 |
|
#include "rcontrib.h" |
| 22 |
+ |
#include "random.h" |
| 23 |
|
|
| 24 |
|
|
| 25 |
|
|
| 67 |
|
const PhotonPrimary* addPhotonPrimary (PhotonMap *pmap, const RAY *ray) |
| 68 |
|
{ |
| 69 |
|
PhotonPrimary *prim = NULL; |
| 70 |
+ |
FVECT dvec; |
| 71 |
|
|
| 72 |
|
if (!pmap || !ray) |
| 73 |
|
return NULL; |
| 100 |
|
prim -> srcIdx = -1; |
| 101 |
|
|
| 102 |
|
/* Reverse incident direction to point to light source */ |
| 103 |
< |
prim -> dir [0] = -ray -> rdir [0]; |
| 104 |
< |
prim -> dir [1] = -ray -> rdir [1]; |
| 105 |
< |
prim -> dir [2] = -ray -> rdir [2]; |
| 103 |
> |
dvec [0] = -ray -> rdir [0]; |
| 104 |
> |
dvec [1] = -ray -> rdir [1]; |
| 105 |
> |
dvec [2] = -ray -> rdir [2]; |
| 106 |
> |
prim -> dir = encodedir(dvec); |
| 107 |
|
|
| 108 |
< |
VCOPY(prim -> org, ray -> rorg); |
| 108 |
> |
VCOPY(prim -> pos, ray -> rop); |
| 109 |
|
|
| 110 |
|
return prim; |
| 111 |
|
} |
| 230 |
|
} |
| 231 |
|
|
| 232 |
|
/* Reject photon if normal faces away (ignored for volume photons) */ |
| 233 |
< |
if (norm && DOT(norm, p -> norm) <= 0) |
| 233 |
> |
if (norm && DOT(norm, p -> norm) <= 0.5 * frandom()) |
| 234 |
|
return; |
| 235 |
|
|
| 236 |
|
if (isContribPmap(pmap) && pmap -> srcContrib) { |
| 241 |
|
if (srcIdx < 0 || srcIdx >= nsources) |
| 242 |
|
error(INTERNAL, "invalid light source index in photon map"); |
| 243 |
|
|
| 244 |
< |
srcMod = objptr(source [srcIdx].so -> omod); |
| 244 |
> |
srcMod = findmaterial(source [srcIdx].so); |
| 245 |
|
|
| 246 |
|
/* Reject photon if contributions from light source which emitted it |
| 247 |
|
* are not sought */ |
| 312 |
|
/* Threshold below which we assume increasing max radius won't help */ |
| 313 |
|
#define PMAP_SHORT_LOOKUP_THRESH 1 |
| 314 |
|
|
| 315 |
+ |
/* Coefficient for adaptive maximum search radius */ |
| 316 |
+ |
#define PMAP_MAXDIST_COEFF 100 |
| 317 |
+ |
|
| 318 |
+ |
|
| 319 |
|
void findPhotons (PhotonMap* pmap, const RAY* ray) |
| 320 |
|
{ |
| 321 |
|
float pos [3], norm [3]; |
| 337 |
|
pmap -> minError = FHUGE; |
| 338 |
|
pmap -> maxError = -FHUGE; |
| 339 |
|
pmap -> rmsError = 0; |
| 340 |
< |
#ifdef PMAP_MAXDIST_ABS |
| 341 |
< |
/* Treat maxDistCoeff as an *absolute* and *fixed* max search radius. |
| 335 |
< |
Primarily intended for debugging; FOR ZE ECKSPURTZ ONLY! */ |
| 336 |
< |
pmap -> maxDist0 = pmap -> maxDistLimit = maxDistCoeff; |
| 337 |
< |
#else |
| 338 |
< |
/* Maximum search radius limit based on avg photon distance to |
| 339 |
< |
* centre of gravity */ |
| 340 |
> |
/* SQUARED max search radius limit is based on avg photon distance to |
| 341 |
> |
* centre of gravity, unless fixed by user (maxDistFix > 0) */ |
| 342 |
|
pmap -> maxDist0 = pmap -> maxDistLimit = |
| 343 |
< |
maxDistCoeff * pmap -> squeueSize * pmap -> CoGdist / |
| 344 |
< |
pmap -> heapSize; |
| 345 |
< |
#endif |
| 343 |
> |
maxDistFix > 0 ? maxDistFix * maxDistFix |
| 344 |
> |
: PMAP_MAXDIST_COEFF * pmap -> squeueSize * |
| 345 |
> |
pmap -> CoGdist / pmap -> heapSize; |
| 346 |
|
} |
| 347 |
|
|
| 348 |
|
do { |
| 362 |
|
nearestNeighbours(pmap, pos, norm, 1); |
| 363 |
|
} |
| 364 |
|
|
| 363 |
– |
#ifndef PMAP_MAXDIST_ABS |
| 365 |
|
if (pmap -> squeueEnd < pmap -> squeueSize * pmap -> gatherTolerance) { |
| 366 |
|
/* Short lookup; too few photons found */ |
| 367 |
|
if (pmap -> squeueEnd > PMAP_SHORT_LOOKUP_THRESH) { |
| 369 |
|
* PMAP_SHORT_LOOKUP_THRESH photons under the assumption there |
| 370 |
|
* really are no photons in the vicinity, and increasing the max |
| 371 |
|
* search radius therefore won't help */ |
| 372 |
< |
#ifdef PMAP_LOOKUP_WARN |
| 372 |
> |
#ifdef PMAP_LOOKUP_WARN |
| 373 |
|
sprintf(errmsg, |
| 374 |
|
"%d/%d %s photons found at (%.2f,%.2f,%.2f) on %s", |
| 375 |
|
pmap -> squeueEnd, pmap -> squeueSize, |
| 376 |
|
pmapName [pmap -> type], pos [0], pos [1], pos [2], |
| 377 |
|
ray -> ro ? ray -> ro -> oname : "<null>"); |
| 378 |
|
error(WARNING, errmsg); |
| 379 |
< |
#endif |
| 379 |
> |
#endif |
| 380 |
|
|
| 381 |
+ |
/* Bail out after warning if maxDist is fixed */ |
| 382 |
+ |
if (maxDistFix > 0) |
| 383 |
+ |
return; |
| 384 |
+ |
|
| 385 |
|
if (pmap -> maxDist0 < pmap -> maxDistLimit) { |
| 386 |
|
/* Increase max search radius if below limit & redo search */ |
| 387 |
|
pmap -> maxDist0 *= PMAP_MAXDIST_INC; |
| 388 |
< |
#ifdef PMAP_LOOKUP_REDO |
| 388 |
> |
#ifdef PMAP_LOOKUP_REDO |
| 389 |
|
redo = 1; |
| 390 |
< |
#endif |
| 391 |
< |
|
| 387 |
< |
#ifdef PMAP_LOOKUP_WARN |
| 390 |
> |
#endif |
| 391 |
> |
#ifdef PMAP_LOOKUP_WARN |
| 392 |
|
sprintf(errmsg, |
| 393 |
|
redo ? "restarting photon lookup with max radius %.1e" |
| 394 |
|
: "max photon lookup radius adjusted to %.1e", |
| 395 |
|
pmap -> maxDist0); |
| 396 |
|
error(WARNING, errmsg); |
| 397 |
< |
#endif |
| 397 |
> |
#endif |
| 398 |
|
} |
| 399 |
< |
#ifdef PMAP_LOOKUP_REDO |
| 399 |
> |
#ifdef PMAP_LOOKUP_REDO |
| 400 |
|
else { |
| 401 |
|
sprintf(errmsg, "max photon lookup radius clamped to %.1e", |
| 402 |
|
pmap -> maxDist0); |
| 403 |
|
error(WARNING, errmsg); |
| 404 |
|
} |
| 405 |
< |
#endif |
| 405 |
> |
#endif |
| 406 |
|
} |
| 407 |
|
|
| 408 |
|
/* Reset successful lookup counter */ |
| 409 |
|
pmap -> numLookups = 0; |
| 410 |
|
} |
| 411 |
|
else { |
| 412 |
+ |
/* Bail out after warning if maxDist is fixed */ |
| 413 |
+ |
if (maxDistFix > 0) |
| 414 |
+ |
return; |
| 415 |
+ |
|
| 416 |
|
/* Increment successful lookup counter and reduce max search radius if |
| 417 |
|
* wraparound */ |
| 418 |
|
pmap -> numLookups = (pmap -> numLookups + 1) % PMAP_MAXDIST_CNT; |
| 421 |
|
|
| 422 |
|
redo = 0; |
| 423 |
|
} |
| 424 |
< |
#endif |
| 424 |
> |
|
| 425 |
|
} while (redo); |
| 426 |
|
} |
| 427 |
|
|
| 461 |
|
dv [2] = pos [2] - p -> pos [2]; |
| 462 |
|
d2 = DOT(dv, dv); |
| 463 |
|
|
| 464 |
< |
if (d2 < pmap -> maxDist && DOT(norm, p -> norm) > 0) { |
| 464 |
> |
if (d2 < pmap -> maxDist && DOT(norm, p -> norm) > 0.5 * frandom()) { |
| 465 |
|
/* Closest photon so far with similar normal */ |
| 466 |
|
pmap -> maxDist = d2; |
| 467 |
|
*photon = p; |
