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.52 by greg, Tue May 31 18:01:09 2005 UTC vs.
Revision 2.54 by greg, Wed Jul 12 05:47:05 2006 UTC

#	Line 55 | Line 55 | findmaterial(register OBJREC *o)
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);
#	Line 382 | Line 386 | direct(                                        /* add direct component */
386		scp->sno = sr.rsrc;
387		/* compute coefficient */
388		(*f)(scp->coef, p, sr.rdir, si.dom);
389	<	cntord[sn].brt = bright(scp->coef);
389	>	cntord[sn].brt = intens(scp->coef);
390		if (cntord[sn].brt <= 0.0)
391		continue;
392		#if SHADCACHE
#	Line 399 | Line 403 | direct(                                        /* add direct component */
403		rayvalue(&sr);
404		multcolor(sr.rcol, sr.rcoef);
405		copycolor(scp->val, sr.rcol);
406	<	cntord[sn].brt = bright(scp->val);
406	>	cntord[sn].brt = intens(sr.rcol);
407		}
408		/* sort contributions */
409		qsort(cntord, sn, sizeof(CNTPTR), cntcmp);

Diff Legend

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