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.49 by greg, Fri Apr 15 04:44:51 2005 UTC vs.
Revision 2.69 by greg, Wed Nov 7 18:22:29 2018 UTC

#	Line 12 | Line 12 | static const char RCSid[] = "$Id$";
12		#include  "rtotypes.h"
13		#include  "source.h"
14		#include  "random.h"
15	+	#include  "pmapsrc.h"
16	+	#include  "pmapmat.h"
17
16	–	extern double  ssampdist;               /* scatter sampling distance */
17	–
18		#ifndef MAXSSAMP
19		#define MAXSSAMP        16              /* maximum samples per ray */
20		#endif
#	Line 42 | Line 42 | static int  maxcntr = 0;               /* size of contribution arra
42		static int cntcmp(const void *p1, const void *p2);
43
44
45	<	extern OBJREC *                 /* find an object's actual material */
46	<	findmaterial(register OBJREC *o)
45	>	OBJREC *                        /* find an object's actual material */
46	>	findmaterial(OBJREC *o)
47		{
48		while (!ismaterial(o->otype)) {
49		if (o->otype == MOD_ALIAS && o->oargs.nsargs) {
#	Line 52 | Line 52 | findmaterial(register OBJREC *o)
52		aobj = lastmod(objndx(o), o->oargs.sarg[0]);
53		if (aobj < 0)
54		objerror(o, USER, "bad reference");
55	<	ao = objptr(aobj);
56	<	if (ismaterial(ao->otype))
55	>	/* recursive check on alias branch */
56	>	if ((ao = findmaterial(objptr(aobj))) != NULL)
57		return(ao);
58		}
59		if (o->omod == OVOID)
#	Line 64 | Line 64 | findmaterial(register OBJREC *o)
64		}
65
66
67	<	extern void
67	>	void
68		marksources(void)                       /* find and mark source objects */
69		{
70		int  foundsource = 0;
71		int  i;
72	<	register OBJREC  *o, *m;
73	<	register int  ns;
72	>	OBJREC  *o, *m;
73	>	int  ns;
74		/* initialize dispatch table */
75		initstypes();
76		/* find direct sources */
#	Line 82 | Line 82 | marksources(void)                      /* find and mark source objects */
82		continue;
83		/* find material */
84		m = findmaterial(objptr(o->omod));
85	<	if (m == NULL || !islight(m->otype))
85	>	if (m == NULL)
86	>	continue;
87	>	if (m->otype == MAT_CLIP) {
88	>	markclip(m);    /* special case for antimatter */
89	>	continue;
90	>	}
91	>	if (!islight(m->otype))
92		continue;       /* not source modifier */
93
94		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
95		m->otype == MAT_SPOT ? 7 : 3))
96		objerror(m, USER, "bad # arguments");
97
92	–	if (m->otype == MAT_GLOW &&
93	–	o->otype != OBJ_SOURCE &&
94	–	m->oargs.farg[3] <= FTINY)
95	–	continue;                       /* don't bother */
98		if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY &&
99		m->oargs.farg[2] <= FTINY)
100		continue;                       /* don't bother */
101	<
101	>	if (m->otype == MAT_GLOW &&
102	>	o->otype != OBJ_SOURCE &&
103	>	m->oargs.farg[3] <= FTINY) {
104	>	foundsource += (ambounce > 0);
105	>	continue;                       /* don't track these */
106	>	}
107		if (sfun[o->otype].of == NULL ||
108		sfun[o->otype].of->setsrc == NULL)
109		objerror(o, USER, "illegal material");
#	Line 109 | Line 116 | marksources(void)                      /* find and mark source objects */
116		if (m->otype == MAT_GLOW) {
117		source[ns].sflags |= SPROX;
118		source[ns].sl.prox = m->oargs.farg[3];
119	<	if (source[ns].sflags & SDISTANT)
119	>	if (source[ns].sflags & SDISTANT) {
120		source[ns].sflags |= SSKIP;
121	+	foundsource += (ambounce > 0);
122	+	}
123		} else if (m->otype == MAT_SPOT) {
124		source[ns].sflags |= SSPOT;
125		if ((source[ns].sl.s = makespot(m)) == NULL)
#	Line 122 | Line 131 | marksources(void)                      /* find and mark source objects */
131		source[ns].sflags |= SSKIP;
132		}
133		}
134	<	#if  SHADCACHE
126	<	initobscache(ns);
127	<	#endif
128	<	if (!(source[ns].sflags & SSKIP))
129	<	foundsource++;
134	>	foundsource += !(source[ns].sflags & SSKIP);
135		}
136		if (!foundsource) {
137		error(WARNING, "no light sources found");
138		return;
139		}
140	<	markvirtuals();                 /* find and add virtual sources */
140	>	#if  SHADCACHE
141	>	for (ns = 0; ns < nsources; ns++)       /* initialize obstructor cache */
142	>	initobscache(ns);
143	>	#endif
144	>	/* PMAP: disable virtual sources */
145	>	if (!photonMapping)
146	>	markvirtuals();                 /* find and add virtual sources */
147	>
148		/* allocate our contribution arrays */
149		maxcntr = nsources + MAXSPART;  /* start with this many */
150		srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
#	Line 145 | Line 157 | memerr:
157		}
158
159
160	<	extern void
160	>	void
161		freesources(void)                       /* free all source structures */
162		{
163		if (nsources > 0) {
#	Line 157 | Line 169 | freesources(void)                      /* free all source structures */
169		source = NULL;
170		nsources = 0;
171		}
172	+	markclip(NULL);
173		if (maxcntr <= 0)
174		return;
175		free((void *)srccnt);
#	Line 167 | Line 180 | freesources(void)                      /* free all source structures */
180		}
181
182
183	<	extern int
183	>	int
184		srcray(                         /* send a ray to a source, return domega */
185	<	register RAY  *sr,              /* returned source ray */
185	>	RAY  *sr,               /* returned source ray */
186		RAY  *r,                        /* ray which hit object */
187		SRCINDEX  *si                   /* source sample index */
188		)
189		{
190	<	double  d;                          /* distance to source */
191	<	register SRCREC  *srcp;
190	>	double  d;                              /* distance to source */
191	>	SRCREC  *srcp;
192
193	<	rayorigin(sr, r, SHADOW, 1.0);              /* ignore limits */
193	>	rayorigin(sr, SHADOW, r, NULL);         /* ignore limits */
194
195	<	while ((d = nextssamp(sr, si)) != 0.0) {
196	<	sr->rsrc = si->sn;                      /* remember source */
197	<	srcp = source + si->sn;
198	<	if (srcp->sflags & SDISTANT) {
199	<	if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
200	<	continue;
201	<	return(1);              /* sample OK */
202	<	}
195	>	if (r == NULL)
196	>	sr->rmax = 0.0;
197	>
198	>	while ((d = nextssamp(sr, si)) != 0.0) {
199	>	sr->rsrc = si->sn;                      /* remember source */
200	>	srcp = source + si->sn;
201	>	if (srcp->sflags & SDISTANT) {
202	>	if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
203	>	continue;
204	>	return(1);              /* sample OK */
205	>	}
206		/* local source */
207		/* check proximity */
208	<	if (srcp->sflags & SPROX && d > srcp->sl.prox)
193	<	continue;
194	<	/* check angle */
195	<	if (srcp->sflags & SSPOT) {
196	<	if (spotout(sr, srcp->sl.s))
208	>	if (srcp->sflags & SPROX && d > srcp->sl.prox)
209		continue;
210	+	/* check angle */
211	+	if (srcp->sflags & SSPOT) {
212	+	if (spotout(sr, srcp->sl.s))
213	+	continue;
214		/* adjust solid angle */
215	<	si->dom *= d*d;
216	<	d += srcp->sl.s->flen;
217	<	si->dom /= d*d;
215	>	si->dom *= d*d;
216	>	d += srcp->sl.s->flen;
217	>	si->dom /= d*d;
218	>	}
219	>	return(1);                      /* sample OK */
220		}
221	<	return(1);                      /* sample OK */
204	<	}
205	<	return(0);                  /* no more samples */
221	>	return(0);                      /* no more samples */
222		}
223
224
225	<	extern void
225	>	void
226		srcvalue(                       /* punch ray to source and compute value */
227	<	register RAY  *r
227	>	RAY  *r
228		)
229		{
230	<	register SRCREC  *sp;
230	>	SRCREC  *sp;
231
232		sp = &source[r->rsrc];
233		if (sp->sflags & SVIRTUAL) {    /* virtual source */
#	Line 263 | Line 279 | transillum(                    /* check if material is transparent illu
279		}
280
281
282	<	extern int
282	>	int
283		sourcehit(                      /* check to see if ray hit distant source */
284	<	register RAY  *r
284	>	RAY  *r
285		)
286		{
287		int  glowsrc = -1;
288		int  transrc = -1;
289		int  first, last;
290	<	register int  i;
290	>	int  i;
291
292		if (r->rsrc >= 0) {             /* check only one if aimed */
293		first = last = r->rsrc;
#	Line 296 | Line 312 | sourcehit(                     /* check to see if ray hit distant source
312		* If it's a glow or transparent illum, just remember it.
313		*/
314		if (source[i].sflags & SSKIP) {
315	<	glowsrc = i;
315	>	if (glowsrc < 0)
316	>	glowsrc = i;
317		continue;
318		}
319		if (transillum(source[i].so->omod)) {
320	<	transrc = i;
320	>	if (transrc < 0)
321	>	transrc = i;
322		continue;
323		}
324		r->ro = source[i].so;   /* otherwise, use first hit */
#	Line 337 | Line 355 | cntcmp(                                /* contribution compare (descending) */
355		const void *p2
356		)
357		{
358	<	register const CNTPTR  *sc1 = (const CNTPTR *)p1;
359	<	register const CNTPTR  *sc2 = (const CNTPTR *)p2;
358	>	const CNTPTR  *sc1 = (const CNTPTR *)p1;
359	>	const CNTPTR  *sc2 = (const CNTPTR *)p2;
360
361		if (sc1->brt > sc2->brt)
362		return(-1);
#	Line 348 | Line 366 | cntcmp(                                /* contribution compare (descending) */
366		}
367
368
369	<	extern void
369	>	void
370		direct(                                 /* add direct component */
371		RAY  *r,                        /* ray that hit surface */
372		srcdirf_t *f,                   /* direct component coefficient function */
373		void  *p                        /* data for f */
374		)
375		{
376	<	register int  sn;
377	<	register CONTRIB  *scp;
376	>	int  sn;
377	>	CONTRIB  *scp;
378		SRCINDEX  si;
379		int  nshadcheck, ncnts;
380		int  nhits;
381		double  prob, ourthresh, hwt;
382		RAY  sr;
383	+
384	+	/* PMAP: Factor in direct photons (primarily for debugging/validation) */
385	+	if (directPhotonMapping) {
386	+	(*f)(r -> rcol, p, r -> ron, PI);
387	+	multDirectPmap(r);
388	+	return;
389	+	}
390	+
391		/* NOTE: srccnt and cntord global so no recursion */
392		if (nsources <= 0)
393		return;         /* no sources?! */
#	Line 382 | Line 408 | direct(                                        /* add direct component */
408		scp->sno = sr.rsrc;
409		/* compute coefficient */
410		(*f)(scp->coef, p, sr.rdir, si.dom);
411	<	cntord[sn].brt = bright(scp->coef);
411	>	cntord[sn].brt = intens(scp->coef);
412		if (cntord[sn].brt <= 0.0)
413		continue;
414		#if SHADCACHE
#	Line 393 | Line 419 | direct(                                        /* add direct component */
419		}
420		#endif
421		VCOPY(scp->dir, sr.rdir);
422	+	copycolor(sr.rcoef, scp->coef);
423		/* compute potential */
424	<	srcvalue(&sr);
424	>	sr.revf = srcvalue;
425	>	rayvalue(&sr);
426	>	multcolor(sr.rcol, sr.rcoef);
427		copycolor(scp->val, sr.rcol);
428	<	multcolor(scp->val, scp->coef);
400	<	cntord[sn].brt = bright(scp->val);
428	>	cntord[sn].brt = bright(sr.rcol);
429		}
430		/* sort contributions */
431		qsort(cntord, sn, sizeof(CNTPTR), cntcmp);
432		{                                       /* find last */
433	<	register int  l, m;
433	>	int  l, m;
434
435		ncnts = l = sn;
436		sn = 0;
#	Line 422 | Line 450 | direct(                                        /* add direct component */
450		/* compute number to check */
451		nshadcheck = pow((double)ncnts, shadcert) + .5;
452		/* modify threshold */
453	<	ourthresh = shadthresh / r->rweight;
453	>	if (ncnts > MINSHADCNT)
454	>	ourthresh = shadthresh / r->rweight;
455	>	else
456	>	ourthresh = 0;
457		/* test for shadows */
458		for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts;
459		hwt += (double)source[scp->sno].nhits /
#	Line 435 | Line 466 | direct(                                        /* add direct component */
466		break;
467		scp = srccnt + cntord[sn].sndx;
468		/* test for hit */
469	<	rayorigin(&sr, r, SHADOW, 1.0);
469	>	rayorigin(&sr, SHADOW, r, NULL);
470	>	copycolor(sr.rcoef, scp->coef);
471		VCOPY(sr.rdir, scp->dir);
472		sr.rsrc = scp->sno;
473		/* keep statistics */
#	Line 448 | Line 480 | direct(                                        /* add direct component */
480		source[scp->sno].sflags & SFOLLOW )) {
481		/* follow entire path */
482		raycont(&sr);
451	–	rayparticipate(&sr);
483		if (trace != NULL)
484		(*trace)(&sr);  /* trace execution */
485		if (bright(sr.rcol) <= FTINY) {
#	Line 460 | Line 491 | direct(                                        /* add direct component */
491		#endif
492		continue;       /* missed! */
493		}
494	+	rayparticipate(&sr);
495	+	multcolor(sr.rcol, sr.rcoef);
496		copycolor(scp->val, sr.rcol);
497	<	multcolor(scp->val, scp->coef);
497	>	} else if (trace != NULL &&
498	>	(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW))
499	>	== (SDISTANT|SFOLLOW) &&
500	>	sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) {
501	>	(*trace)(&sr);          /* trace execution */
502	>	/* skip call to rayparticipate() & scp->val update */
503		}
504		/* add contribution if hit */
505		addcolor(r->rcol, scp->val);
#	Line 483 | Line 521 | direct(                                        /* add direct component */
521		scp = srccnt + cntord[sn].sndx;
522		prob = hwt * (double)source[scp->sno].nhits /
523		(double)source[scp->sno].ntests;
524	<	if (prob > 1.0)
525	<	prob = 1.0;
488	<	scalecolor(scp->val, prob);
524	>	if (prob < 1.0)
525	>	scalecolor(scp->val, prob);
526		addcolor(r->rcol, scp->val);
527		}
528		}
529
530
531	<	extern void
531	>	void
532		srcscatter(                     /* compute source scattering into ray */
533	<	register RAY  *r
533	>	RAY  *r
534		)
535		{
536		int  oldsampndx;
#	Line 505 | Line 542 | srcscatter(                    /* compute source scattering into ray */
542		COLOR  cvext;
543		int  i, j;
544
545	<	if (r->slights == NULL || r->slights[0] == 0
546	<	|| r->gecc >= 1.-FTINY || r->rot >= FHUGE)
545	>	if (r->rot >= FHUGE || r->gecc >= 1.-FTINY)
546	>	return;         /* this can never work */
547	>	/* PMAP: do unconditional inscattering for volume photons */
548	>	if (!volumePhotonMapping && (r->slights == NULL || r->slights[0] == 0))
549		return;
550	+
551		if (ssampdist <= FTINY || (nsamps = r->rot/ssampdist + .5) < 1)
552		nsamps = 1;
553		#if MAXSSAMP
#	Line 516 | Line 556 | srcscatter(                    /* compute source scattering into ray */
556		#endif
557		oldsampndx = samplendx;
558		samplendx = random()&0x7fff;            /* randomize */
559	<	for (i = r->slights[0]; i > 0; i--) {   /* for each source */
559	>	for (i = volumePhotonMapping ? 1 : r->slights[0]; i > 0; i--) {
560	>	/* for each source OR once if volume photon map enabled */
561		for (j = 0; j < nsamps; j++) {  /* for each sample position */
562		samplendx++;
563		t = r->rot * (j+frandom())/nsamps;
#	Line 532 | Line 573 | srcscatter(                    /* compute source scattering into ray */
573		sr.rorg[0] = r->rorg[0] + r->rdir[0]*t;
574		sr.rorg[1] = r->rorg[1] + r->rdir[1]*t;
575		sr.rorg[2] = r->rorg[2] + r->rdir[2]*t;
576	<	sr.rmax = 0.;
577	<	initsrcindex(&si);      /* sample ray to this source */
578	<	si.sn = r->slights[i];
579	<	nopart(&si, &sr);
580	<	if (!srcray(&sr, NULL, &si) ||
581	<	sr.rsrc != r->slights[i])
582	<	continue;               /* no path */
576	>
577	>	if (!volumePhotonMapping) {
578	>	initsrcindex(&si);      /* sample ray to this source */
579	>	si.sn = r->slights[i];
580	>	nopart(&si, &sr);
581	>	if (!srcray(&sr, NULL, &si) ||
582	>	sr.rsrc != r->slights[i])
583	>	continue;       /* no path */
584		#if SHADCACHE
585	<	if (srcblocked(&sr))            /* check shadow cache */
586	<	continue;
585	>	if (srcblocked(&sr))    /* check shadow cache */
586	>	continue;
587		#endif
588	<	copycolor(sr.cext, r->cext);
589	<	copycolor(sr.albedo, r->albedo);
590	<	sr.gecc = r->gecc;
591	<	sr.slights = r->slights;
592	<	rayvalue(&sr);                  /* eval. source ray */
593	<	if (bright(sr.rcol) <= FTINY) {
588	>	copycolor(sr.cext, r->cext);
589	>	copycolor(sr.albedo, r->albedo);
590	>	sr.gecc = r->gecc;
591	>	sr.slights = r->slights;
592	>	rayvalue(&sr);          /* eval. source ray */
593	>	if (bright(sr.rcol) <= FTINY) {
594		#if SHADCACHE
595	<	srcblocker(&sr);        /* add blocker to cache */
595	>	srcblocker(&sr); /* add blocker to cache */
596		#endif
597	<	continue;
598	<	}
599	<	if (r->gecc <= FTINY)           /* compute P(theta) */
600	<	d = 1.;
601	<	else {
602	<	d = DOT(r->rdir, sr.rdir);
603	<	d = 1. + r->gecc*r->gecc - 2.*r->gecc*d;
604	<	d = (1. - r->gecc*r->gecc) / (d*sqrt(d));
605	<	}
597	>	continue;
598	>	}
599	>	if (r->gecc <= FTINY)   /* compute P(theta) */
600	>	d = 1.;
601	>	else {
602	>	d = DOT(r->rdir, sr.rdir);
603	>	d = 1. + r->gecc*r->gecc - 2.*r->gecc*d;
604	>	d = (1. - r->gecc*r->gecc) / (d*sqrt(d));
605	>	}
606		/* other factors */
607	<	d *= si.dom * r->rot / (4.*PI*nsamps);
607	>	d *= si.dom * r->rot / (4.*PI*nsamps);
608	>	scalecolor(sr.rcol, d);
609	>	} else {
610	>	/* PMAP: Add ambient inscattering from
611	>	* volume photons; note we reverse the
612	>	* incident ray direction since we're
613	>	* now in *backward* raytracing mode! */
614	>	sr.rdir [0] = -r -> rdir [0];
615	>	sr.rdir [1] = -r -> rdir [1];
616	>	sr.rdir [2] = -r -> rdir [2];
617	>	sr.gecc = r -> gecc;
618	>	inscatterVolumePmap(&sr, sr.rcol);
619	>	scalecolor(sr.rcol, r -> rot / nsamps);
620	>	}
621		multcolor(sr.rcol, r->cext);
622		multcolor(sr.rcol, r->albedo);
568	–	scalecolor(sr.rcol, d);
623		multcolor(sr.rcol, cvext);
624		addcolor(r->rcol, sr.rcol);     /* add it in */
625		}
#	Line 632 | Line 686 | weaksrcmat(OBJECT obj)         /* identify material */
686		* The same is true for stray specular samples, since the specular
687		* contribution from light sources is calculated separately.
688		*/
689	<
690	<	#define  badcomponent(m, r)     (r->crtype&(AMBIENT|SPECULAR) && \
689	>	/* PMAP: Also avoid counting sources via transferred ambient rays (e.g.
690	>	* through glass) when photon mapping is enabled, as these indirect
691	>	* components are already accounted for.
692	>	*/
693	>	#define  badcomponent(m, r)   (srcRayInPmap(r) || \
694	>	(r->crtype&(AMBIENT|SPECULAR) && \
695		!(r->crtype&SHADOW || r->rod < 0.0 || \
696	<	/* not 100% correct */  distglow(m, r, r->rot)))
696	>	/* not 100% correct */  distglow(m, r, r->rot))))
697
698		/* passillum *
699		*
#	Line 657 | Line 715 | weaksrcmat(OBJECT obj)         /* identify material */
715		distglow(m, r, raydist(r,PRIMARY)))
716
717
718	<	extern int
718	>	int
719		m_light(                                /* ray hit a light source */
720	<	register OBJREC  *m,
721	<	register RAY  *r
720	>	OBJREC  *m,
721	>	RAY  *r
722		)
723		{
724		/* check for over-counting */
725	<	if (badcomponent(m, r))
725	>	if (badcomponent(m, r)) {
726	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
727		return(1);
728	<	if (wrongsource(m, r))
728	>	}
729	>	if (wrongsource(m, r)) {
730	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
731		return(1);
732	+	}
733		/* check for passed illum */
734		if (passillum(m, r)) {
735		if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID))
#	Line 675 | Line 737 | m_light(                               /* ray hit a light source */
737		raytrans(r);
738		return(1);
739		}
740	+	/* check for invisibility */
741	+	if (srcignore(m, r)) {
742	+	setcolor(r->rcoef, 0.0, 0.0, 0.0);
743	+	return(1);
744	+	}
745		/* otherwise treat as source */
746		/* check for behind */
747		if (r->rod < 0.0)
681	–	return(1);
682	–	/* check for invisibility */
683	–	if (srcignore(m, r))
748		return(1);
749		/* check for outside spot */
750		if (m->otype==MAT_SPOT && spotout(r, makespot(m)))

Diff Legend

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