ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/normal.c

Comparing ray/src/rt/normal.c (file contents):
Revision 1.3 by greg, Wed Jun 7 08:35:14 1989 UTC vs.
Revision 1.4 by greg, Wed Oct 18 09:01:36 1989 UTC

#	Line 70 | Line 70 | double  omega;                 /* light source size */
70
71		if (ldot > FTINY && np->rdiff > FTINY) {
72		/*
73	<	*  Compute and add diffuse component to returned color.
74	<	*  The diffuse component will always be modified by the
75	<	*  color of the material.
73	>	*  Compute and add diffuse reflected component to returned
74	>	*  color.  The diffuse reflected component will always be
75	>	*  modified by the color of the material.
76		*/
77		copycolor(ctmp, np->mcolor);
78		dtmp = ldot * omega * np->rdiff / PI;
#	Line 107 | Line 107 | double  omega;                 /* light source size */
107		}
108		if (ldot < -FTINY && np->tspec > FTINY && np->alpha2 > FTINY) {
109		/*
110	<	*  Compute specular transmission.
110	>	*  Compute specular transmission.  Specular transmission
111	>	*  is unaffected by material color.
112		*/
113		/* roughness + source */
114		dtmp = np->alpha2 + omega/(2.0*PI);
#	Line 115 | Line 116 | double  omega;                 /* light source size */
116		dtmp = exp((DOT(np->pr->rdir,ldir)-1.)/dtmp)/(2.*PI)/dtmp;
117		/* worth using? */
118		if (dtmp > FTINY) {
118	–	copycolor(ctmp, np->mcolor);
119		dtmp *= np->tspec * omega;
120	<	scalecolor(ctmp, dtmp);
120	>	setcolor(ctmp, dtmp, dtmp, dtmp);
121		addcolor(cval, ctmp);
122		}
123		}

Diff Legend

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