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 2.6 by greg, Wed Jan 15 11:02:40 1992 UTC vs.
Revision 2.8 by greg, Wed Jan 15 16:59:52 1992 UTC

#	Line 128 | Line 128 | double  omega;                 /* light source size */
128		*  is always modified by material color.
129		*/
130		/* roughness + source */
131	<	dtmp = np->alpha2 + omega/(2.0*PI);
131	>	dtmp = np->alpha2/2.0 + omega/(2.0*PI);
132		/* gaussian */
133		dtmp = exp((DOT(np->prdir,ldir)-1.)/dtmp)/(2.*PI)/dtmp;
134		/* worth using? */
#	Line 200 | Line 200 | register RAY  *r;
200		/* compute reflected ray */
201		for (i = 0; i < 3; i++)
202		nd.vrefl[i] = r->rdir[i] + 2.0*nd.pdot*nd.pnorm[i];
203	+	if (DOT(nd.vrefl, r->ron) <= FTINY)     /* penetration? */
204	+	for (i = 0; i < 3; i++)         /* safety measure */
205	+	nd.vrefl[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
206
207		if (!(r->crtype & SHADOW) && nd.specfl & SP_PURE) {
208		RAY  lr;
#	Line 232 | Line 235 | register RAY  *r;
235		} else {
236		for (i = 0; i < 3; i++)         /* perturb */
237		nd.prdir[i] = r->rdir[i] -
238	<	.75*r->pert[i];
239	<	normalize(nd.prdir);
238	>	0.5*r->pert[i];
239	>	if (DOT(nd.prdir, r->ron) < -FTINY)
240	>	normalize(nd.prdir);    /* OK */
241	>	else
242	>	VCOPY(nd.prdir, r->rdir);
243		}
244		}
245		} else
#	Line 303 | Line 309 | register NORMDAT  *np;
309		FVECT  u, v, h;
310		double  rv[2];
311		double  d, sinp, cosp;
306	–	int  ntries;
312		register int  i;
313		/* set up sample coordinates */
314		v[0] = v[1] = v[2] = 0.0;
#	Line 318 | Line 323 | register NORMDAT  *np;
323		if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL &&
324		rayorigin(&sr, r, SPECULAR, np->rspec) == 0) {
325		dimlist[ndims++] = (int)np->mp;
326	<	for (ntries = 0; ntries < 10; ntries++) {
327	<	dimlist[ndims] = ntries * 8912;
328	<	d = urand(ilhash(dimlist,ndims+1)+samplendx);
329	<	multisamp(rv, 2, d);
330	<	d = 2.0*PI * rv[0];
331	<	cosp = cos(d);
332	<	sinp = sin(d);
333	<	rv[1] = 1.0 - specjitter*rv[1];
334	<	if (rv[1] <= FTINY)
335	<	d = 1.0;
336	<	else
337	<	d = sqrt( np->alpha2 * -log(rv[1]) );
338	<	for (i = 0; i < 3; i++)
339	<	h[i] = np->pnorm[i] + d*(cosp*u[i] + sinp*v[i]);
340	<	d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d);
341	<	for (i = 0; i < 3; i++)
342	<	sr.rdir[i] = r->rdir[i] + d*h[i];
343	<	if (DOT(sr.rdir, r->ron) > FTINY) {
344	<	rayvalue(&sr);
345	<	multcolor(sr.rcol, np->scolor);
341	<	addcolor(r->rcol, sr.rcol);
342	<	break;
343	<	}
344	<	}
326	>	d = urand(ilhash(dimlist,ndims)+samplendx);
327	>	multisamp(rv, 2, d);
328	>	d = 2.0*PI * rv[0];
329	>	cosp = cos(d);
330	>	sinp = sin(d);
331	>	rv[1] = 1.0 - specjitter*rv[1];
332	>	if (rv[1] <= FTINY)
333	>	d = 1.0;
334	>	else
335	>	d = sqrt( np->alpha2 * -log(rv[1]) );
336	>	for (i = 0; i < 3; i++)
337	>	h[i] = np->pnorm[i] + d*(cosp*u[i] + sinp*v[i]);
338	>	d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d);
339	>	for (i = 0; i < 3; i++)
340	>	sr.rdir[i] = r->rdir[i] + d*h[i];
341	>	if (DOT(sr.rdir, r->ron) <= FTINY)
342	>	VCOPY(sr.rdir, np->vrefl);      /* jitter no good */
343	>	rayvalue(&sr);
344	>	multcolor(sr.rcol, np->scolor);
345	>	addcolor(r->rcol, sr.rcol);
346		ndims--;
347		}
348		/* compute transmission */
349	+	if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN &&
350	+	rayorigin(&sr, r, SPECULAR, np->tspec) == 0) {
351	+	dimlist[ndims++] = (int)np->mp;
352	+	d = urand(ilhash(dimlist,ndims)+1823+samplendx);
353	+	multisamp(rv, 2, d);
354	+	d = 2.0*PI * rv[0];
355	+	cosp = cos(d);
356	+	sinp = sin(d);
357	+	rv[1] = 1.0 - specjitter*rv[1];
358	+	if (rv[1] <= FTINY)
359	+	d = 1.0;
360	+	else
361	+	d = sqrt( np->alpha2/4.0 * -log(rv[1]) );
362	+	for (i = 0; i < 3; i++)
363	+	sr.rdir[i] = np->prdir[i] + d*(cosp*u[i] + sinp*v[i]);
364	+	if (DOT(sr.rdir, r->ron) < -FTINY)
365	+	normalize(sr.rdir);             /* OK, normalize */
366	+	else
367	+	VCOPY(sr.rdir, np->prdir);      /* else no jitter */
368	+	rayvalue(&sr);
369	+	multcolor(sr.rcol, np->scolor);
370	+	addcolor(r->rcol, sr.rcol);
371	+	ndims--;
372	+	}
373		}

Diff Legend

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