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.15 by greg, Thu May 14 11:32:09 1992 UTC vs.
Revision 2.16 by greg, Fri May 15 13:07:58 1992 UTC

#	Line 53 | Line 53 | typedef struct {
53		FVECT  vrefl;           /* vector in reflected direction */
54		FVECT  prdir;           /* vector in transmitted direction */
55		FVECT  u, v;            /* u and v vectors orienting anisotropy */
56	<	double  u_alpha;        /* u roughness */
57	<	double  v_alpha;        /* v roughness */
56	>	double  u_alpha2;       /* u roughness squared */
57	>	double  v_alpha2;       /* v roughness squared */
58		double  rdiff, rspec;   /* reflected specular, diffuse */
59		double  trans;          /* transmissivity */
60		double  tdiff, tspec;   /* transmitted specular, diffuse */
#	Line 70 | Line 70 | FVECT  ldir;                   /* light source direction */
70		double  omega;                  /* light source size */
71		{
72		double  ldot;
73	<	double  dtmp, dtmp2;
73	>	double  dtmp, dtmp1, dtmp2;
74		FVECT  h;
75		double  au2, av2;
76		COLOR  ctmp;
#	Line 103 | Line 103 | double  omega;                 /* light source size */
103		au2 = av2 = omega/(4.0*PI);
104		else
105		au2 = av2 = 0.0;
106	<	au2 += np->u_alpha * np->u_alpha;
107	<	av2 += np->v_alpha * np->v_alpha;
106	>	au2 += np->u_alpha2;
107	>	av2 += np->v_alpha2;
108		/* half vector */
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);
113		/* ellipse */
114	<	dtmp = DOT(np->u, h);
115	<	dtmp *= dtmp / au2;
114	>	dtmp1 = DOT(np->u, h);
115	>	dtmp1 *= dtmp1 / au2;
116		dtmp2 = DOT(np->v, h);
117		dtmp2 *= dtmp2 / av2;
118		/* gaussian */
119	<	dtmp = (dtmp + dtmp2) / (1.0 + DOT(np->pnorm, h));
120	<	dtmp = exp(-2.0*dtmp) / (4.0*PI * sqrt(au2*av2));
119	>	dtmp = (dtmp1 + dtmp2) / (1.0 + DOT(np->pnorm, h));
120	>	dtmp = exp(-2.0*dtmp) * 1.0/(4.0*PI)
121	>	* sqrt(ldot/(np->pdot*au2*av2));
122		/* worth using? */
123		if (dtmp > FTINY) {
124		copycolor(ctmp, np->scolor);
125	<	dtmp *= omega * sqrt(ldot/np->pdot);
125	>	dtmp *= omega;
126		scalecolor(ctmp, dtmp);
127		addcolor(cval, ctmp);
128		}
#	Line 141 | Line 142 | double  omega;                 /* light source size */
142		*  is always modified by material color.
143		*/
144		/* roughness + source */
145	+	au2 = av2 = omega / PI;
146	+	au2 += .25 * np->u_alpha2;
147	+	av2 += .25 * np->v_alpha2;
148	+	/* "half vector" */
149	+	h[0] = ldir[0] - np->prdir[0];
150	+	h[1] = ldir[1] - np->prdir[1];
151	+	h[2] = ldir[2] - np->prdir[2];
152	+	dtmp = DOT(h,np->pnorm);
153	+	dtmp = DOT(h,h) - dtmp*dtmp;
154	+	if (dtmp > FTINY*FTINY) {
155	+	dtmp1 = DOT(h,np->u);
156	+	dtmp1 = dtmp1*dtmp1 / (au2*dtmp);
157	+	dtmp2 = DOT(h,np->v);
158	+	dtmp2 = dtmp2*dtmp2 / (av2*dtmp);
159	+	dtmp = 2. - 2.*DOT(ldir,np->prdir);
160	+	dtmp *= dtmp1 + dtmp2;
161	+	} else
162	+	dtmp = 0.0;
163		/* gaussian */
164	<	dtmp = 0.0;
164	>	dtmp = exp(-dtmp) * 1.0/(4.0*PI)
165	>	* sqrt(-ldot/(np->pdot*au2*av2));
166		/* worth using? */
167		if (dtmp > FTINY) {
168		copycolor(ctmp, np->mcolor);
169	<	dtmp *= np->tspec * omega * sqrt(ldot/np->pdot);
169	>	dtmp *= np->tspec * omega;
170		scalecolor(ctmp, dtmp);
171		addcolor(cval, ctmp);
172		}
#	Line 176 | Line 196 | register RAY  *r;
196		m->oargs.farg[2]);
197		/* get roughness */
198		nd.specfl = 0;
199	<	nd.u_alpha = m->oargs.farg[4];
200	<	nd.v_alpha = m->oargs.farg[5];
201	<	if (nd.u_alpha < 1e-6 || nd.v_alpha <= 1e-6)
199	>	nd.u_alpha2 = m->oargs.farg[4];
200	>	nd.u_alpha2 *= nd.u_alpha2;
201	>	nd.v_alpha2 = m->oargs.farg[5];
202	>	nd.v_alpha2 *= nd.v_alpha2;
203	>	if (nd.u_alpha2 < FTINY*FTINY || nd.v_alpha2 <= FTINY*FTINY)
204		objerror(m, USER, "roughness too small");
205		/* reorient if necessary */
206		if (r->rod < 0.0)
#	Line 216 | Line 238 | register RAY  *r;
238		nd.vrefl[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
239		}
240		/* compute transmission */
241	<	if (m->otype == MAT_TRANS) {
241	>	if (m->otype == MAT_TRANS2) {
242		nd.trans = m->oargs.farg[6]*(1.0 - nd.rspec);
243		nd.tspec = nd.trans * m->oargs.farg[7];
244		nd.tdiff = nd.trans - nd.tspec;
#	Line 297 | Line 319 | register ANISODAT  *np;
319		np->specfl |= SP_BADU;
320		return;
321		}
322	<	multv3(np->u, np->u, mf->f->xfm);
322	>	if (mf->f != &unitxf)
323	>	multv3(np->u, np->u, mf->f->xfm);
324		fcross(np->v, np->pnorm, np->u);
325		if (normalize(np->v) == 0.0) {
326		objerror(np->mp, WARNING, "illegal orientation vector");
#	Line 325 | Line 348 | register ANISODAT  *np;
348		d = urand(ilhash(dimlist,ndims)+samplendx);
349		multisamp(rv, 2, d);
350		d = 2.0*PI * rv[0];
351	<	cosp = np->u_alpha * cos(d);
352	<	sinp = np->v_alpha * sin(d);
353	<	d = sqrt(cosp*cosp + sinp*sinp);
351	>	cosp = cos(d);
352	>	sinp = sin(d);
353	>	d = sqrt(np->u_alpha2*cosp*cosp + np->v_alpha2*sinp*sinp);
354		cosp /= d;
355		sinp /= d;
356		rv[1] = 1.0 - specjitter*rv[1];
#	Line 335 | Line 358 | register ANISODAT  *np;
358		d = 1.0;
359		else
360		d = sqrt(-log(rv[1]) /
361	<	(cosp*cosp/(np->u_alpha*np->u_alpha) +
362	<	sinp*sinp/(np->v_alpha*np->v_alpha)));
361	>	(cosp*cosp/np->u_alpha2 +
362	>	sinp*sinp/np->v_alpha2));
363		for (i = 0; i < 3; i++)
364		h[i] = np->pnorm[i] +
365		d*(cosp*np->u[i] + sinp*np->v[i]);
#	Line 364 | Line 387 | register ANISODAT  *np;
387		d = 1.0;
388		else
389		d = sqrt(-log(rv[1]) /
390	<	(cosp*cosp*4./(np->u_alpha*np->u_alpha) +
391	<	sinp*sinp*4./(np->v_alpha*np->v_alpha)));
390	>	(cosp*cosp*4./np->u_alpha2 +
391	>	sinp*sinp*4./np->v_alpha2));
392		for (i = 0; i < 3; i++)
393		sr.rdir[i] = np->prdir[i] +
394		d*(cosp*np->u[i] + sinp*np->v[i]);

Diff Legend

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