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.70 by greg, Thu Nov 8 00:54:07 2018 UTC vs.
Revision 2.74 by greg, Thu Dec 17 03:30:37 2020 UTC

#	Line 74 | 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 100 | 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 128 | 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;
133	<	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 385 | Line 434 | direct(                                        /* add direct component */
434		cntord[sn].sndx = sn;
435		scp = srccnt + sn;
436		scp->sno = sr.rsrc;
437	<	/* compute coefficient */
389	<	(*f)(scp->coef, p, sr.rdir, si.dom);
390	<	cntord[sn].brt = intens(scp->coef);
391	<	if (cntord[sn].brt <= 0.0)
392	<	continue;
393	<	#if SHADCACHE
394	<	/* 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 429 | Line 477 | direct(                                        /* add direct component */
477		/* compute number to check */
478		nshadcheck = pow((double)ncnts, shadcert) + .5;
479		/* modify threshold */
480	<	if (ncnts > MINSHADCNT)
433	<	ourthresh = shadthresh / r->rweight;
434	<	else
435	<	ourthresh = 0;
480	>	ourthresh = shadthresh / r->rweight;
481		/* test for shadows */
482		for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts;
483		hwt += (double)source[scp->sno].nhits /
484		(double)source[scp->sno].ntests,
485		sn++) {
486		/* check threshold */
487	<	if ((sn+nshadcheck>=ncnts ? cntord[sn].brt :
487	>	if (sn >= MINSHADCNT &&
488	>	(sn+nshadcheck>=ncnts ? cntord[sn].brt :
489		cntord[sn].brt-cntord[sn+nshadcheck].brt)
490	<	< ourthresh*bright(r->rcol))
490	>	< ourthresh*bright(r->rcol))
491		break;
492		scp = srccnt + cntord[sn].sndx;
493		/* test for hit */
#	Line 521 | Line 567 | srcscatter(                    /* compute source scattering into ray */
567		COLOR  cvext;
568		int  i, j;
569
570	<	if (r->rot >= FHUGE || r->gecc >= 1.-FTINY)
570	>	if (r->rot >= FHUGE*.99 || r->gecc >= 1.-FTINY)
571		return;         /* this can never work */
572		/* PMAP: do unconditional inscattering for volume photons */
573		if (!volumePhotonMapping && (r->slights == NULL || r->slights[0] == 0))

Diff Legend

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