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.6 by greg, Fri Oct 2 16:20:09 1992 UTC vs.
Revision 2.7 by greg, Thu Oct 22 09:55:16 1992 UTC

#	Line 237 | Line 237 | char  *p;                      /* data for f */
237		{
238		extern int  (*trace)();
239		register int  sn;
240	+	register CONTRIB  *scp;
241		SRCINDEX  si;
242		int  nshadcheck, ncnts;
243		int  nhits;
#	Line 258 | Line 259 | char  *p;                      /* data for f */
259		error(SYSTEM, "out of memory in direct");
260		}
261		cntord[sn].sndx = sn;
262	<	srccnt[sn].sno = sr.rsrc;
262	>	scp = srccnt + sn;
263	>	scp->sno = sr.rsrc;
264		/* compute coefficient */
265	<	(*f)(srccnt[sn].coef, p, sr.rdir, si.dom);
266	<	cntord[sn].brt = bright(srccnt[sn].coef);
265	>	(*f)(scp->coef, p, sr.rdir, si.dom);
266	>	cntord[sn].brt = bright(scp->coef);
267		if (cntord[sn].brt <= 0.0)
268		continue;
269	<	VCOPY(srccnt[sn].dir, sr.rdir);
269	>	VCOPY(scp->dir, sr.rdir);
270		/* compute potential */
271		sr.revf = srcvalue;
272		rayvalue(&sr);
273	<	copycolor(srccnt[sn].val, sr.rcol);
274	<	multcolor(srccnt[sn].val, srccnt[sn].coef);
275	<	cntord[sn].brt = bright(srccnt[sn].val);
273	>	copycolor(scp->val, sr.rcol);
274	>	multcolor(scp->val, scp->coef);
275	>	cntord[sn].brt = bright(scp->val);
276		}
277		/* sort contributions */
278		qsort(cntord, sn, sizeof(CNTPTR), cntcmp);
#	Line 304 | Line 306 | char  *p;                      /* data for f */
306		cntord[sn].brt-cntord[sn+nshadcheck].brt)
307		< ourthresh*bright(r->rcol))
308		break;
309	+	scp = srccnt + cntord[sn].sndx;
310		/* test for hit */
311		rayorigin(&sr, r, SHADOW, 1.0);
312	<	VCOPY(sr.rdir, srccnt[cntord[sn].sndx].dir);
313	<	sr.rsrc = srccnt[cntord[sn].sndx].sno;
314	<	source[sr.rsrc].ntests++;       /* keep statistics */
312	>	VCOPY(sr.rdir, scp->dir);
313	>	sr.rsrc = scp->sno;
314	>	source[scp->sno].ntests++;      /* keep statistics */
315		if (localhit(&sr, &thescene) &&
316	<	( sr.ro != source[sr.rsrc].so ||
317	<	source[sr.rsrc].sflags & SFOLLOW )) {
316	>	( sr.ro != source[scp->sno].so ||
317	>	source[scp->sno].sflags & SFOLLOW )) {
318		/* follow entire path */
319		raycont(&sr);
320		if (trace != NULL)
321		(*trace)(&sr);  /* trace execution */
322		if (bright(sr.rcol) <= FTINY)
323		continue;       /* missed! */
324	<	copycolor(srccnt[cntord[sn].sndx].val, sr.rcol);
325	<	multcolor(srccnt[cntord[sn].sndx].val,
323	<	srccnt[cntord[sn].sndx].coef);
324	>	copycolor(scp->val, sr.rcol);
325	>	multcolor(scp->val, scp->coef);
326		}
327		/* add contribution if hit */
328	<	addcolor(r->rcol, srccnt[cntord[sn].sndx].val);
328	>	addcolor(r->rcol, scp->val);
329		nhits++;
330	<	source[sr.rsrc].nhits++;
330	>	source[scp->sno].nhits++;
331		}
332		/* surface hit rate */
333		if (sn > 0)
#	Line 339 | Line 341 | char  *p;                      /* data for f */
341		#endif
342		/* add in untested sources */
343		for ( ; sn < ncnts; sn++) {
344	<	sr.rsrc = srccnt[cntord[sn].sndx].sno;
345	<	prob = hwt * (double)source[sr.rsrc].nhits /
346	<	(double)source[sr.rsrc].ntests;
347	<	scalecolor(srccnt[cntord[sn].sndx].val, prob);
348	<	addcolor(r->rcol, srccnt[cntord[sn].sndx].val);
344	>	scp = srccnt + cntord[sn].sndx;
345	>	prob = hwt * (double)source[scp->sno].nhits /
346	>	(double)source[scp->sno].ntests;
347	>	scalecolor(scp->val, prob);
348	>	addcolor(r->rcol, scp->val);
349		}
350		}
351

Diff Legend

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