ViewVC Help

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

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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.89 by greg, Sun May 11 19:03:37 2014 UTC vs.
Revision 2.104 by greg, Fri Jan 27 22:00:49 2017 UTC

#	Line 1 | Line 1
1	–	#ifndef lint
1		static const char       RCSid[] = "$Id$";
3	–	#endif
2		/*
3		*  ambient.c - routines dealing with ambient (inter-reflected) component.
4		*
#	Line 17 | Line 15 | static const char      RCSid[] = "$Id$";
15		#include  "resolu.h"
16		#include  "ambient.h"
17		#include  "random.h"
18	+	#include  "pmapamb.h"
19
20		#ifndef  OCTSCALE
21		#define  OCTSCALE       1.0     /* ceil((valid rad.)/(cube size)) */
#	Line 77 | Line 76 | static long  lastpos = -1;             /* last flush position */
76		#define  AMBFLUSH       (BUFSIZ/AMBVALSIZ)
77
78		#define  newambval()    (AMBVAL *)malloc(sizeof(AMBVAL))
80	–	#define  freeav(av)     free((void *)av);
79
80		static void initambfile(int creat);
81		static void avsave(AMBVAL *av);
#	Line 185 | Line 183 | setambient(void)                               /* initialize calculation */
183		(flen - lastpos)/AMBVALSIZ);
184		error(WARNING, errmsg);
185		fseek(ambfp, lastpos, SEEK_SET);
188	–	#ifndef _WIN32 /* XXX we need a replacement for that one */
186		ftruncate(fileno(ambfp), (off_t)lastpos);
190	–	#endif
187		}
188		} else if ((ambfp = fopen(ambfile, "w+")) != NULL) {
189		initambfile(1);                 /* else create new file */
#	Line 197 | Line 193 | setambient(void)                               /* initialize calculation */
193		sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
194		error(SYSTEM, errmsg);
195		}
200	–	#ifdef getc_unlocked
201	–	flockfile(ambfp);                       /* application-level lock */
202	–	#endif
196		#ifdef  F_SETLKW
197		aflock(F_UNLCK);                        /* release file */
198		#endif
#	Line 220 | Line 213 | ambdone(void)                  /* close ambient file and free memory
213		lastpos = -1;
214		}
215		/* free ambient tree */
216	<	unloadatree(&atrunk, &avfree);
216	>	unloadatree(&atrunk, avfree);
217		/* reset state variables */
218		avsum = 0.;
219		navsum = 0;
#	Line 263 | Line 256 | ambnotify(                     /* record new modifier */
256
257		/************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/
258
259	<	#ifdef NEWAMB
259	>	#ifndef OLDAMB
260
261		#define tfunc(lwr, x, upr)      (((x)-(lwr))/((upr)-(lwr)))
262
#	Line 271 | Line 264 | static int     plugaleak(RAY *r, AMBVAL *ap, FVECT anorm,
264		static double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
265		AMBTREE *at, FVECT c0, double s);
266		static int      makeambient(COLOR acol, RAY *r, FVECT rn, int al);
267	<	static void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv,
267	>	static int      extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv,
268		FVECT uvw[3]);
269
270		void
#	Line 282 | Line 275 | multambient(           /* compute ambient component & multiply
275		)
276		{
277		static int  rdepth = 0;                 /* ambient recursion */
278	<	COLOR   acol;
279	<	int     ok;
278	>	COLOR   acol, caustic;
279	>	int     i, ok;
280		double  d, l;
281
282	+	/* PMAP: Factor in ambient from photon map, if enabled and ray is
283	+	* ambient. Return as all ambient components accounted for, else
284	+	* continue. */
285	+	if (ambPmap(aval, r, rdepth))
286	+	return;
287	+
288	+	/* PMAP: Factor in specular-diffuse ambient (caustics) from photon
289	+	* map, if enabled and ray is primary, else caustic is zero.  Continue
290	+	* with RADIANCE ambient calculation */
291	+	copycolor(caustic, aval);
292	+	ambPmapCaustic(caustic, r, rdepth);
293	+
294		if (ambdiv <= 0)                        /* no ambient calculation */
295		goto dumbamb;
296		/* check number of bounces */
#	Line 297 | Line 302 | multambient(           /* compute ambient component & multiply
302		goto dumbamb;
303
304		if (ambacc <= FTINY) {                  /* no ambient storage */
305	+	FVECT   uvd[2];
306	+	float   dgrad[2], *dgp = NULL;
307	+
308	+	if (nrm != r->ron && DOT(nrm,r->ron) < 0.9999)
309	+	dgp = dgrad;            /* compute rotational grad. */
310		copycolor(acol, aval);
311		rdepth++;
312		ok = doambient(acol, r, r->rweight,
313	<	NULL, NULL, NULL, NULL, NULL);
313	>	uvd, NULL, NULL, dgp, NULL);
314		rdepth--;
315		if (!ok)
316		goto dumbamb;
317	+	if ((ok > 0) & (dgp != NULL)) { /* apply texture */
318	+	FVECT   v1;
319	+	VCROSS(v1, r->ron, nrm);
320	+	d = 1.0;
321	+	for (i = 3; i--; )
322	+	d += v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]);
323	+	if (d >= 0.05)
324	+	scalecolor(acol, d);
325	+	}
326		copycolor(aval, acol);
327	+
328	+	/* PMAP: add in caustic */
329	+	addcolor(aval, caustic);
330		return;
331		}
332
#	Line 314 | Line 336 | multambient(           /* compute ambient component & multiply
336		setcolor(acol, 0.0, 0.0, 0.0);
337		d = sumambient(acol, r, nrm, rdepth,
338		&atrunk, thescene.cuorg, thescene.cusize);
339	+
340		if (d > FTINY) {
341		d = 1.0/d;
342		scalecolor(acol, d);
343		multcolor(aval, acol);
344	+
345	+	/* PMAP: add in caustic */
346	+	addcolor(aval, caustic);
347		return;
348		}
349	+
350		rdepth++;                               /* need to cache new value */
351		ok = makeambient(acol, r, nrm, rdepth-1);
352		rdepth--;
353	+
354		if (ok) {
355		multcolor(aval, acol);          /* computed new value */
356	+
357	+	/* PMAP: add in caustic */
358	+	addcolor(aval, caustic);
359		return;
360		}
361	+
362		dumbamb:                                        /* return global value */
363		if ((ambvwt <= 0) | (navsum == 0)) {
364		multcolor(aval, ambval);
365	+
366	+	/* PMAP: add in caustic */
367	+	addcolor(aval, caustic);
368		return;
369		}
370	<	l = bright(ambval);                     /* average in computations */
370	>
371	>	l = bright(ambval);                     /* average in computations */
372		if (l > FTINY) {
373		d = (log(l)*(double)ambvwt + avsum) /
374		(double)(ambvwt + navsum);
#	Line 486 | Line 522 | sumambient(            /* get interpolated ambient value */
522		/*
523		*  Extrapolate value and compute final weight (hat function)
524		*/
525	<	extambient(ct, av, r->rop, rn, uvw);
525	>	if (!extambient(ct, av, r->rop, rn, uvw))
526	>	continue;
527		d = tfunc(maxangle, sqrt(delta_r2), 0.0) *
528		tfunc(ambacc, sqrt(delta_t2), 0.0);
529		scalecolor(ct, d);
#	Line 537 | Line 574 | makeambient(           /* make a new ambient value for storage
574		}
575
576
577	<	static void
577	>	static int
578		extambient(             /* extrapolate value at pv, nv */
579		COLOR  cr,
580		AMBVAL   *ap,
#	Line 546 | Line 583 | extambient(            /* extrapolate value at pv, nv */
583		FVECT  uvw[3]
584		)
585		{
586	+	const double    min_d = 0.05;
587		static FVECT    my_uvw[3];
588		FVECT           v1;
589		int             i;
#	Line 565 | Line 603 | extambient(            /* extrapolate value at pv, nv */
603		for (i = 3; i--; )
604		d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]);
605
606	<	if (d <= 0.0) {
607	<	setcolor(cr, 0.0, 0.0, 0.0);
570	<	return;
571	<	}
606	>	if (d < min_d)                  /* should not use if we can avoid it */
607	>	d = min_d;
608		copycolor(cr, ap->val);
609		scalecolor(cr, d);
610	+	return(d > min_d);
611		}
612
613
#	Line 633 | Line 670 | multambient(           /* compute ambient component & multiply
670		)
671		{
672		static int  rdepth = 0;                 /* ambient recursion */
673	<	COLOR   acol;
673	>	COLOR   acol, caustic;
674		double  d, l;
675
676	+	/* PMAP: Factor in ambient from global photon map (if enabled) and return
677	+	* as all ambient components accounted for */
678	+	if (ambPmap(aval, r, rdepth))
679	+	return;
680	+
681	+	/* PMAP: Otherwise factor in ambient from caustic photon map
682	+	* (ambPmapCaustic() returns zero if caustic photons disabled) and
683	+	* continue with RADIANCE ambient calculation */
684	+	copycolor(caustic, aval);
685	+	ambPmapCaustic(caustic, r, rdepth);
686	+
687		if (ambdiv <= 0)                        /* no ambient calculation */
688		goto dumbamb;
689		/* check number of bounces */
#	Line 653 | Line 701 | multambient(           /* compute ambient component & multiply
701		rdepth--;
702		if (d <= FTINY)
703		goto dumbamb;
704	<	copycolor(aval, acol);
704	>	copycolor(aval, acol);
705	>
706	>	/* PMAP: add in caustic */
707	>	addcolor(aval, caustic);
708		return;
709		}
710
#	Line 663 | Line 714 | multambient(           /* compute ambient component & multiply
714		setcolor(acol, 0.0, 0.0, 0.0);
715		d = sumambient(acol, r, nrm, rdepth,
716		&atrunk, thescene.cuorg, thescene.cusize);
717	+
718		if (d > FTINY) {
719		d = 1.0/d;
720		scalecolor(acol, d);
721		multcolor(aval, acol);
722	+
723	+	/* PMAP: add in caustic */
724	+	addcolor(aval, caustic);
725		return;
726		}
727	+
728		rdepth++;                               /* need to cache new value */
729		d = makeambient(acol, r, nrm, rdepth-1);
730		rdepth--;
731	+
732		if (d > FTINY) {
733		multcolor(aval, acol);          /* got new value */
734	+
735	+	/* PMAP: add in caustic */
736	+	addcolor(aval, caustic);
737		return;
738		}
739	+
740		dumbamb:                                        /* return global value */
741		if ((ambvwt <= 0) | (navsum == 0)) {
742		multcolor(aval, ambval);
743	+
744	+	/* PMAP: add in caustic */
745	+	addcolor(aval, caustic);
746		return;
747		}
748	+
749		l = bright(ambval);                     /* average in computations */
750		if (l > FTINY) {
751		d = (log(l)*(double)ambvwt + avsum) /
#	Line 1020 | Line 1085 | newambtree(void)                               /* allocate 8 ambient tree structs
1085		}
1086		atp = atfreelist;
1087		atfreelist = atp->kid;
1088	<	memset((char *)atp, '\0', 8*sizeof(AMBTREE));
1088	>	memset(atp, 0, 8*sizeof(AMBTREE));
1089		return(atp);
1090		}
1091
#	Line 1046 | Line 1111 | unloadatree(                   /* unload an ambient value tree */
1111		/* transfer values at this node */
1112		for (av = at->alist; av != NULL; av = at->alist) {
1113		at->alist = av->next;
1114	+	av->next = NULL;
1115		(*f)(av);
1116		}
1117		if (at->kid == NULL)
#	Line 1123 | Line 1189 | avlmemi(                               /* find list position from address */
1189		{
1190		AMBVAL  **avlpp;
1191
1192	<	avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2,
1193	<	nambvals, sizeof(AMBVAL *), &aposcmp);
1192	>	avlpp = (AMBVAL **)bsearch(&avaddr, avlist2,
1193	>	nambvals, sizeof(AMBVAL *), aposcmp);
1194		if (avlpp == NULL)
1195		error(CONSISTENCY, "address not found in avlmemi");
1196		return(avlpp - avlist2);
#	Line 1167 | Line 1233 | sortambvals(                   /* resort ambient values */
1233		}
1234		if (avlist1 == NULL) {          /* no time tracking -- rebuild tree? */
1235		if (avlist2 != NULL)
1236	<	free((void *)avlist2);
1236	>	free(avlist2);
1237		if (always) {           /* rebuild without sorting */
1238		oldatrunk = atrunk;
1239		atrunk.alist = NULL;
1240		atrunk.kid = NULL;
1241	<	unloadatree(&oldatrunk, &avinsert);
1241	>	unloadatree(&oldatrunk, avinsert);
1242		}
1243		} else {                        /* sort memory by last access time */
1244		/*
#	Line 1189 | Line 1255 | sortambvals(                   /* resort ambient values */
1255		eputs(errmsg);
1256		#endif
1257		i_avlist = 0;
1258	<	unloadatree(&atrunk, &av2list); /* empty current tree */
1258	>	unloadatree(&atrunk, av2list);  /* empty current tree */
1259		#ifdef DEBUG
1260		if (i_avlist < nambvals)
1261		error(CONSISTENCY, "missing ambient values in sortambvals");
1262		#endif
1263	<	qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp);
1264	<	qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), &aposcmp);
1263	>	qsort(avlist1, nambvals, sizeof(struct avl), alatcmp);
1264	>	qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
1265		for (i = 0; i < nambvals; i++) {
1266		if (avlist1[i].p == NULL)
1267		continue;
#	Line 1211 | Line 1277 | sortambvals(                   /* resort ambient values */
1277		avinsert(avlist2[j]);
1278		avlist1[j].p = NULL;
1279		}
1280	<	free((void *)avlist1);
1281	<	free((void *)avlist2);
1280	>	free(avlist1);
1281	>	free(avlist2);
1282		/* compute new sort interval */
1283		sortintvl = ambclock - lastsort;
1284		if (sortintvl >= MAX_SORT_INTVL/2)
#	Line 1261 | Line 1327 | ambsync(void)                  /* synchronize ambient file */
1327		if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0)
1328		goto seekerr;
1329		if ((n = flen - lastpos) > 0) {         /* file has grown */
1330	<	if (ambinp == NULL) {           /* use duplicate filedes */
1331	<	ambinp = fdopen(dup(fileno(ambfp)), "r");
1330	>	if (ambinp == NULL) {           /* get new file pointer */
1331	>	ambinp = fopen(ambfile, "rb");
1332		if (ambinp == NULL)
1333	<	error(SYSTEM, "fdopen failed in ambsync");
1333	>	error(SYSTEM, "fopen failed in ambsync");
1334		}
1335		if (fseek(ambinp, lastpos, SEEK_SET) < 0)
1336		goto seekerr;
#	Line 1279 | Line 1345 | ambsync(void)                  /* synchronize ambient file */
1345		avstore(&avs);
1346		n -= AMBVALSIZ;
1347		}
1348	<	lastpos = flen - n;
1349	<	/*** seek always as safety measure
1350	<	if (n) ***/                     /* alignment */
1285	<	if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0)
1286	<	goto seekerr;
1348	>	lastpos = flen - n;             /* check alignment */
1349	>	if (n && lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0)
1350	>	goto seekerr;
1351		}
1352		n = fflush(ambfp);                      /* calls write() at last */
1353	<	if (n != EOF)
1290	<	lastpos += (long)nunflshed*AMBVALSIZ;
1291	<	else if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0)
1292	<	goto seekerr;
1293	<
1353	>	lastpos += (long)nunflshed*AMBVALSIZ;
1354		aflock(F_UNLCK);                        /* release file */
1355		nunflshed = 0;
1356		return(n);
1357		seekerr:
1358		error(SYSTEM, "seek failed in ambsync");
1359	<	return -1; /* pro forma return */
1359	>	return(EOF);    /* pro forma return */
1360		}
1361
1362		#else   /* ! F_SETLKW */

Diff Legend

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