ViewVC Help

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

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

Comparing ray/src/rt/source.c (file contents):
Revision 2.62 by greg, Wed May 7 02:08:12 2014 UTC vs.
Revision 2.73 by greg, Fri Jul 3 00:42:20 2020 UTC

#	Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9
10		#include  "ray.h"
11		#include  "otypes.h"
12	+	#include  "otspecial.h"
13		#include  "rtotypes.h"
14		#include  "source.h"
15		#include  "random.h"
16	+	#include  "pmapsrc.h"
17	+	#include  "pmapmat.h"
18
19		#ifndef MAXSSAMP
20		#define MAXSSAMP        16              /* maximum samples per ray */
#	Line 40 | Line 43 | static int  maxcntr = 0;               /* size of contribution arra
43		static int cntcmp(const void *p1, const void *p2);
44
45
43	–	OBJREC *                        /* find an object's actual material */
44	–	findmaterial(OBJREC *o)
45	–	{
46	–	while (!ismaterial(o->otype)) {
47	–	if (o->otype == MOD_ALIAS && o->oargs.nsargs) {
48	–	OBJECT  aobj;
49	–	OBJREC  *ao;
50	–	aobj = lastmod(objndx(o), o->oargs.sarg[0]);
51	–	if (aobj < 0)
52	–	objerror(o, USER, "bad reference");
53	–	ao = objptr(aobj);
54	–	if (ismaterial(ao->otype))
55	–	return(ao);
56	–	if (ao->otype == MOD_ALIAS) {
57	–	o = ao;
58	–	continue;
59	–	}
60	–	}
61	–	if (o->omod == OVOID)
62	–	return(NULL);
63	–	o = objptr(o->omod);
64	–	}
65	–	return(o);              /* mixtures will return NULL */
66	–	}
67	–
68	–
46		void
47		marksources(void)                       /* find and mark source objects */
48		{
#	Line 97 | Line 74 | marksources(void)                      /* find and mark source objects */
74		m->otype == MAT_SPOT ? 7 : 3))
75		objerror(m, USER, "bad # arguments");
76
77	<	if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY &&
78	<	m->oargs.farg[2] <= FTINY)
77	>	if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) &
78	>	(m->oargs.farg[2] <= FTINY))
79		continue;                       /* don't bother */
80		if (m->otype == MAT_GLOW &&
81		o->otype != OBJ_SOURCE &&
#	Line 123 | Line 100 | marksources(void)                      /* find and mark source objects */
100		foundsource += (ambounce > 0);
101		}
102		} else if (m->otype == MAT_SPOT) {
103	+	if (source[ns].sflags & SDISTANT)
104	+	objerror(o, WARNING,
105	+	"distant source is a spotlight");
106		source[ns].sflags |= SSPOT;
107		if ((source[ns].sl.s = makespot(m)) == NULL)
108		goto memerr;
#	Line 133 | Line 113 | marksources(void)                      /* find and mark source objects */
113		source[ns].sflags |= SSKIP;
114		}
115		}
136	–	#if  SHADCACHE
137	–	initobscache(ns);
138	–	#endif
116		foundsource += !(source[ns].sflags & SSKIP);
117		}
118		if (!foundsource) {
119		error(WARNING, "no light sources found");
120		return;
121		}
122	<	markvirtuals();                 /* find and add virtual sources */
122	>	#if  SHADCACHE
123	>	for (ns = 0; ns < nsources; ns++)       /* initialize obstructor cache */
124	>	initobscache(ns);
125	>	#endif
126	>	/* PMAP: disable virtual sources */
127	>	if (!photonMapping)
128	>	markvirtuals();                 /* find and add virtual sources */
129	>
130		/* allocate our contribution arrays */
131		maxcntr = nsources + MAXSPART;  /* start with this many */
132		srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
133		cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR));
134	<	if ((srccnt == NULL) | (cntord == NULL))
135	<	goto memerr;
152	<	return;
134	>	if ((srccnt != NULL) & (cntord != NULL))
135	>	return;
136		memerr:
137		error(SYSTEM, "out of memory in marksources");
138		}
139
140
141		void
142	+	distantsources(void)                    /* only mark distant sources */
143	+	{
144	+	int  i;
145	+	OBJREC  *o, *m;
146	+	int  ns;
147	+	/* initialize dispatch table */
148	+	initstypes();
149	+	/* sources needed for sourcehit() */
150	+	for (i = 0; i < nsceneobjs; i++) {
151	+
152	+	o = objptr(i);
153	+
154	+	if ((o->otype != OBJ_SOURCE) | (o->omod == OVOID))
155	+	continue;
156	+	/* find material */
157	+	m = findmaterial(objptr(o->omod));
158	+	if (m == NULL)
159	+	continue;
160	+	if (!islight(m->otype))
161	+	continue;       /* not source modifier */
162	+
163	+	if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
164	+	m->otype == MAT_SPOT ? 7 : 3))
165	+	objerror(m, USER, "bad # arguments");
166	+
167	+	if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) &
168	+	(m->oargs.farg[2] <= FTINY))
169	+	continue;                       /* don't bother */
170	+	if (sfun[o->otype].of == NULL ||
171	+	sfun[o->otype].of->setsrc == NULL)
172	+	objerror(o, USER, "illegal material");
173	+
174	+	if ((ns = newsource()) < 0)
175	+	error(SYSTEM, "out of memory in distantsources");
176	+
177	+	setsource(&source[ns], o);
178	+
179	+	if (m->otype == MAT_GLOW) {
180	+	source[ns].sflags |= SPROX|SSKIP;
181	+	source[ns].sl.prox = m->oargs.farg[3];
182	+	} else if (m->otype == MAT_SPOT)
183	+	objerror(o, WARNING, "distant source is a spotlight");
184	+	}
185	+	}
186	+
187	+
188	+	void
189		freesources(void)                       /* free all source structures */
190		{
191		if (nsources > 0) {
#	Line 378 | Line 408 | direct(                                        /* add direct component */
408		int  nhits;
409		double  prob, ourthresh, hwt;
410		RAY  sr;
411	+
412	+	/* PMAP: Factor in direct photons (primarily for debugging/validation) */
413	+	if (directPhotonMapping) {
414	+	(*f)(r -> rcol, p, r -> ron, PI);
415	+	multDirectPmap(r);
416	+	return;
417	+	}
418	+
419		/* NOTE: srccnt and cntord global so no recursion */
420		if (nsources <= 0)
421		return;         /* no sources?! */
#	Line 396 | Line 434 | direct(                                        /* add direct component */
434		cntord[sn].sndx = sn;
435		scp = srccnt + sn;
436		scp->sno = sr.rsrc;
437	<	/* compute coefficient */
400	<	(*f)(scp->coef, p, sr.rdir, si.dom);
401	<	cntord[sn].brt = intens(scp->coef);
402	<	if (cntord[sn].brt <= 0.0)
403	<	continue;
404	<	#if SHADCACHE
405	<	/* check shadow cache */
437	>	#if SHADCACHE                                   /* check shadow cache */
438		if (si.np == 1 && srcblocked(&sr)) {
439		cntord[sn].brt = 0.0;
440		continue;
441		}
442		#endif
443	+	/* compute coefficient */
444	+	(*f)(scp->coef, p, sr.rdir, si.dom);
445	+	cntord[sn].brt = intens(scp->coef);
446	+	if (cntord[sn].brt <= 0.0)
447	+	continue;
448		VCOPY(scp->dir, sr.rdir);
449		copycolor(sr.rcoef, scp->coef);
450		/* compute potential */
#	Line 440 | Line 477 | direct(                                        /* add direct component */
477		/* compute number to check */
478		nshadcheck = pow((double)ncnts, shadcert) + .5;
479		/* modify threshold */
480	<	ourthresh = shadthresh / r->rweight;
480	>	if (ncnts > MINSHADCNT)
481	>	ourthresh = shadthresh / r->rweight;
482	>	else
483	>	ourthresh = 0;
484		/* test for shadows */
485		for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts;
486		hwt += (double)source[scp->sno].nhits /
#	Line 529 | Line 569 | srcscatter(                    /* compute source scattering into ray */
569		COLOR  cvext;
570		int  i, j;
571
572	<	if (r->slights == NULL || r->slights[0] == 0
573	<	|| r->gecc >= 1.-FTINY || r->rot >= FHUGE)
572	>	if (r->rot >= FHUGE*.99 || r->gecc >= 1.-FTINY)
573	>	return;         /* this can never work */
574	>	/* PMAP: do unconditional inscattering for volume photons */
575	>	if (!volumePhotonMapping && (r->slights == NULL || r->slights[0] == 0))
576		return;
577	+
578		if (ssampdist <= FTINY || (nsamps = r->rot/ssampdist + .5) < 1)
579		nsamps = 1;
580		#if MAXSSAMP
#	Line 540 | Line 583 | srcscatter(                    /* compute source scattering into ray */
583		#endif
584		oldsampndx = samplendx;
585		samplendx = random()&0x7fff;            /* randomize */
586	<	for (i = r->slights[0]; i > 0; i--) {   /* for each source */
586	>	for (i = volumePhotonMapping ? 1 : r->slights[0]; i > 0; i--) {
587	>	/* for each source OR once if volume photon map enabled */
588		for (j = 0; j < nsamps; j++) {  /* for each sample position */
589		samplendx++;
590		t = r->rot * (j+frandom())/nsamps;
#	Line 556 | Line 600 | srcscatter(                    /* compute source scattering into ray */
600		sr.rorg[0] = r->rorg[0] + r->rdir[0]*t;
601		sr.rorg[1] = r->rorg[1] + r->rdir[1]*t;
602		sr.rorg[2] = r->rorg[2] + r->rdir[2]*t;
603	<	initsrcindex(&si);      /* sample ray to this source */
604	<	si.sn = r->slights[i];
605	<	nopart(&si, &sr);
606	<	if (!srcray(&sr, NULL, &si) ||
607	<	sr.rsrc != r->slights[i])
608	<	continue;               /* no path */
603	>
604	>	if (!volumePhotonMapping) {
605	>	initsrcindex(&si);      /* sample ray to this source */
606	>	si.sn = r->slights[i];
607	>	nopart(&si, &sr);
608	>	if (!srcray(&sr, NULL, &si) ||
609	>	sr.rsrc != r->slights[i])
610	>	continue;       /* no path */
611		#if SHADCACHE
612	<	if (srcblocked(&sr))            /* check shadow cache */
613	<	continue;
612	>	if (srcblocked(&sr))    /* check shadow cache */
613	>	continue;
614		#endif
615	<	copycolor(sr.cext, r->cext);
616	<	copycolor(sr.albedo, r->albedo);
617	<	sr.gecc = r->gecc;
618	<	sr.slights = r->slights;
619	<	rayvalue(&sr);                  /* eval. source ray */
620	<	if (bright(sr.rcol) <= FTINY) {
615	>	copycolor(sr.cext, r->cext);
616	>	copycolor(sr.albedo, r->albedo);
617	>	sr.gecc = r->gecc;
618	>	sr.slights = r->slights;
619	>	rayvalue(&sr);          /* eval. source ray */
620	>	if (bright(sr.rcol) <= FTINY) {
621		#if SHADCACHE
622	<	srcblocker(&sr);        /* add blocker to cache */
622	>	srcblocker(&sr); /* add blocker to cache */
623		#endif
624	<	continue;
625	<	}
626	<	if (r->gecc <= FTINY)           /* compute P(theta) */
627	<	d = 1.;
628	<	else {
629	<	d = DOT(r->rdir, sr.rdir);
630	<	d = 1. + r->gecc*r->gecc - 2.*r->gecc*d;
631	<	d = (1. - r->gecc*r->gecc) / (d*sqrt(d));
632	<	}
624	>	continue;
625	>	}
626	>	if (r->gecc <= FTINY)   /* compute P(theta) */
627	>	d = 1.;
628	>	else {
629	>	d = DOT(r->rdir, sr.rdir);
630	>	d = 1. + r->gecc*r->gecc - 2.*r->gecc*d;
631	>	d = (1. - r->gecc*r->gecc) / (d*sqrt(d));
632	>	}
633		/* other factors */
634	<	d *= si.dom * r->rot / (4.*PI*nsamps);
634	>	d *= si.dom * r->rot / (4.*PI*nsamps);
635	>	scalecolor(sr.rcol, d);
636	>	} else {
637	>	/* PMAP: Add ambient inscattering from
638	>	* volume photons; note we reverse the
639	>	* incident ray direction since we're
640	>	* now in *backward* raytracing mode! */
641	>	sr.rdir [0] = -r -> rdir [0];
642	>	sr.rdir [1] = -r -> rdir [1];
643	>	sr.rdir [2] = -r -> rdir [2];
644	>	sr.gecc = r -> gecc;
645	>	inscatterVolumePmap(&sr, sr.rcol);
646	>	scalecolor(sr.rcol, r -> rot / nsamps);
647	>	}
648		multcolor(sr.rcol, r->cext);
649		multcolor(sr.rcol, r->albedo);
591	–	scalecolor(sr.rcol, d);
650		multcolor(sr.rcol, cvext);
651		addcolor(r->rcol, sr.rcol);     /* add it in */
652		}
#	Line 655 | Line 713 | weaksrcmat(OBJECT obj)         /* identify material */
713		* The same is true for stray specular samples, since the specular
714		* contribution from light sources is calculated separately.
715		*/
716	<
717	<	#define  badcomponent(m, r)     (r->crtype&(AMBIENT|SPECULAR) && \
716	>	/* PMAP: Also avoid counting sources via transferred ambient rays (e.g.
717	>	* through glass) when photon mapping is enabled, as these indirect
718	>	* components are already accounted for.
719	>	*/
720	>	#define  badcomponent(m, r)   (srcRayInPmap(r) || \
721	>	(r->crtype&(AMBIENT|SPECULAR) && \
722		!(r->crtype&SHADOW || r->rod < 0.0 || \
723	<	/* not 100% correct */  distglow(m, r, r->rot)))
723	>	/* not 100% correct */  distglow(m, r, r->rot))))
724
725		/* passillum *
726		*

Diff Legend

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