--- ray/src/rt/rtrace.c 2005/06/10 16:49:42 2.45 +++ ray/src/rt/rtrace.c 2009/12/12 23:08:13 2.58 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtrace.c,v 2.45 2005/06/10 16:49:42 greg Exp $"; +static const char RCSid[] = "$Id: rtrace.c,v 2.58 2009/12/12 23:08:13 greg Exp $"; #endif /* * rtrace.c - program and variables for individual ray tracing. @@ -29,106 +29,69 @@ static const char RCSid[] = "$Id: rtrace.c,v 2.45 2005 #include "source.h" #include "otypes.h" #include "resolu.h" +#include "random.h" -CUBE thescene; /* our scene */ -OBJECT nsceneobjs; /* number of objects in our scene */ +extern int inform; /* input format */ +extern int outform; /* output format */ +extern char *outvals; /* output values */ -int dimlist[MAXDIM]; /* sampling dimensions */ -int ndims = 0; /* number of sampling dimensions */ -int samplendx = 0; /* index for this sample */ +extern int imm_irrad; /* compute immediate irradiance? */ +extern int lim_dist; /* limit distance? */ -int imm_irrad = 0; /* compute immediate irradiance? */ -int lim_dist = 0; /* limit distance? */ +extern char *tralist[]; /* list of modifers to trace (or no) */ +extern int traincl; /* include == 1, exclude == 0 */ -int inform = 'a'; /* input format */ -int outform = 'a'; /* output format */ -char *outvals = "v"; /* output specification */ +extern int hresolu; /* horizontal resolution */ +extern int vresolu; /* vertical resolution */ -int do_irrad = 0; /* compute irradiance? */ +static int castonly = 0; -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 8191 /* maximum number in trace set */ +#endif OBJECT traset[MAXTSET+1]={0}; /* trace include/exclude set */ -int hresolu = 0; /* horizontal (scan) size */ -int vresolu = 0; /* vertical resolution */ - -double dstrsrc = 0.0; /* square source distribution */ -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? */ -double srcsizerat = .2; /* maximum ratio source size/dist. */ - -COLOR cextinction = BLKCOLOR; /* global extinction coefficient */ -COLOR salbedo = BLKCOLOR; /* global scattering albedo */ -double seccg = 0.; /* global scattering eccentricity */ -double ssampdist = 0.; /* scatter sampling distance */ - -double specthresh = .15; /* specular sampling threshold */ -double specjitter = 1.; /* specular sampling jitter */ - -int backvis = 1; /* back face visibility */ - -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.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[AMBLLEN]; /* ambient include/exclude list */ -int ambincl = -1; /* include == 1, exclude == 0 */ - -static int castonly = 0; - static RAY thisray; /* for our convenience */ 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, +static oputf_t oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp, oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde; static void setoutput(char *vs); -static void tranotify(OBJECT obj); +extern 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 rad(FVECT org, FVECT dir, double dmax); +static void irrad(FVECT org, FVECT dir); +static int printvals(RAY *r); +static int getvec(FVECT vec, int fmt, FILE *fp); +static void tabin(RAY *r); +static void ourtrace(RAY *r); static oputf_t *ray_out[16], *every_out[16]; static putf_t *putreal; -void (*addobjnotify[])() = {ambnotify, tranotify, NULL}; - void quit( /* quit program */ int code ) { -#ifndef NON_POSIX /* XXX we don't clean up elsewhere? */ - headclean(); /* delete header file */ - pfclean(); /* clean up persist files */ + if (ray_pnprocs > 0) /* close children if any */ + ray_pclose(0); +#ifndef NON_POSIX + else if (!ray_pnprocs) { + headclean(); /* delete header file */ + pfclean(); /* clean up persist files */ + } #endif exit(code); } -extern char * +char * formstr( /* return format identifier */ int f ) @@ -176,6 +139,8 @@ rtrace( /* trace rays from file */ default: error(CONSISTENCY, "botched output format"); } + if (ray_pnprocs > 1) + ray_fifo_out = printvals; if (hresolu > 0) { if (vresolu > 0) fprtresolu(hresolu, vresolu, stdout); @@ -187,20 +152,22 @@ rtrace( /* trace rays from file */ d = normalize(direc); if (d == 0.0) { /* zero ==> flush */ + if (ray_pnprocs > 1 && ray_fifo_flush() < 0) + error(USER, "lost children"); bogusray(); if (--nextflush <= 0 || !vcount) { fflush(stdout); nextflush = hresolu; } - } else { - samplendx++; - /* compute and print */ + } else { /* compute and print */ if (imm_irrad) irrad(orig, direc); else rad(orig, direc, lim_dist ? d : 0.0); /* flush if time */ if (!--nextflush) { + if (ray_pnprocs > 1 && ray_fifo_flush() < 0) + error(USER, "lost children"); fflush(stdout); nextflush = hresolu; } @@ -210,7 +177,10 @@ rtrace( /* trace rays from file */ if (vcount && !--vcount) /* check for end */ break; } - fflush(stdout); + if (ray_pnprocs > 1 && ray_fifo_flush() < 0) + error(USER, "unable to complete processing"); + if (fflush(stdout) < 0) + error(SYSTEM, "write error"); if (vcount) error(USER, "unexpected EOF on input"); if (fname != NULL) @@ -230,10 +200,10 @@ trace_sources(void) /* trace rays to light sources, static void setoutput( /* set up output tables */ - register char *vs + char *vs ) { - register oputf_t **table = ray_out; + oputf_t **table = ray_out; castonly = 1; while (*vs) @@ -259,6 +229,12 @@ setoutput( /* set up output tables */ *table++ = oputv; castonly = 0; break; + case 'V': /* contribution */ + *table++ = oputV; + if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0)) + error(WARNING, + "-otV accuracy depends on -aa 0 -as 0"); + break; case 'l': /* effective distance */ *table++ = oputl; castonly = 0; @@ -326,6 +302,11 @@ rad( /* compute and print ray value(s) */ VCOPY(thisray.rorg, org); VCOPY(thisray.rdir, dir); thisray.rmax = dmax; + if (!castonly && ray_pnprocs > 1) { + if (ray_fifo_in(&thisray) < 0) + error(USER, "lost children"); + return; + } rayorigin(&thisray, PRIMARY, NULL, NULL); if (castonly) { if (!localhit(&thisray, &thescene)) { @@ -336,7 +317,7 @@ rad( /* compute and print ray value(s) */ sourcehit(&thisray); } } else - rayvalue(&thisray); + ray_trace(&thisray); printvals(&thisray); } @@ -347,45 +328,43 @@ irrad( /* compute immediate irradiance value */ FVECT dir ) { - register int i; - - for (i = 0; i < 3; i++) { - thisray.rorg[i] = org[i] + dir[i]; - thisray.rdir[i] = -dir[i]; - } + VSUM(thisray.rorg, org, dir, 1.1e-4); + thisray.rdir[0] = -dir[0]; + thisray.rdir[1] = -dir[1]; + thisray.rdir[2] = -dir[2]; thisray.rmax = 0.0; rayorigin(&thisray, PRIMARY, NULL, NULL); /* pretend we hit surface */ - thisray.rot = 1.0-1e-4; + thisray.rot = 1e-5; thisray.rod = 1.0; VCOPY(thisray.ron, dir); - for (i = 0; i < 3; i++) /* fudge factor */ - thisray.rop[i] = org[i] + 1e-4*dir[i]; + VSUM(thisray.rop, org, dir, 1e-4); /* compute and print */ (*ofun[Lamb.otype].funp)(&Lamb, &thisray); printvals(&thisray); } -static void +static int printvals( /* print requested ray values */ RAY *r ) { - register oputf_t **tp; + oputf_t **tp; if (ray_out[0] == NULL) - return; + return(0); for (tp = ray_out; *tp != NULL; tp++) (**tp)(r); if (outform == 'a') putchar('\n'); + return(1); } static int getvec( /* get a vector from fp */ - register FVECT vec, + FVECT vec, int fmt, FILE *fp ) @@ -393,7 +372,7 @@ getvec( /* get a vector from fp */ static float vf[3]; static double vd[3]; char buf[32]; - register int i; + int i; switch (fmt) { case 'a': /* ascii */ @@ -407,12 +386,12 @@ getvec( /* get a vector from fp */ case 'f': /* binary float */ if (fread((char *)vf, sizeof(float), 3, fp) != 3) return(-1); - vec[0] = vf[0]; vec[1] = vf[1]; vec[2] = vf[2]; + VCOPY(vec, vf); break; case 'd': /* binary double */ if (fread((char *)vd, sizeof(double), 3, fp) != 3) return(-1); - vec[0] = vd[0]; vec[1] = vd[1]; vec[2] = vd[2]; + VCOPY(vec, vd); break; default: error(CONSISTENCY, "botched input format"); @@ -421,14 +400,14 @@ getvec( /* get a vector from fp */ } -static void +void tranotify( /* record new modifier */ OBJECT obj ) { static int hitlimit = 0; - register OBJREC *o = objptr(obj); - register char **tralp; + OBJREC *o = objptr(obj); + char **tralp; if (obj == OVOID) { /* starting over */ traset[0] = 0; @@ -455,7 +434,7 @@ ourtrace( /* print ray values */ RAY *r ) { - register oputf_t **tp; + oputf_t **tp; if (every_out[0] == NULL) return; @@ -526,6 +505,21 @@ oputv( /* print value */ static void +oputV( /* print value contribution */ + RAY *r +) +{ + double contr[3]; + + raycontrib(contr, r, PRIMARY); + multcolor(contr, r->rcol); + (*putreal)(contr[RED]); + (*putreal)(contr[GRN]); + (*putreal)(contr[BLU]); +} + + +static void oputl( /* print effective distance */ RAY *r ) @@ -630,16 +624,16 @@ oputw( /* print weight */ static void -oputW( /* print contribution */ +oputW( /* print coefficient */ RAY *r ) { - COLOR contr; + double contr[3]; raycontrib(contr, r, PRIMARY); - (*putreal)(colval(contr,RED)); - (*putreal)(colval(contr,GRN)); - (*putreal)(colval(contr,BLU)); + (*putreal)(contr[RED]); + (*putreal)(contr[GRN]); + (*putreal)(contr[BLU]); }