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.7 by greg, Wed Jan 15 11:41:44 1992 UTC vs.
Revision 2.15 by greg, Wed Apr 22 09:05:30 1992 UTC

#	Line 43 | Line 43 | extern double  specjitter;             /* specular sampling jitte
43		/* specularity flags */
44		#define  SP_REFL        01              /* has reflected specular component */
45		#define  SP_TRAN        02              /* has transmitted specular */
46	<	#define  SP_PURE        010             /* purely specular (zero roughness) */
47	<	#define  SP_FLAT        020             /* flat reflecting surface */
48	<	#define  SP_RBLT        040             /* reflection below sample threshold */
49	<	#define  SP_TBLT        0100            /* transmission below threshold */
46	>	#define  SP_PURE        04              /* purely specular (zero roughness) */
47	>	#define  SP_FLAT        010             /* flat reflecting surface */
48	>	#define  SP_RBLT        020             /* reflection below sample threshold */
49	>	#define  SP_TBLT        040             /* transmission below threshold */
50
51		typedef struct {
52		OBJREC  *mp;            /* material pointer */
#	Line 108 | Line 108 | double  omega;                 /* light source size */
108		/* worth using? */
109		if (dtmp > FTINY) {
110		copycolor(ctmp, np->scolor);
111	<	dtmp *= omega / np->pdot;
111	>	dtmp *= omega * sqrt(ldot/np->pdot);
112		scalecolor(ctmp, dtmp);
113		addcolor(cval, ctmp);
114		}
#	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? */
135		if (dtmp > FTINY) {
136		copycolor(ctmp, np->mcolor);
137	<	dtmp *= np->tspec * omega / np->pdot;
137	>	dtmp *= np->tspec * omega * sqrt(ldot/np->pdot);
138		scalecolor(ctmp, dtmp);
139		addcolor(cval, ctmp);
140		}
#	Line 192 | Line 192 | register RAY  *r;
192		colval(nd.scolor,i) += (1.0-colval(nd.scolor,i))*dtmp;
193		nd.rspec += (1.0-nd.rspec)*dtmp;
194		/* check threshold */
195	<	if (specthresh > FTINY &&
196	<	((specthresh >= 1.-FTINY ||
197	<	specthresh + (.1 - .2*urand(8199+samplendx))
198	<	> nd.rspec)))
195	>	if (!(nd.specfl & SP_PURE) &&
196	>	specthresh > FTINY &&
197	>	(specthresh >= 1.-FTINY ||
198	>	specthresh > nd.rspec))
199		nd.specfl |= SP_RBLT;
200		/* compute reflected ray */
201		for (i = 0; i < 3; i++)
#	Line 222 | Line 222 | register RAY  *r;
222		if (nd.tspec > FTINY) {
223		nd.specfl |= SP_TRAN;
224		/* check threshold */
225	<	if (specthresh > FTINY &&
226	<	((specthresh >= 1.-FTINY ||
227	<	specthresh +
228	<	(.1 - .2*urand(7241+samplendx))
229	<	> nd.tspec)))
225	>	if (!(nd.specfl & SP_PURE) && specthresh > FTINY &&
226	>	(specthresh >= 1.-FTINY ||
227	>	specthresh > nd.tspec))
228		nd.specfl |= SP_TBLT;
229		if (r->crtype & SHADOW ||
230		DOT(r->pert,r->pert) <= FTINY*FTINY) {
#	Line 235 | Line 233 | register RAY  *r;
233		} else {
234		for (i = 0; i < 3; i++)         /* perturb */
235		nd.prdir[i] = r->rdir[i] -
236	<	.75*r->pert[i];
236	>	0.5*r->pert[i];
237		if (DOT(nd.prdir, r->ron) < -FTINY)
238		normalize(nd.prdir);    /* OK */
239		else
#	Line 256 | Line 254 | register RAY  *r;
254		transtest *= bright(lr.rcol);
255		transdist = r->rot + lr.rt;
256		}
257	<	}
257	>	} else
258	>	transtest = 0;
259
260		if (r->crtype & SHADOW)                 /* the rest is shadow */
261		return;
#	Line 266 | Line 265 | register RAY  *r;
265		if (nd.specfl & SP_PURE && nd.rdiff <= FTINY && nd.tdiff <= FTINY)
266		return;                         /* 100% pure specular */
267
268	<	if (r->ro->otype == OBJ_FACE || r->ro->otype == OBJ_RING)
268	>	if (r->ro != NULL && (r->ro->otype == OBJ_FACE ||
269	>	r->ro->otype == OBJ_RING))
270		nd.specfl |= SP_FLAT;
271
272		if (nd.specfl & (SP_REFL|SP_TRAN) && !(nd.specfl & SP_PURE))
#	Line 310 | Line 310 | register NORMDAT  *np;
310		double  rv[2];
311		double  d, sinp, cosp;
312		register int  i;
313	+	/* quick test */
314	+	if ((np->specfl & (SP_REFL|SP_RBLT)) != SP_REFL &&
315	+	(np->specfl & (SP_TRAN|SP_TBLT)) != SP_TRAN)
316	+	return;
317		/* set up sample coordinates */
318		v[0] = v[1] = v[2] = 0.0;
319		for (i = 0; i < 3; i++)
#	Line 346 | Line 350 | register NORMDAT  *np;
350		ndims--;
351		}
352		/* compute transmission */
353	+	if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN &&
354	+	rayorigin(&sr, r, SPECULAR, np->tspec) == 0) {
355	+	dimlist[ndims++] = (int)np->mp;
356	+	d = urand(ilhash(dimlist,ndims)+1823+samplendx);
357	+	multisamp(rv, 2, d);
358	+	d = 2.0*PI * rv[0];
359	+	cosp = cos(d);
360	+	sinp = sin(d);
361	+	rv[1] = 1.0 - specjitter*rv[1];
362	+	if (rv[1] <= FTINY)
363	+	d = 1.0;
364	+	else
365	+	d = sqrt( np->alpha2/4.0 * -log(rv[1]) );
366	+	for (i = 0; i < 3; i++)
367	+	sr.rdir[i] = np->prdir[i] + d*(cosp*u[i] + sinp*v[i]);
368	+	if (DOT(sr.rdir, r->ron) < -FTINY)
369	+	normalize(sr.rdir);             /* OK, normalize */
370	+	else
371	+	VCOPY(sr.rdir, np->prdir);      /* else no jitter */
372	+	rayvalue(&sr);
373	+	scalecolor(sr.rcol, np->tspec);
374	+	multcolor(sr.rcol, np->mcolor);         /* modified by color */
375	+	addcolor(r->rcol, sr.rcol);
376	+	ndims--;
377	+	}
378		}

Diff Legend

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