--- ray/src/rt/pmapparm.c 2016/05/17 17:39:47 2.7 +++ ray/src/rt/pmapparm.c 2017/08/14 21:12:10 2.8 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pmapparm.c,v 2.7 2016/05/17 17:39:47 rschregle Exp $"; +static const char RCSid[] = "$Id: pmapparm.c,v 2.8 2017/08/14 21:12:10 rschregle Exp $"; #endif /* @@ -13,13 +13,12 @@ static const char RCSid[] = "$Id: pmapparm.c,v 2.7 201 supported by the Swiss National Science Foundation (SNSF, #147053) ====================================================================== - $Id: pmapparm.c,v 2.7 2016/05/17 17:39:47 rschregle Exp $ + $Id: pmapparm.c,v 2.8 2017/08/14 21:12:10 rschregle Exp $ */ #include "pmapparm.h" #include "pmapdata.h" -#include "standard.h" #include @@ -48,12 +47,12 @@ unsigned long pmapCacheSize = 1e6; /* OOC cache #endif -#ifdef PMAP_ROI -/* Region of interest bbox: {xmin, xmax, ymin, ymax, zmin, zmax} */ -float pmapROI [6] = {-FHUGE, FHUGE, -FHUGE, FHUGE, -FHUGE, FHUGE}; -#endif +/* Regions of interest */ +unsigned pmapNumROI = 0; +PhotonMapROI *pmapROI = NULL; +unsigned verbose = 0; /* Verbose console output */ unsigned long photonMaxBounce = 5000; /* Runaway photon bounce limit */ unsigned photonRepTime = 0, /* Seconds between reports */ maxPreDistrib = 4, /* Max predistrib passes */