ViewVC Help

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

root/Development/ray/src/gen/mkillum2.c

Comparing ray/src/gen/mkillum2.c (file contents):
Revision 2.41 by greg, Thu Sep 15 22:34:41 2016 UTC vs.
Revision 2.44 by greg, Fri Jun 20 03:43:17 2025 UTC

#	Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13		#include  "source.h"
14		#include  "paths.h"
15
16	<	#ifndef NBSDFSAMPS
17	<	#define NBSDFSAMPS      256             /* BSDF resampling count */
16	>	#ifndef R_EPS
17	>	#define R_EPS           0.005           /* relative epsilon for ray origin */
18		#endif
19
20		COLORV *        distarr = NULL;         /* distribution array */
#	Line 59 | Line 59 | process_ray(                   /* process a ray result or report error
59		error(USER, "ray tracing process died");
60		if (r->rno >= distsiz)
61		error(INTERNAL, "bad returned index in process_ray");
62	<	multcolor(r->rcol, r->rcoef);   /* in case it's a source ray */
62	>	smultscolor(r->rcol, r->rcoef); /* in case it's a source ray */
63		colp = &distarr[r->rno * 3];
64	<	addcolor(colp, r->rcol);
64	>	addscolor(colp, r->rcol);
65		return(1);
66		}
67
#	Line 125 | Line 125 | srcsamps(                      /* sample sources from this surface positi
125		sr.rno = flatindex(v, nalt, nazi);
126		d = nalt*nazi*(1./PI) * v[2];
127		d *= si.dom;                    /* solid angle correction */
128	<	scalecolor(sr.rcoef, d);
128	>	scalescolor(sr.rcoef, d);
129		VSUM(sr.rorg, sr.rorg, sr.rdir, -eps);
130		process_ray(&sr, ray_pqueue(&sr));
131		}
#	Line 233 | Line 233 | my_face(               /* make an illum face */
233		int  dim[2];
234		int  n, nalt, nazi, alti;
235		double  sp[2], r1, r2;
236	<	int  h;
236	>	unsigned long  h;
237		FVECT  dn, org, dir;
238		FVECT  u, v;
239		double  ur[2], vr[2];
#	Line 287 | Line 287 | my_face(               /* make an illum face */
287		dim[0] = random();
288		/* sample polygon */
289		nallow = 5*n*il->nsamps;
290	<	epsilon = .005*sqrt(fa->area);
290	>	epsilon = R_EPS*sqrt(fa->area);
291		for (dim[1] = 0; dim[1] < n; dim[1]++)
292		for (i = 0; i < il->nsamps; i++) {
293		/* randomize direction */
#	Line 446 | Line 446 | my_ring(               /* make an illum ring */
446		int  dim[2];
447		int  n, nalt, nazi, alti;
448		double  sp[2], r1, r2, r3;
449	+	double  epsilon;
450		int  h;
451		FVECT  dn, org, dir;
452		FVECT  u, v;
453		MAT4  xfm;
454		CONE  *co;
455		int  i, j;
456	<	/* get/check arguments */
456	>	/* get/check arguments */
457		co = getcone(ob, 0);
458	<	/* set up sampling */
458	>	if (co == NULL)
459	>	objerror(ob, USER, "cannot create illum");
460	>	/* set up sampling */
461		if (il->sampdens <= 0) {
462		nalt = nazi = 1;        /* diffuse assumption */
463		} else {
#	Line 462 | Line 465 | my_ring(               /* make an illum ring */
465		nalt = sqrt(n/PI) + .5;
466		nazi = PI*nalt + .5;
467		}
468	+	epsilon = R_EPS*CO_R1(co);
469		n = nazi*nalt;
470		newdist(n);
471		mkaxes(u, v, co->ad);
#	Line 486 | Line 490 | my_ring(               /* make an illum ring */
490		r2 = 2.*PI*sp[1];
491		r1 = r3*cos(r2);
492		r2 = r3*sin(r2);
489	–	r3 = 5.*FTINY;
493		for (j = 0; j < 3; j++)
494		org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j] +
495	<	r3*co->ad[j];
495	>	epsilon*co->ad[j];
496		/* send sample */
497		raysamp(dim[1], org, dir);
498		}
#	Line 517 | Line 520 | my_ring(               /* make an illum ring */
520		for (j = 0; j < 3; j++)
521		org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j];
522		/* sample source rays */
523	<	srcsamps(il, org, 5.*FTINY, ixfm);
523	>	srcsamps(il, org, epsilon, ixfm);
524		}
525		}
526		/* wait for all rays to finish */

Diff Legend

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