ViewVC Help

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

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

Comparing ray/src/rt/aniso.c (file contents):
Revision 2.20 by greg, Wed May 20 14:23:45 1992 UTC vs.
Revision 2.26 by greg, Thu Nov 18 09:42:55 1993 UTC

#	Line 19 | Line 19 | static char SCCSid[] = "$SunId$ LBL";
19		extern double  specthresh;              /* specular sampling threshold */
20		extern double  specjitter;              /* specular sampling jitter */
21
22	+	static  agaussamp(), getacoords();
23	+
24		/*
25	<	*      This anisotropic reflection model uses a variant on the
26	<	*  exponential Gaussian used in normal.c.
25	>	*      This routine implements the anisotropic Gaussian
26	>	*  model described by Ward in Siggraph `92 article.
27		*      We orient the surface towards the incoming ray, so a single
28		*  surface can be used to represent an infinitely thin object.
29		*
#	Line 34 | Line 36 | extern double  specjitter;             /* specular sampling jitte
36		*  8  red      grn     blu     rspec   u-rough v-rough trans   tspec
37		*/
38
37	–	#define  BSPEC(m)       (6.0)           /* specularity parameter b */
38	–
39		/* specularity flags */
40		#define  SP_REFL        01              /* has reflected specular component */
41		#define  SP_TRAN        02              /* has transmitted specular */
#	Line 109 | Line 109 | double  omega;                 /* light source size */
109		h[0] = ldir[0] - np->rp->rdir[0];
110		h[1] = ldir[1] - np->rp->rdir[1];
111		h[2] = ldir[2] - np->rp->rdir[2];
112	–	normalize(h);
112		/* ellipse */
113		dtmp1 = DOT(np->u, h);
114		dtmp1 *= dtmp1 / au2;
115		dtmp2 = DOT(np->v, h);
116		dtmp2 *= dtmp2 / av2;
117		/* gaussian */
118	<	dtmp = (dtmp1 + dtmp2) / (1.0 + DOT(np->pnorm, h));
119	<	dtmp = exp(-2.0*dtmp) * 1.0/(4.0*PI)
118	>	dtmp = DOT(np->pnorm, h);
119	>	dtmp = (dtmp1 + dtmp2) / (dtmp*dtmp);
120	>	dtmp = exp(-dtmp) * (0.25/PI)
121		* sqrt(ldot/(np->pdot*au2*av2));
122		/* worth using? */
123		if (dtmp > FTINY) {
#	Line 155 | Line 155 | double  omega;                 /* light source size */
155		dtmp = 1.0 - dtmp1*dtmp1/dtmp;
156		if (dtmp > FTINY*FTINY) {
157		dtmp1 = DOT(h,np->u);
158	<	dtmp1 = dtmp1*dtmp1 / au2;
158	>	dtmp1 *= dtmp1 / au2;
159		dtmp2 = DOT(h,np->v);
160	<	dtmp2 = dtmp2*dtmp2 / av2;
160	>	dtmp2 *= dtmp2 / av2;
161		dtmp = (dtmp1 + dtmp2) / dtmp;
162		}
163		} else
164		dtmp = 0.0;
165		/* gaussian */
166	<	dtmp = exp(-dtmp) * 1.0/PI
166	>	dtmp = exp(-dtmp) * (1.0/PI)
167		* sqrt(-ldot/(np->pdot*au2*av2));
168		/* worth using? */
169		if (dtmp > FTINY) {
#	Line 181 | Line 181 | register OBJREC  *m;
181		register RAY  *r;
182		{
183		ANISODAT  nd;
184	–	double  dtmp;
184		COLOR  ctmp;
185		register int  i;
186		/* easy shadow test */
#	Line 220 | Line 219 | register RAY  *r;
219		else
220		setcolor(nd.scolor, 1.0, 1.0, 1.0);
221		scalecolor(nd.scolor, nd.rspec);
223	–	/* improved model */
224	–	dtmp = exp(-BSPEC(m)*nd.pdot);
225	–	for (i = 0; i < 3; i++)
226	–	colval(nd.scolor,i) += (1.0-colval(nd.scolor,i))*dtmp;
227	–	nd.rspec += (1.0-nd.rspec)*dtmp;
222		/* check threshold */
223	<	if (specthresh > FTINY &&
230	<	(specthresh >= 1.-FTINY ||
231	<	specthresh + .05 - .1*frandom() > nd.rspec))
223	>	if (specthresh >= nd.rspec-FTINY)
224		nd.specfl |= SP_RBLT;
225		/* compute refl. direction */
226		for (i = 0; i < 3; i++)
#	Line 245 | Line 237 | register RAY  *r;
237		if (nd.tspec > FTINY) {
238		nd.specfl |= SP_TRAN;
239		/* check threshold */
240	<	if (specthresh > FTINY &&
249	<	(specthresh >= 1.-FTINY ||
250	<	specthresh + .05 - .1*frandom() > nd.tspec))
240	>	if (specthresh >= nd.tspec-FTINY)
241		nd.specfl |= SP_TBLT;
242		if (DOT(r->pert,r->pert) <= FTINY*FTINY) {
243		VCOPY(nd.prdir, r->rdir);

Diff Legend

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