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.68 by greg, Mon Jun 11 15:10:49 2018 UTC vs.
Revision 2.78 by greg, Wed Mar 30 16:40:03 2022 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"
#	Line 35 | Line 36 | typedef struct {
36		float  brt;             /* brightness (for comparison) */
37		}  CNTPTR;              /* contribution pointer */
38
39	<	static CONTRIB  *srccnt;                /* source contributions in direct() */
40	<	static CNTPTR  *cntord;                 /* source ordering in direct() */
39	>	static CONTRIB  *srccnt = NULL;         /* source contributions in direct() */
40	>	static CNTPTR  *cntord = NULL;          /* source ordering in direct() */
41		static int  maxcntr = 0;                /* size of contribution arrays */
42
43		static int cntcmp(const void *p1, const void *p2);
44
45
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) {
50	–	OBJECT  aobj;
51	–	OBJREC  *ao;
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))
57	–	return(ao);
58	–	if (ao->otype == MOD_ALIAS) {
59	–	o = ao;
60	–	continue;
61	–	}
62	–	}
63	–	if (o->omod == OVOID)
64	–	return(NULL);
65	–	o = objptr(o->omod);
66	–	}
67	–	return(o);              /* mixtures will return NULL */
68	–	}
69	–
70	–
46		void
47		marksources(void)                       /* find and mark source objects */
48		{
49	<	int  foundsource = 0;
49	>	int  indirect = 0;
50		int  i;
51		OBJREC  *o, *m;
52		int  ns;
53	+	/* call us only once! */
54	+	if (nsources)
55	+	error(CONSISTENCY, "Multiple calls to marksources!");
56		/* initialize dispatch table */
57		initstypes();
58		/* find direct sources */
#	Line 85 | Line 63 | marksources(void)                      /* find and mark source objects */
63		if (!issurface(o->otype) || o->omod == OVOID)
64		continue;
65		/* find material */
66	<	m = findmaterial(objptr(o->omod));
66	>	m = findmaterial(o);
67		if (m == NULL)
68		continue;
69		if (m->otype == MAT_CLIP) {
#	Line 99 | Line 77 | marksources(void)                      /* find and mark source objects */
77		m->otype == MAT_SPOT ? 7 : 3))
78		objerror(m, USER, "bad # arguments");
79
80	<	if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY &&
81	<	m->oargs.farg[2] <= FTINY)
80	>	if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) &
81	>	(m->oargs.farg[2] <= FTINY))
82		continue;                       /* don't bother */
83		if (m->otype == MAT_GLOW &&
84		o->otype != OBJ_SOURCE &&
85		m->oargs.farg[3] <= FTINY) {
86	<	foundsource += (ambounce > 0);
86	>	indirect += (ambounce > 0);
87		continue;                       /* don't track these */
88		}
89		if (sfun[o->otype].of == NULL ||
#	Line 122 | Line 100 | marksources(void)                      /* find and mark source objects */
100		source[ns].sl.prox = m->oargs.farg[3];
101		if (source[ns].sflags & SDISTANT) {
102		source[ns].sflags |= SSKIP;
103	<	foundsource += (ambounce > 0);
103	>	indirect += (ambounce > 0);
104		}
105		} else if (m->otype == MAT_SPOT) {
106	+	if (source[ns].sflags & SDISTANT)
107	+	objerror(o, WARNING,
108	+	"distant source is a spotlight");
109		source[ns].sflags |= SSPOT;
110		if ((source[ns].sl.s = makespot(m)) == NULL)
111		goto memerr;
#	Line 135 | Line 116 | marksources(void)                      /* find and mark source objects */
116		source[ns].sflags |= SSKIP;
117		}
118		}
119	<	foundsource += !(source[ns].sflags & SSKIP);
119	>	maxcntr += !(source[ns].sflags & SSKIP);
120		}
121	<	if (!foundsource) {
122	<	error(WARNING, "no light sources found");
123	<	return;
121	>	if (!maxcntr) {
122	>	if (!indirect)
123	>	error(WARNING, "no light sources found");
124	>	return;         /* no direct calculation, it seems */
125		}
126		#if  SHADCACHE
127		for (ns = 0; ns < nsources; ns++)       /* initialize obstructor cache */
#	Line 150 | Line 132 | marksources(void)                      /* find and mark source objects */
132		markvirtuals();                 /* find and add virtual sources */
133
134		/* allocate our contribution arrays */
135	<	maxcntr = nsources + MAXSPART;  /* start with this many */
135	>	maxcntr += MAXSPART;    /* start with this many */
136		srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
137		cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR));
138	<	if ((srccnt == NULL) | (cntord == NULL))
139	<	goto memerr;
158	<	return;
138	>	if ((srccnt != NULL) & (cntord != NULL))
139	>	return;
140		memerr:
141		error(SYSTEM, "out of memory in marksources");
142		}
143
144
145		void
146	+	distantsources(void)                    /* only mark distant sources */
147	+	{
148	+	int  i;
149	+	OBJREC  *o, *m;
150	+	int  ns;
151	+	/* call us only once! */
152	+	if (nsources)
153	+	error(CONSISTENCY, "Multiple calls to distantsources!");
154	+	/* initialize dispatch table */
155	+	initstypes();
156	+	/* sources needed for sourcehit() */
157	+	for (i = 0; i < nsceneobjs; i++) {
158	+
159	+	o = objptr(i);
160	+
161	+	if ((o->otype != OBJ_SOURCE) | (o->omod == OVOID))
162	+	continue;
163	+	/* find material */
164	+	m = findmaterial(o);
165	+	if (m == NULL)
166	+	continue;
167	+	if (!islight(m->otype))
168	+	continue;       /* not source modifier */
169	+
170	+	if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
171	+	m->otype == MAT_SPOT ? 7 : 3))
172	+	objerror(m, USER, "bad # arguments");
173	+
174	+	if (m->oargs.farg[0] <= FTINY && (m->oargs.farg[1] <= FTINY) &
175	+	(m->oargs.farg[2] <= FTINY))
176	+	continue;                       /* don't bother */
177	+	if (sfun[o->otype].of == NULL ||
178	+	sfun[o->otype].of->setsrc == NULL)
179	+	objerror(o, USER, "illegal material");
180	+
181	+	if ((ns = newsource()) < 0)
182	+	error(SYSTEM, "out of memory in distantsources");
183	+
184	+	setsource(&source[ns], o);
185	+
186	+	if (m->otype == MAT_GLOW) {
187	+	source[ns].sflags |= SPROX|SSKIP;
188	+	source[ns].sl.prox = m->oargs.farg[3];
189	+	} else if (m->otype == MAT_SPOT)
190	+	objerror(o, WARNING, "distant source is a spotlight");
191	+	}
192	+	}
193	+
194	+
195	+	void
196		freesources(void)                       /* free all source structures */
197		{
198		if (nsources > 0) {
#	Line 270 | Line 301 | nomat:
301
302		static int
303		transillum(                     /* check if material is transparent illum */
304	<	OBJECT  obj
304	>	OBJREC *m
305		)
306		{
307	<	OBJREC *m = findmaterial(objptr(obj));
277	<
307	>	m = findmaterial(m);
308		if (m == NULL)
309		return(1);
310		if (m->otype != MAT_ILLUM)
#	Line 307 | Line 337 | sourcehit(                     /* check to see if ray hit distant source
337		*/
338		if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2)
339		continue;
340	<	/* is it the only possibility? */
341	<	if (first == last) {
340	>	/* is it what we aimed for? */
341	>	if (i == r->rsrc) {
342		r->ro = source[i].so;
343		break;
344		}
#	Line 320 | Line 350 | sourcehit(                     /* check to see if ray hit distant source
350		glowsrc = i;
351		continue;
352		}
353	<	if (transillum(source[i].so->omod)) {
353	>	if (transillum(source[i].so)) {
354		if (transrc < 0)
355		transrc = i;
356		continue;
#	Line 340 | Line 370 | sourcehit(                     /* check to see if ray hit distant source
370		return(0);      /* nothing usable */
371		}
372		/*
373	<	* Make assignments.
373	>	* Assign object index
374		*/
375		r->robj = objndx(r->ro);
346	–	for (i = 0; i < 3; i++)
347	–	r->ron[i] = -r->rdir[i];
348	–	r->rod = 1.0;
349	–	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
350	–	r->uv[0] = r->uv[1] = 0.0;
351	–	r->rox = NULL;
376		return(1);
377		}
378
#	Line 391 | Line 415 | direct(                                        /* add direct component */
415		multDirectPmap(r);
416		return;
417		}
394	–
418		/* NOTE: srccnt and cntord global so no recursion */
419	<	if (nsources <= 0)
420	<	return;         /* no sources?! */
421	<	/* potential contributions */
422	<	initsrcindex(&si);
419	>	if (maxcntr <= 0)
420	>	return;         /* no direct?! */
421	>
422	>	initsrcindex(&si);                      /* potential contributions */
423		for (sn = 0; srcray(&sr, r, &si); sn++) {
424		if (sn >= maxcntr) {
425		maxcntr = sn + MAXSPART;
#	Line 410 | Line 433 | direct(                                        /* add direct component */
433		cntord[sn].sndx = sn;
434		scp = srccnt + sn;
435		scp->sno = sr.rsrc;
436	<	/* compute coefficient */
414	<	(*f)(scp->coef, p, sr.rdir, si.dom);
415	<	cntord[sn].brt = intens(scp->coef);
416	<	if (cntord[sn].brt <= 0.0)
417	<	continue;
418	<	#if SHADCACHE
419	<	/* check shadow cache */
436	>	#if SHADCACHE                                   /* check shadow cache */
437		if (si.np == 1 && srcblocked(&sr)) {
438		cntord[sn].brt = 0.0;
439		continue;
440		}
441		#endif
442	+	/* compute coefficient */
443	+	(*f)(scp->coef, p, sr.rdir, si.dom);
444	+	cntord[sn].brt = intens(scp->coef);
445	+	if (cntord[sn].brt <= 0.0)
446	+	continue;
447		VCOPY(scp->dir, sr.rdir);
448		copycolor(sr.rcoef, scp->coef);
449		/* compute potential */
#	Line 454 | Line 476 | direct(                                        /* add direct component */
476		/* compute number to check */
477		nshadcheck = pow((double)ncnts, shadcert) + .5;
478		/* modify threshold */
479	<	if (ncnts > MINSHADCNT)
458	<	ourthresh = shadthresh / r->rweight;
459	<	else
460	<	ourthresh = 0;
479	>	ourthresh = shadthresh / r->rweight;
480		/* test for shadows */
481		for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts;
482		hwt += (double)source[scp->sno].nhits /
483		(double)source[scp->sno].ntests,
484		sn++) {
485		/* check threshold */
486	<	if ((sn+nshadcheck>=ncnts ? cntord[sn].brt :
486	>	if (sn >= MINSHADCNT &&
487	>	(sn+nshadcheck>=ncnts ? cntord[sn].brt :
488		cntord[sn].brt-cntord[sn+nshadcheck].brt)
489	<	< ourthresh*bright(r->rcol))
489	>	< ourthresh*bright(r->rcol))
490		break;
491		scp = srccnt + cntord[sn].sndx;
492		/* test for hit */
#	Line 546 | Line 566 | srcscatter(                    /* compute source scattering into ray */
566		COLOR  cvext;
567		int  i, j;
568
569	<	if (r->rot >= FHUGE || r->gecc >= 1.-FTINY)
569	>	if (r->rot >= FHUGE*.99 || r->gecc >= 1.-FTINY)
570		return;         /* this can never work */
571		/* PMAP: do unconditional inscattering for volume photons */
572		if (!volumePhotonMapping && (r->slights == NULL || r->slights[0] == 0))
#	Line 649 | Line 669 | srcscatter(                    /* compute source scattering into ray */
669		*/
670
671		static int
672	<	weaksrcmat(OBJECT obj)          /* identify material */
672	>	weaksrcmat(OBJREC *m)           /* identify material */
673		{
674	<	OBJREC *m = findmaterial(objptr(obj));
655	<
674	>	m = findmaterial(m);
675		if (m == NULL) return(0);
676		return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW));
677		}
678
679		#define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
680		r->rod > 0.0 && \
681	<	weaksrcmat(source[r->rsrc].so->omod))
681	>	weaksrcmat(source[r->rsrc].so))
682
683		/* wrongsource *
684		*

Diff Legend

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