--- ray/src/rt/rtrace.c 2003/09/24 14:55:54 2.34 +++ ray/src/rt/rtrace.c 2005/06/05 19:52:01 2.44 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtrace.c,v 2.34 2003/09/24 14:55:54 greg Exp $"; +static const char RCSid[] = "$Id: rtrace.c,v 2.44 2005/06/05 19:52:01 greg Exp $"; #endif /* * rtrace.c - program and variables for individual ray tracing. @@ -25,6 +25,8 @@ static const char RCSid[] = "$Id: rtrace.c,v 2.34 2003 #include "platform.h" #include "ray.h" +#include "ambient.h" +#include "source.h" #include "otypes.h" #include "resolu.h" @@ -46,8 +48,6 @@ int do_irrad = 0; /* compute irradiance? */ void (*trace)() = NULL; /* trace call */ -extern void ambnotify(), tranotify(); -void (*addobjnotify[])() = {ambnotify, tranotify, NULL}; 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 */ @@ -57,8 +57,8 @@ int hresolu = 0; /* horizontal (scan) size */ int vresolu = 0; /* vertical resolution */ double dstrsrc = 0.0; /* square source distribution */ -double shadthresh = .05; /* shadow threshold */ -double shadcert = .5; /* shadow certainty */ +double shadthresh = .03; /* shadow threshold */ +double shadcert = .75; /* shadow certainty */ int directrelay = 2; /* number of source relays */ int vspretest = 512; /* virtual source pretest density */ int directvis = 1; /* sources visible? */ @@ -74,40 +74,51 @@ 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 */ COLOR ambval = BLKCOLOR; /* ambient value */ int ambvwt = 0; /* initial weight for ambient value */ -double ambacc = 0.1; /* ambient accuracy */ +double ambacc = 0.15; /* ambient accuracy */ int ambres = 256; /* ambient resolution */ int ambdiv = 1024; /* ambient divisions */ int ambssamp = 512; /* ambient super-samples */ int ambounce = 0; /* ambient bounces */ -char *amblist[128]; /* ambient include/exclude list */ +char *amblist[AMBLLEN]; /* ambient include/exclude list */ int ambincl = -1; /* include == 1, exclude == 0 */ +static int castonly = 0; static RAY thisray; /* for our convenience */ -static void oputo(), oputd(), oputv(), oputl(), oputL(), oputc(), - oputp(), oputn(), oputN(), oputs(), oputw(), oputm(); +typedef void putf_t(double v); +static putf_t puta, putd, putf; -static void ourtrace(), tabin(); -static void (*ray_out[16])(), (*every_out[16])(); -static int castonly = 0; +typedef void oputf_t(RAY *r); +static oputf_t oputo, oputd, oputv, oputl, oputL, oputc, oputp, + oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde; -static void puta(), putf(), putd(); +static void setoutput(char *vs); +static void tranotify(OBJECT obj); +static void bogusray(void); +static void rad(FVECT org, FVECT dir, double dmax); +static void irrad(FVECT org, FVECT dir); +static void printvals(RAY *r); +static int getvec(FVECT vec, int fmt, FILE *fp); +static void tabin(RAY *r); +static void ourtrace(RAY *r); -static void (*putreal)(); +static oputf_t *ray_out[16], *every_out[16]; +static putf_t *putreal; -void bogusray(), rad(), irrad(), printvals(); +void (*addobjnotify[])() = {ambnotify, tranotify, NULL}; void -quit(code) /* quit program */ -int code; +quit( /* quit program */ + int code +) { #ifndef NON_POSIX /* XXX we don't clean up elsewhere? */ headclean(); /* delete header file */ @@ -117,9 +128,10 @@ int code; } -char * -formstr(f) /* return format identifier */ -int f; +extern char * +formstr( /* return format identifier */ + int f +) { switch (f) { case 'a': return("ascii"); @@ -131,9 +143,10 @@ int f; } -void -rtrace(fname) /* trace rays from file */ -char *fname; +extern void +rtrace( /* trace rays from file */ + char *fname +) { long vcount = hresolu>1 ? hresolu*vresolu : vresolu; long nextflush = hresolu; @@ -147,10 +160,8 @@ char *fname; 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) { @@ -200,22 +211,38 @@ char *fname; } fflush(stdout); if (vcount > 0) - error(USER, "read error"); + error(USER, "unexpected EOF on input"); if (fname != NULL) fclose(fp); } -setoutput(vs) /* set up output tables */ -register char *vs; +static void +trace_sources(void) /* trace rays to light sources, also */ { - extern void (*trace)(); - register void (**table)() = ray_out; + int sn; + + for (sn = 0; sn < nsources; sn++) + source[sn].sflags |= SFOLLOW; +} + +static void +setoutput( /* set up output tables */ + register char *vs +) +{ + register oputf_t **table = ray_out; + 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; @@ -257,33 +284,48 @@ register char *vs; 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; } -void -bogusray() /* print out empty record */ +static void +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); } -void -rad(org, dir, dmax) /* compute and print ray value(s) */ -FVECT org, dir; -double dmax; +static void +rad( /* compute and print ray value(s) */ + FVECT org, + FVECT dir, + double dmax +) { 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 */ @@ -298,9 +340,11 @@ double dmax; } -void -irrad(org, dir) /* compute immediate irradiance value */ -FVECT org, dir; +static void +irrad( /* compute immediate irradiance value */ + FVECT org, + FVECT dir +) { register int i; @@ -308,7 +352,8 @@ FVECT org, dir; 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; @@ -321,11 +366,12 @@ FVECT org, dir; } -void -printvals(r) /* print requested ray values */ -RAY *r; +static void +printvals( /* print requested ray values */ + RAY *r +) { - register void (**tp)(); + register oputf_t **tp; if (ray_out[0] == NULL) return; @@ -336,11 +382,12 @@ RAY *r; } -int -getvec(vec, fmt, fp) /* get a vector from fp */ -register FVECT vec; -int fmt; -FILE *fp; +static int +getvec( /* get a vector from fp */ + register FVECT vec, + int fmt, + FILE *fp +) { static float vf[3]; static double vd[3]; @@ -373,9 +420,10 @@ FILE *fp; } -void -tranotify(obj) /* record new modifier */ -OBJECT obj; +static void +tranotify( /* record new modifier */ + OBJECT obj +) { static int hitlimit = 0; register OBJREC *o = objptr(obj); @@ -402,10 +450,11 @@ OBJECT obj; static void -ourtrace(r) /* print ray values */ -RAY *r; +ourtrace( /* print ray values */ + RAY *r +) { - register void (**tp)(); + register oputf_t **tp; if (every_out[0] == NULL) return; @@ -417,15 +466,17 @@ RAY *r; tabin(r); for (tp = every_out; *tp != NULL; tp++) (**tp)(r); - putchar('\n'); + if (outform == 'a') + putchar('\n'); } static void -tabin(r) /* tab in appropriate amount */ -RAY *r; +tabin( /* tab in appropriate amount */ + RAY *r +) { - register RAY *rp; + const RAY *rp; for (rp = r->parent; rp != NULL; rp = rp->parent) putchar('\t'); @@ -433,8 +484,9 @@ RAY *r; static void -oputo(r) /* print origin */ -RAY *r; +oputo( /* print origin */ + RAY *r +) { (*putreal)(r->rorg[0]); (*putreal)(r->rorg[1]); @@ -443,8 +495,9 @@ RAY *r; static void -oputd(r) /* print direction */ -RAY *r; +oputd( /* print direction */ + RAY *r +) { (*putreal)(r->rdir[0]); (*putreal)(r->rdir[1]); @@ -453,12 +506,12 @@ RAY *r; static void -oputv(r) /* print value */ -RAY *r; +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)); @@ -472,24 +525,27 @@ RAY *r; static void -oputl(r) /* print effective distance */ -RAY *r; +oputl( /* print effective distance */ + RAY *r +) { (*putreal)(r->rt); } static void -oputL(r) /* print single ray length */ -RAY *r; +oputL( /* print single ray length */ + RAY *r +) { (*putreal)(r->rot); } static void -oputc(r) /* print local coordinates */ -RAY *r; +oputc( /* print local coordinates */ + RAY *r +) { (*putreal)(r->uv[0]); (*putreal)(r->uv[1]); @@ -497,8 +553,9 @@ RAY *r; static void -oputp(r) /* print point */ -RAY *r; +oputp( /* print point */ + RAY *r +) { if (r->rot < FHUGE) { (*putreal)(r->rop[0]); @@ -513,8 +570,9 @@ RAY *r; static void -oputN(r) /* print unperturbed normal */ -RAY *r; +oputN( /* print unperturbed normal */ + RAY *r +) { if (r->rot < FHUGE) { (*putreal)(r->ron[0]); @@ -529,8 +587,9 @@ RAY *r; static void -oputn(r) /* print perturbed normal */ -RAY *r; +oputn( /* print perturbed normal */ + RAY *r +) { FVECT pnorm; @@ -548,8 +607,9 @@ RAY *r; static void -oputs(r) /* print name */ -RAY *r; +oputs( /* print name */ + RAY *r +) { if (r->ro != NULL) fputs(r->ro->oname, stdout); @@ -560,17 +620,33 @@ RAY *r; static void -oputw(r) /* print weight */ -RAY *r; +oputw( /* print weight */ + RAY *r +) { (*putreal)(r->rweight); } static void -oputm(r) /* print modifier */ -RAY *r; +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 +) +{ if (r->ro != NULL) if (r->ro->omod != OVOID) fputs(objptr(r->ro->omod)->oname, stdout); @@ -583,8 +659,36 @@ RAY *r; static void -puta(v) /* print ascii value */ -double v; +oputM( /* print material */ + RAY *r +) +{ + OBJREC *mat; + + if (r->ro != NULL) { + if ((mat = findmaterial(r->ro)) != NULL) + fputs(mat->oname, stdout); + else + fputs(VOIDID, stdout); + } else + putchar('*'); + putchar('\t'); +} + + +static void +oputtilde( /* output tilde (spacer) */ + RAY *r +) +{ + fputs("~\t", stdout); +} + + +static void +puta( /* print ascii value */ + double v +) { printf("%e\t", v); }