--- ray/src/rt/rtrace.c 2005/04/14 18:04:12 2.39 +++ ray/src/rt/rtrace.c 2005/06/13 20:07:56 2.47 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtrace.c,v 2.39 2005/04/14 18:04:12 greg Exp $"; +static const char RCSid[] = "$Id: rtrace.c,v 2.47 2005/06/13 20:07:56 greg Exp $"; #endif /* * rtrace.c - program and variables for individual ray tracing. @@ -46,11 +46,15 @@ char *outvals = "v"; /* output specification */ int do_irrad = 0; /* compute irradiance? */ +int rand_samp = 0; /* pure Monte Carlo sampling? */ + void (*trace)() = NULL; /* trace call */ char *tralist[128]; /* list of modifers to trace (or no) */ int traincl = -1; /* include == 1, exclude == 0 */ -#define MAXTSET 511 /* maximum number in trace set */ +#ifndef MAXTSET +#define MAXTSET 1024 /* maximum number in trace set */ +#endif OBJECT traset[MAXTSET+1]={0}; /* trace include/exclude set */ int hresolu = 0; /* horizontal (scan) size */ @@ -74,7 +78,7 @@ double specjitter = 1.; /* specular sampling jitter int backvis = 1; /* back face visibility */ -int maxdepth = 8; /* maximum recursion depth */ +int maxdepth = -10; /* maximum recursion depth */ double minweight = 2e-3; /* minimum ray weight */ char *ambfile = NULL; /* ambient file name */ @@ -96,8 +100,8 @@ typedef void putf_t(double v); static putf_t puta, putd, putf; typedef void oputf_t(RAY *r); -static oputf_t oputo, oputd, oputv, oputl, oputL, oputc, - oputp, oputn, oputN, oputs, oputw, oputm, oputM; +static oputf_t oputo, oputd, oputv, oputl, oputL, oputc, oputp, + oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde; static void setoutput(char *vs); static void tranotify(OBJECT obj); @@ -148,7 +152,8 @@ rtrace( /* trace rays from file */ char *fname ) { - long vcount = hresolu>1 ? hresolu*vresolu : vresolu; + unsigned long vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu + : vresolu; long nextflush = hresolu; FILE *fp; double d; @@ -160,10 +165,8 @@ rtrace( /* trace rays from file */ sprintf(errmsg, "cannot open input file \"%s\"", fname); error(SYSTEM, errmsg); } -#ifdef _WIN32 if (inform != 'a') SET_FILE_BINARY(fp); -#endif /* set up output */ setoutput(outvals); switch (outform) { @@ -189,37 +192,47 @@ rtrace( /* trace rays from file */ d = normalize(direc); if (d == 0.0) { /* zero ==> flush */ bogusray(); - if (--nextflush <= 0 || vcount <= 0) { + if (--nextflush <= 0 || !vcount) { fflush(stdout); nextflush = hresolu; } } else { - samplendx++; + samplendx = rand_samp ? random() : samplendx+1; /* compute and print */ if (imm_irrad) irrad(orig, direc); else rad(orig, direc, lim_dist ? d : 0.0); /* flush if time */ - if (--nextflush == 0) { + if (!--nextflush) { fflush(stdout); nextflush = hresolu; } } if (ferror(stdout)) error(SYSTEM, "write error"); - if (--vcount == 0) /* check for end */ + if (vcount && !--vcount) /* check for end */ break; } fflush(stdout); - if (vcount > 0) - error(USER, "read error"); + if (vcount) + error(USER, "unexpected EOF on input"); if (fname != NULL) fclose(fp); } static void +trace_sources(void) /* trace rays to light sources, also */ +{ + int sn; + + for (sn = 0; sn < nsources; sn++) + source[sn].sflags |= SFOLLOW; +} + + +static void setoutput( /* set up output tables */ register char *vs ) @@ -229,7 +242,12 @@ setoutput( /* set up output tables */ castonly = 1; while (*vs) switch (*vs++) { + case 'T': /* trace sources */ + if (!*vs) break; + trace_sources(); + /* fall through */ case 't': /* trace */ + if (!*vs) break; *table = NULL; table = every_out; trace = ourtrace; @@ -271,12 +289,21 @@ setoutput( /* set up output tables */ case 'w': /* weight */ *table++ = oputw; break; + case 'W': /* coefficient */ + *table++ = oputW; + if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0)) + error(WARNING, + "-otW accuracy depends on -aa 0 -as 0"); + break; case 'm': /* modifier */ *table++ = oputm; break; case 'M': /* material */ *table++ = oputM; break; + case '~': /* tilde */ + *table++ = oputtilde; + break; } *table = NULL; } @@ -287,7 +314,8 @@ bogusray(void) /* print out empty record */ { thisray.rorg[0] = thisray.rorg[1] = thisray.rorg[2] = thisray.rdir[0] = thisray.rdir[1] = thisray.rdir[2] = 0.0; - rayorigin(&thisray, NULL, PRIMARY, 1.0); + thisray.rmax = 0.0; + rayorigin(&thisray, PRIMARY, NULL, NULL); printvals(&thisray); } @@ -302,7 +330,7 @@ rad( /* compute and print ray value(s) */ VCOPY(thisray.rorg, org); VCOPY(thisray.rdir, dir); thisray.rmax = dmax; - rayorigin(&thisray, NULL, PRIMARY, 1.0); + rayorigin(&thisray, PRIMARY, NULL, NULL); if (castonly) { if (!localhit(&thisray, &thescene)) { if (thisray.ro == &Aftplane) { /* clipped */ @@ -329,7 +357,8 @@ irrad( /* compute immediate irradiance value */ thisray.rorg[i] = org[i] + dir[i]; thisray.rdir[i] = -dir[i]; } - rayorigin(&thisray, NULL, PRIMARY, 1.0); + thisray.rmax = 0.0; + rayorigin(&thisray, PRIMARY, NULL, NULL); /* pretend we hit surface */ thisray.rot = 1.0-1e-4; thisray.rod = 1.0; @@ -442,7 +471,8 @@ ourtrace( /* print ray values */ tabin(r); for (tp = every_out; *tp != NULL; tp++) (**tp)(r); - putchar('\n'); + if (outform == 'a') + putchar('\n'); } @@ -451,7 +481,7 @@ tabin( /* tab in appropriate amount */ RAY *r ) { - register RAY *rp; + const RAY *rp; for (rp = r->parent; rp != NULL; rp = rp->parent) putchar('\t'); @@ -485,9 +515,8 @@ oputv( /* print value */ RAY *r ) { - COLR cout; - if (outform == 'c') { + COLR cout; setcolr(cout, colval(r->rcol,RED), colval(r->rcol,GRN), colval(r->rcol,BLU)); @@ -605,6 +634,20 @@ oputw( /* print weight */ static void +oputW( /* print contribution */ + RAY *r +) +{ + COLOR contr; + + raycontrib(contr, r, PRIMARY); + (*putreal)(colval(contr,RED)); + (*putreal)(colval(contr,GRN)); + (*putreal)(colval(contr,BLU)); +} + + +static void oputm( /* print modifier */ RAY *r ) @@ -635,6 +678,15 @@ oputM( /* print material */ } else putchar('*'); putchar('\t'); +} + + +static void +oputtilde( /* output tilde (spacer) */ + RAY *r +) +{ + fputs("~\t", stdout); }