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.77 by greg, Wed Nov 24 19:08:51 2021 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 42 | Line 43 | static int  maxcntr = 0;               /* size of contribution arra
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		{
#	Line 85 | Line 60 | marksources(void)                      /* find and mark source objects */
60		if (!issurface(o->otype) || o->omod == OVOID)
61		continue;
62		/* find material */
63	<	m = findmaterial(objptr(o->omod));
63	>	m = findmaterial(o);
64		if (m == NULL)
65		continue;
66		if (m->otype == MAT_CLIP) {
#	Line 99 | 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 125 | 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 153 | Line 131 | marksources(void)                      /* find and mark source objects */
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;
158	<	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(o);
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 270 | Line 294 | nomat:
294
295		static int
296		transillum(                     /* check if material is transparent illum */
297	<	OBJECT  obj
297	>	OBJREC *m
298		)
299		{
300	<	OBJREC *m = findmaterial(objptr(obj));
277	<
300	>	m = findmaterial(m);
301		if (m == NULL)
302		return(1);
303		if (m->otype != MAT_ILLUM)
#	Line 307 | Line 330 | sourcehit(                     /* check to see if ray hit distant source
330		*/
331		if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2)
332		continue;
333	<	/* is it the only possibility? */
334	<	if (first == last) {
333	>	/* is it what we aimed for? */
334	>	if (i == r->rsrc) {
335		r->ro = source[i].so;
336		break;
337		}
#	Line 320 | Line 343 | sourcehit(                     /* check to see if ray hit distant source
343		glowsrc = i;
344		continue;
345		}
346	<	if (transillum(source[i].so->omod)) {
346	>	if (transillum(source[i].so)) {
347		if (transrc < 0)
348		transrc = i;
349		continue;
#	Line 340 | Line 363 | sourcehit(                     /* check to see if ray hit distant source
363		return(0);      /* nothing usable */
364		}
365		/*
366	<	* Make assignments.
366	>	* Assign object index
367		*/
368		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;
369		return(1);
370		}
371
#	Line 410 | Line 427 | direct(                                        /* add direct component */
427		cntord[sn].sndx = sn;
428		scp = srccnt + sn;
429		scp->sno = sr.rsrc;
430	<	/* 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 */
430	>	#if SHADCACHE                                   /* check shadow cache */
431		if (si.np == 1 && srcblocked(&sr)) {
432		cntord[sn].brt = 0.0;
433		continue;
434		}
435		#endif
436	+	/* compute coefficient */
437	+	(*f)(scp->coef, p, sr.rdir, si.dom);
438	+	cntord[sn].brt = intens(scp->coef);
439	+	if (cntord[sn].brt <= 0.0)
440	+	continue;
441		VCOPY(scp->dir, sr.rdir);
442		copycolor(sr.rcoef, scp->coef);
443		/* compute potential */
#	Line 454 | Line 470 | direct(                                        /* add direct component */
470		/* compute number to check */
471		nshadcheck = pow((double)ncnts, shadcert) + .5;
472		/* modify threshold */
473	<	if (ncnts > MINSHADCNT)
458	<	ourthresh = shadthresh / r->rweight;
459	<	else
460	<	ourthresh = 0;
473	>	ourthresh = shadthresh / r->rweight;
474		/* test for shadows */
475		for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts;
476		hwt += (double)source[scp->sno].nhits /
477		(double)source[scp->sno].ntests,
478		sn++) {
479		/* check threshold */
480	<	if ((sn+nshadcheck>=ncnts ? cntord[sn].brt :
480	>	if (sn >= MINSHADCNT &&
481	>	(sn+nshadcheck>=ncnts ? cntord[sn].brt :
482		cntord[sn].brt-cntord[sn+nshadcheck].brt)
483	<	< ourthresh*bright(r->rcol))
483	>	< ourthresh*bright(r->rcol))
484		break;
485		scp = srccnt + cntord[sn].sndx;
486		/* test for hit */
#	Line 546 | Line 560 | srcscatter(                    /* compute source scattering into ray */
560		COLOR  cvext;
561		int  i, j;
562
563	<	if (r->rot >= FHUGE || r->gecc >= 1.-FTINY)
563	>	if (r->rot >= FHUGE*.99 || r->gecc >= 1.-FTINY)
564		return;         /* this can never work */
565		/* PMAP: do unconditional inscattering for volume photons */
566		if (!volumePhotonMapping && (r->slights == NULL || r->slights[0] == 0))
#	Line 649 | Line 663 | srcscatter(                    /* compute source scattering into ray */
663		*/
664
665		static int
666	<	weaksrcmat(OBJECT obj)          /* identify material */
666	>	weaksrcmat(OBJREC *m)           /* identify material */
667		{
668	<	OBJREC *m = findmaterial(objptr(obj));
655	<
668	>	m = findmaterial(m);
669		if (m == NULL) return(0);
670		return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW));
671		}
672
673		#define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
674		r->rod > 0.0 && \
675	<	weaksrcmat(source[r->rsrc].so->omod))
675	>	weaksrcmat(source[r->rsrc].so))
676
677		/* wrongsource *
678		*

Diff Legend

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