ViewVC Help

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

root/Development/ray/src/rt/raycalls.c

Comparing ray/src/rt/raycalls.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.31 by greg, Wed Aug 21 20:42:20 2024 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7		*  External symbols declared in ray.h
8		*/
9
10	<	/* ====================================================================
11	<	* The Radiance Software License, Version 1.0
12	<	*
13	<	* Copyright (c) 1990 - 2002 The Regents of the University of California,
14	<	* through Lawrence Berkeley National Laboratory.   All rights reserved.
15	<	*
16	<	* Redistribution and use in source and binary forms, with or without
17	<	* modification, are permitted provided that the following conditions
18	<	* are met:
19	<	*
20	<	* 1. Redistributions of source code must retain the above copyright
21	<	*         notice, this list of conditions and the following disclaimer.
22	<	*
23	<	* 2. Redistributions in binary form must reproduce the above copyright
24	<	*       notice, this list of conditions and the following disclaimer in
25	<	*       the documentation and/or other materials provided with the
26	<	*       distribution.
27	<	*
28	<	* 3. The end-user documentation included with the redistribution,
29	<	*           if any, must include the following acknowledgment:
30	<	*             "This product includes Radiance software
31	<	*                 (http://radsite.lbl.gov/)
32	<	*                 developed by the Lawrence Berkeley National Laboratory
33	<	*               (http://www.lbl.gov/)."
34	<	*       Alternately, this acknowledgment may appear in the software itself,
35	<	*       if and wherever such third-party acknowledgments normally appear.
36	<	*
37	<	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38	<	*       and "The Regents of the University of California" must
39	<	*       not be used to endorse or promote products derived from this
40	<	*       software without prior written permission. For written
41	<	*       permission, please contact [email protected].
42	<	*
43	<	* 5. Products derived from this software may not be called "Radiance",
44	<	*       nor may "Radiance" appear in their name, without prior written
45	<	*       permission of Lawrence Berkeley National Laboratory.
46	<	*
47	<	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48	<	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49	<	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50	<	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51	<	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52	<	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53	<	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54	<	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55	<	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56	<	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57	<	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58	<	* SUCH DAMAGE.
59	<	* ====================================================================
60	<	*
61	<	* This software consists of voluntary contributions made by many
62	<	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63	<	* information on Lawrence Berkeley National Laboratory, please see
64	<	* <http://www.lbl.gov/>.
65	<	*/
10	>	#include "copyright.h"
11
12		/*
13		*  These routines are designed to aid the programmer who wishes
#	Line 78 | Line 23 | static const char      RCSid[] = "$Id$";
23		*  sort of context, so it is impossible to simultaneously run
24		*  this library on multiple scenes or in multiple threads.
25		*  You get one scene and one thread, and if you want more, you
26	<	*  will have to go with the process model used by the programs
27	<	*  gen/mkillum, hd/rholo, and px/pinterp.  Finally, unrecoverable
28	<	*  errors result in a call to the application-defined function
84	<	*  quit().  The usual thing to do is to call exit().
26	>	*  will have to go with the process model defined in raypcalls.c.
27	>	*  Finally, unrecoverable errors result in a call to the application-
28	>	*  defined function quit().  The usual thing to do is to call exit().
29		*  You might want to do something else instead, like
30		*  call setjmp()/longjmp() to bring you back to the calling
31		*  function for recovery.  You may also wish to define your own
#	Line 133 | Line 77 | static const char      RCSid[] = "$Id$";
77		*  restarted at any point by calling ray_init() on a new
78		*  octree.
79		*
80	<	*  The call ray_save(rp) allocates and returns a buffer
80	>	*  The call ray_save(rp) fills a parameter structure
81		*  with the current global parameter settings, which may be
82		*  restored at any time with a call to ray_restore(rp).
83		*  This buffer contains no linked information, and thus
#	Line 145 | Line 89 | static const char      RCSid[] = "$Id$";
89		*  same as the defaults for rtrace.)
90		*/
91
92	<	#include  "ray.h"
92	>	#include <string.h>
93	>	#include <time.h>
94
95	+	#include  "ray.h"
96		#include  "source.h"
97	<
97	>	#include  "bsdf.h"
98		#include  "ambient.h"
153	–
99		#include  "otypes.h"
155	–
100		#include  "random.h"
157	–
101		#include  "data.h"
159	–
102		#include  "font.h"
103	+	#include  "pmapray.h"
104
105		char    *progname = "unknown_app";      /* caller sets to argv[0] */
106
107		char    *octname;                       /* octree name we are given */
108
166	–	char    *shm_boundary = NULL;           /* boundary of shared memory */
167	–
109		CUBE    thescene;                       /* our scene */
110		OBJECT  nsceneobjs;                     /* number of objects in our scene */
111
#	Line 174 | Line 115 | int    samplendx = 0;                  /* index for this sample */
115
116		void    (*trace)() = NULL;              /* trace call */
117
118	<	extern void     ambnotify();
178	<	void    (*addobjnotify[])() = {ambnotify, NULL};
118	>	void    (*addobjnotify[8])() = {ambnotify, NULL};
119
120	+	int     castonly = 0;                   /* only doing ray-casting? */
121	+
122		int     do_irrad = 0;                   /* compute irradiance? */
123
124	+	int     rand_samp = 1;                  /* pure Monte Carlo sampling? */
125	+
126		double  dstrsrc = 0.0;                  /* square source distribution */
127	<	double  shadthresh = .05;               /* shadow threshold */
128	<	double  shadcert = .5;                  /* shadow certainty */
127	>	double  shadthresh = .03;               /* shadow threshold */
128	>	double  shadcert = .75;                 /* shadow certainty */
129		int     directrelay = 2;                /* number of source relays */
130		int     vspretest = 512;                /* virtual source pretest density */
131		int     directvis = 1;                  /* sources visible? */
#	Line 197 | Line 141 | double specjitter = 1.;                /* specular sampling jitter *
141
142		int     backvis = 1;                    /* back face visibility */
143
144	<	int     maxdepth = 6;                   /* maximum recursion depth */
145	<	double  minweight = 4e-3;               /* minimum ray weight */
144	>	int     maxdepth = -10;                 /* maximum recursion depth */
145	>	double  minweight = 1e-4;               /* minimum ray weight */
146
147		char    *ambfile = NULL;                /* ambient file name */
148		COLOR   ambval = BLKCOLOR;              /* ambient value */
149		int     ambvwt = 0;                     /* initial weight for ambient value */
150	<	double  ambacc = 0.2;                   /* ambient accuracy */
151	<	int     ambres = 128;                   /* ambient resolution */
152	<	int     ambdiv = 512;                   /* ambient divisions */
153	<	int     ambssamp = 0;                   /* ambient super-samples */
150	>	double  ambacc = 0.1;                   /* ambient accuracy */
151	>	int     ambres = 256;                   /* ambient resolution */
152	>	int     ambdiv = 1024;                  /* ambient divisions */
153	>	int     ambssamp = 512;                 /* ambient super-samples */
154		int     ambounce = 0;                   /* ambient bounces */
155		char    *amblist[AMBLLEN+1];            /* ambient include/exclude list */
156		int     ambincl = -1;                   /* include == 1, exclude == 0 */
157
158
159	+	static void
160	+	reset_random(void)              /* re-initialize random number generator */
161	+	{
162	+	if (rand_samp) {
163	+	srandom((long)time(0));
164	+	initurand(0);
165	+	} else {
166	+	srandom(0L);
167	+	initurand(2048);
168	+	}
169	+	}
170	+
171	+
172		void
173	<	ray_init(otnm)                  /* initialize ray-tracing calculation */
174	<	char    *otnm;
173	>	ray_init(                       /* initialize ray-tracing calculation */
174	>	char    *otnm
175	>	)
176		{
177		if (nobjects > 0)               /* free old scene data */
178		ray_done(0);
#	Line 222 | Line 180 | char   *otnm;
180		if (ofun[OBJ_SPHERE].funp == o_default)
181		initotypes();
182		/* initialize urand */
183	<	if (urperm == NULL)
184	<	initurand(2048);
185	<	/* read scene octree */
186	<	readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
183	>	reset_random();
184	>	/* initialize spectral sampling */
185	>	if (setspectrsamp(CNDX, WLPART) < 0)
186	>	error(USER, "unsupported spectral sampling");
187	>
188	>	octname = savqstr(otnm);        /* read scene octree */
189	>	readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
190		nsceneobjs = nobjects;
191	<	/* find and mark sources */
192	<	marksources();
193	<	/* initialize ambient calculation */
194	<	setambient();
195	<	/* ready to go... */
191	>
192	>	if (!castonly) {                /* any actual ray traversal to do? */
193	>
194	>	ray_init_pmap();        /* PMAP: set up & load photon maps */
195	>
196	>	marksources();          /* find and mark sources */
197	>
198	>	setambient();           /* initialize ambient calculation */
199	>	} else
200	>	distantsources();       /* else mark only distant sources */
201		}
202
203
204		void
205	<	ray_trace(RAY *r)               /* trace a primary ray */
205	>	ray_trace(                      /* trace a primary ray */
206	>	RAY     *r
207	>	)
208		{
209	<	rayorigin(r, NULL, PRIMARY, 1.0);
209	>	rayorigin(r, PRIMARY, NULL, NULL);
210		samplendx++;
211		rayvalue(r);            /* assumes origin and direction are set */
212		}
213
214
215		void
216	<	ray_done(freall)                /* free ray-tracing data */
217	<	int     freall;
216	>	ray_done(               /* free ray-tracing data */
217	>	int     freall
218	>	)
219		{
220		retainfonts = 1;
221		ambdone();
#	Line 256 | Line 225 | int    freall;
225		donesets();
226		octdone();
227		thescene.cutree = EMPTY;
228	<	octname = NULL;
228	>	freeqstr(octname); octname = NULL;
229	>	retainfonts = 0;
230		if (freall) {
261	–	retainfonts = 0;
231		freefont(NULL);
232		freedata(NULL);
233	+	SDfreeCache(NULL);
234		initurand(0);
235		}
236		if (nobjects > 0) {
237	<	sprintf(errmsg, "%d objects left after call to ray_done()",
238	<	nobjects);
237	>	sprintf(errmsg, "%ld objects left after call to ray_done()",
238	>	(long)nobjects);
239		error(WARNING, errmsg);
240		}
241	+
242	+	ray_done_pmap();
243		}
244
245
246		void
247	<	ray_save(rp)                    /* save current parameter settings */
248	<	RAYPARAMS       *rp;
247	>	ray_save(                       /* save current parameter settings */
248	>	RAYPARAMS       *rp
249	>	)
250		{
251		int     i, ndx;
252
253		if (rp == NULL)
254		return;
255		rp->do_irrad = do_irrad;
256	+	rp->rand_samp = rand_samp;
257		rp->dstrsrc = dstrsrc;
258		rp->shadthresh = shadthresh;
259		rp->shadcert = shadcert;
#	Line 296 | Line 270 | RAYPARAMS      *rp;
270		rp->backvis = backvis;
271		rp->maxdepth = maxdepth;
272		rp->minweight = minweight;
299	–	copycolor(rp->ambval, ambval);
300	–	bzero(rp->ambfile, sizeof(rp->ambfile));
273		if (ambfile != NULL)
274		strncpy(rp->ambfile, ambfile, sizeof(rp->ambfile)-1);
275	+	else
276	+	memset(rp->ambfile, '\0', sizeof(rp->ambfile));
277	+	copycolor(rp->ambval, ambval);
278		rp->ambvwt = ambvwt;
279		rp->ambacc = ambacc;
280		rp->ambres = ambres;
#	Line 307 | Line 282 | RAYPARAMS      *rp;
282		rp->ambssamp = ambssamp;
283		rp->ambounce = ambounce;
284		rp->ambincl = ambincl;
285	<	bzero(rp->amblval, sizeof(rp->amblval));
285	>	memset(rp->amblval, '\0', sizeof(rp->amblval));
286		ndx = 0;
287		for (i = 0; i < AMBLLEN && amblist[i] != NULL; i++) {
288		int     len = strlen(amblist[i]);
289		if (ndx+len >= sizeof(rp->amblval))
290		break;
291		strcpy(rp->amblval+ndx, amblist[i]);
292	+	rp->amblndx[i] = ndx;
293		ndx += len+1;
294		}
295		while (i <= AMBLLEN)
296		rp->amblndx[i++] = -1;
297	+
298	+	/* PMAP: save photon mapping params */
299	+	ray_save_pmap(rp);
300		}
301
302
303		void
304	<	ray_restore(rp)                 /* restore parameter settings */
305	<	RAYPARAMS       *rp;
304	>	ray_restore(                    /* restore parameter settings */
305	>	RAYPARAMS       *rp
306	>	)
307		{
308	<	register int    i;
308	>	int     i;
309
310		if (rp == NULL) {               /* restore defaults */
311		RAYPARAMS       dflt;
#	Line 335 | Line 315 | RAYPARAMS      *rp;
315		}
316		/* restore saved settings */
317		do_irrad = rp->do_irrad;
318	+	if (!rand_samp != !rp->rand_samp) {
319	+	rand_samp = rp->rand_samp;
320	+	reset_random();
321	+	}
322		dstrsrc = rp->dstrsrc;
323		shadthresh = rp->shadthresh;
324		shadcert = rp->shadcert;
#	Line 356 | Line 340 | RAYPARAMS      *rp;
340		ambdiv = rp->ambdiv;
341		ambssamp = rp->ambssamp;
342		ambounce = rp->ambounce;
343	+	/* a bit dangerous if not static */
344		for (i = 0; rp->amblndx[i] >= 0; i++)
345		amblist[i] = rp->amblval + rp->amblndx[i];
346		while (i <= AMBLLEN)
#	Line 363 | Line 348 | RAYPARAMS      *rp;
348		ambincl = rp->ambincl;
349		/* update ambient calculation */
350		ambnotify(OVOID);
351	<	if (thescene.cutree != EMPTY) {
351	>	if ((thescene.cutree != EMPTY) & !castonly) {
352		int     newamb = (ambfile == NULL) ?  rp->ambfile[0] :
353		strcmp(ambfile, rp->ambfile) ;
354
#	Line 385 | Line 370 | RAYPARAMS      *rp;
370		ambres = rp->ambres;
371		ambacc = rp->ambacc;
372		}
373	+
374	+	/* PMAP: restore photon mapping params */
375	+	ray_restore_pmap(rp);
376		}
377
378
379		void
380	<	ray_defaults(rp)                /* get default parameter values */
381	<	RAYPARAMS       *rp;
380	>	ray_defaults(           /* get default parameter values */
381	>	RAYPARAMS       *rp
382	>	)
383		{
384		int     i;
385
#	Line 398 | Line 387 | RAYPARAMS      *rp;
387		return;
388
389		rp->do_irrad = 0;
390	+	rp->rand_samp = 1;
391		rp->dstrsrc = 0.0;
392	<	rp->shadthresh = .05;
393	<	rp->shadcert = .5;
392	>	rp->shadthresh = 0.03;
393	>	rp->shadcert = 0.75;
394		rp->directrelay = 2;
395		rp->vspretest = 512;
396		rp->directvis = 1;
#	Line 409 | Line 399 | RAYPARAMS      *rp;
399		setcolor(rp->salbedo, 0., 0., 0.);
400		rp->seccg = 0.;
401		rp->ssampdist = 0.;
402	<	rp->specthresh = .15;
402	>	rp->specthresh = 0.15;
403		rp->specjitter = 1.;
404		rp->backvis = 1;
405	<	rp->maxdepth = 6;
406	<	rp->minweight = 4e-3;
405	>	rp->maxdepth = -10;
406	>	rp->minweight = 1e-4;
407	>	memset(rp->ambfile, '\0', sizeof(rp->ambfile));
408		setcolor(rp->ambval, 0., 0., 0.);
418	–	bzero(rp->ambfile, sizeof(rp->ambfile));
409		rp->ambvwt = 0;
410	<	rp->ambres = 128;
411	<	rp->ambacc = 0.2;
412	<	rp->ambdiv = 512;
413	<	rp->ambssamp = 0;
410	>	rp->ambres = 256;
411	>	rp->ambacc = 0.1;
412	>	rp->ambdiv = 1024;
413	>	rp->ambssamp = 512;
414		rp->ambounce = 0;
415		rp->ambincl = -1;
416	<	bzero(rp->amblval, sizeof(rp->amblval));
416	>	memset(rp->amblval, '\0', sizeof(rp->amblval));
417		for (i = AMBLLEN+1; i--; )
418		rp->amblndx[i] = -1;
419	+
420	+	/* PMAP: restore photon mapping defaults */
421	+	ray_defaults_pmap(rp);
422		}

Diff Legend

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