ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/pmapparm.h

Comparing ray/src/rt/pmapparm.h (file contents):
Revision 2.4 by rschregle, Tue May 26 13:31:19 2015 UTC vs.
Revision 2.9 by rschregle, Fri Feb 2 19:47:55 2018 UTC

#	Line 1 | Line 1
1	+	/* RCSid $Id$ */
2	+
3		/*
4	<	==================================================================
5	<	Parameters for photon map generation; used by MKPMAP
6	<	For inclusion in mkpmap.c
4	>	======================================================================
5	>	Parameters for photon map generation and rendering; used by mkpmap
6	>	and rpict/rvu/rtrace.
7
8		Roland Schregle (roland.schregle@{hslu.ch, gmail.com}
9		(c) Fraunhofer Institute for Solar Energy Systems,
10		(c) Lucerne University of Applied Sciences and Arts,
11	<	supported by the Swiss National Science Foundation (SNSF, #147053)
12	<	==================================================================
11	>	supported by the Swiss National Science Foundation (SNSF, #147053)
12	>	======================================================================
13
14		$Id$
15		*/
#	Line 25 | Line 27
27		unsigned minGather, maxGather; /* Num photons to gather */
28		unsigned long distribTarget;   /* Num photons to store */
29		} PhotonMapParams;
30	+
31	+	/* Bounding box for region of interest */
32	+	typedef struct {
33	+	float min [3], max [3];
34	+	} PhotonMapROI;
35
36
37		extern PhotonMapParams pmapParams [NUM_PMAP_TYPES];
#	Line 38 | Line 45
45		#define contribPmapParams  (pmapParams [PMAP_TYPE_CONTRIB])
46
47
48	<	extern float pdfSamples, preDistrib, finalGather, gatherTolerance,
49	<	maxDistFix;
50	<	extern unsigned long photonHeapSizeInc, photonMaxBounce;
51	<	extern unsigned photonRepTime, maxPreDistrib, defaultGather;
52	<	#ifdef PMAP_ROI
53	<	extern float pmapROI [6];
48	>	extern float         pdfSamples, preDistrib, finalGather,
49	>	gatherTolerance, maxDistFix, pmapMaxDist,
50	>	photonMaxDist;
51	>	extern unsigned long photonHeapSizeInc, photonMaxBounce;
52	>	extern unsigned      photonRepTime, maxPreDistrib, defaultGather,
53	>	verbose;
54	>
55	>	extern unsigned      pmapNumROI;
56	>	extern PhotonMapROI  *pmapROI;
57	>
58	>	#ifdef PMAP_OOC
59	>	extern float         pmapCachePageSize;
60	>	extern unsigned long pmapCacheSize;
61		#endif
62	+
63
64		struct PhotonMap;
65

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)