ViewVC Help

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

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

Comparing ray/src/rt/srcsupp.c (file contents):
Revision 2.16 by greg, Mon Feb 26 21:16:02 2007 UTC vs.
Revision 2.18 by greg, Mon Oct 25 22:57:45 2010 UTC

#	Line 145 | Line 145 | register OBJREC  *so;
145		src->so = so;
146		if (so->oargs.nfargs != 4)
147		objerror(so, USER, "bad arguments");
148	<	src->sflags |= SDISTANT;
148	>	src->sflags |= (SDISTANT|SCIR);
149		VCOPY(src->sloc, so->oargs.farg);
150		if (normalize(src->sloc) == 0.0)
151		objerror(so, USER, "zero direction");
#	Line 174 | Line 174 | register OBJREC  *so;
174		objerror(so, USER, "bad # arguments");
175		if (so->oargs.farg[3] <= FTINY)
176		objerror(so, USER, "illegal source radius");
177	+	src->sflags |= SCIR;
178		VCOPY(src->sloc, so->oargs.farg);
179		src->srad = so->oargs.farg[3];
180		src->ss2 = PI * src->srad * src->srad;
181		for (i = 0; i < 3; i++)
182		src->ss[SU][i] = src->ss[SV][i] = src->ss[SW][i] = 0.0;
183		for (i = 0; i < 3; i++)
184	<	src->ss[i][i] = .7236 * so->oargs.farg[3];
184	>	src->ss[i][i] = 0.7236 * so->oargs.farg[3];
185		}
186
187
#	Line 200 | Line 201 | OBJREC  *so;
201		VCOPY(src->sloc, CO_P0(co));
202		if (CO_R0(co) > 0.0)
203		objerror(so, USER, "cannot hit source center");
204	<	src->sflags |= SFLAT;
204	>	src->sflags |= (SFLAT|SCIR);
205		VCOPY(src->snorm, co->ad);
206		src->srad = CO_R1(co);
207		src->ss2 = PI * src->srad * src->srad;
#	Line 398 | Line 399 | FVECT  dir;
399		{
400		FVECT  cent, c1, c2;
401		double  rad2, d;
401	–	register int  i;
402		/* move centers to common plane */
403		d = DOT(sp1->aim, dir);
404	<	for (i = 0; i < 3; i++)
405	<	c1[i] = sp1->aim[i] - d*dir[i];
404	>	VSUM(c1, sp1->aim, dir, -d);
405		d = DOT(sp2->aim, dir);
406	<	for (i = 0; i < 3; i++)
408	<	c2[i] = sp2->aim[i] - d*dir[i];
406	>	VSUM(c2, sp2->aim, dir, -d);
407		/* compute overlap */
408		rad2 = intercircle(cent, c1, c2, sp1->siz/PI, sp2->siz/PI);
409		if (rad2 <= FTINY)
#	Line 441 | Line 439 | FVECT  pos;
439		{
440		FVECT  onorm;
441		double  offs, d, dist;
444	–	register int  i;
442
443		offs = getplaneq(onorm, op);
444		d = -DOT(onorm, sp->aim);
#	Line 450 | Line 447 | FVECT  pos;
447		dist = (DOT(pos, onorm) - offs)/d;
448		if (dist < 0.)
449		return(0.);
450	<	for (i = 0; i < 3; i++)
454	<	oc[i] = pos[i] + dist*sp->aim[i];
450	>	VSUM(oc, pos, sp->aim, dist);
451		return(sp->siz*dist*dist/PI/(d*d));
452		}
453
#	Line 465 | Line 461 | FVECT  dir;
461		{
462		FVECT  onorm;
463		double  offs, d, dist;
468	–	register int  i;
464
465		offs = getplaneq(onorm, op);
466		d = -DOT(onorm, dir);
467		if (d >= -FTINY && d <= FTINY)
468		return(0.);
469		dist = (DOT(sp->aim, onorm) - offs)/d;
470	<	for (i = 0; i < 3; i++)
476	<	oc[i] = sp->aim[i] + dist*dir[i];
470	>	VSUM(oc, sp->aim, dir, dist);
471		return(sp->siz/PI/(d*d));
472		}
473
#	Line 486 | Line 480 | double  r1s, r2s;              /* radii squared */
480		{
481		double  a2, d2, l;
482		FVECT  disp;
489	–	register int  i;
483
484	<	for (i = 0; i < 3; i++)
492	<	disp[i] = c2[i] - c1[i];
484	>	VSUB(disp, c2, c1);
485		d2 = DOT(disp,disp);
486		/* circle within overlap? */
487		if (r1s < r2s) {
#	Line 509 | Line 501 | double  r1s, r2s;              /* radii squared */
501		return(0.);
502		/* overlap, compute center */
503		l = sqrt((r1s - a2)/d2);
504	<	for (i = 0; i < 3; i++)
513	<	cc[i] = c1[i] + l*disp[i];
504	>	VSUM(cc, c1, disp, l);
505		return(a2);
506		}

Diff Legend

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