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.69 by greg, Wed Nov 7 18:22:29 2018 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"
#	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	–	/* recursive check on alias branch */
56	–	if ((ao = findmaterial(objptr(aobj))) != NULL)
57	–	return(ao);
58	–	}
59	–	if (o->omod == OVOID)
60	–	return(NULL);
61	–	o = objptr(o->omod);
62	–	}
63	–	return(o);              /* mixtures will return NULL */
64	–	}
65	–
66	–
46		void
47		marksources(void)                       /* find and mark source objects */
48		{
#	Line 95 | 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 121 | 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 149 | 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;
154	<	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 406 | Line 434 | direct(                                        /* add direct component */
434		cntord[sn].sndx = sn;
435		scp = srccnt + sn;
436		scp->sno = sr.rsrc;
437	<	/* compute coefficient */
410	<	(*f)(scp->coef, p, sr.rdir, si.dom);
411	<	cntord[sn].brt = intens(scp->coef);
412	<	if (cntord[sn].brt <= 0.0)
413	<	continue;
414	<	#if SHADCACHE
415	<	/* 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 542 | Line 569 | srcscatter(                    /* compute source scattering into ray */
569		COLOR  cvext;
570		int  i, j;
571
572	<	if (r->rot >= FHUGE || r->gecc >= 1.-FTINY)
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))

Diff Legend

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