--- ray/src/rt/rcontrib.c 2012/06/15 00:57:40 2.6 +++ ray/src/rt/rcontrib.c 2012/11/15 19:41:03 2.18 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rcontrib.c,v 2.6 2012/06/15 00:57:40 greg Exp $"; +static const char RCSid[] = "$Id: rcontrib.c,v 2.18 2012/11/15 19:41:03 greg Exp $"; #endif /* * Accumulate ray contributions for a set of materials @@ -7,9 +7,8 @@ static const char RCSid[] = "$Id: rcontrib.c,v 2.6 201 */ #include "rcontrib.h" -#include "source.h" #include "otypes.h" -#include "platform.h" +#include "source.h" char *shm_boundary = NULL; /* boundary of shared memory */ @@ -27,7 +26,7 @@ int do_irrad = 0; /* compute irradiance? */ int rand_samp = 1; /* pure Monte Carlo sampling? */ -double dstrsrc = 0.0; /* square source distribution */ +double dstrsrc = 0.9; /* square source distribution */ double shadthresh = .03; /* shadow threshold */ double shadcert = .75; /* shadow certainty */ int directrelay = 3; /* number of source relays */ @@ -137,7 +136,7 @@ addmodifier(char *modn, char *outf, char *binv, int bi } -/* add modifiers from a file list */ +/* Add modifiers from a file list */ void addmodfile(char *fname, char *outf, char *binv, int bincnt) { @@ -159,7 +158,7 @@ quit( /* quit program */ ) { if (nchild > 0) /* close children if any */ - end_children(); + end_children(code != 0); exit(code); } @@ -178,9 +177,8 @@ rcinit() /* set shared memory boundary */ shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY"); } - if ((nproc > 1) & (accumulate <= 0)) - put_zero_record(0); /* prime our queue to accumulate */ - + for (i = 0; i < nsources; i++) /* tracing to sources as well */ + source[i].sflags |= SFOLLOW; if (yres > 0) { /* set up flushing & ray counts */ if (xres > 0) raysleft = (RNUMBER)xres*yres; @@ -191,25 +189,23 @@ rcinit() if ((account = accumulate) > 1) raysleft *= accumulate; waitflush = (yres > 0) & (xres > 1) ? 0 : xres; - /* tracing to sources as well */ - for (i = 0; i < nsources; i++) - source[i].sflags |= SFOLLOW; if (nproc > 1 && in_rchild()) /* forked child? */ return; /* return to main processing loop */ if (recover) { /* recover previous output? */ - if (accumulate <= 0) { + if (accumulate <= 0) reload_output(); - if (nproc > 1) - queue_modifiers(); - } else + else recover_output(); } if (nproc == 1) /* single process? */ return; - - parental_loop(); /* else run controller */ + /* else run appropriate controller */ + if (accumulate <= 0) + feeder_loop(); + else + parental_loop(); quit(0); /* parent musn't return! */ } @@ -230,57 +226,55 @@ trace_contrib(RAY *r) if (mp == NULL) /* not in our list? */ return; + /* shadow ray not on source? */ + if (r->rsrc >= 0 && source[r->rsrc].so != r->ro) + return; - worldfunc(RCCONTEXT, r); /* get bin number */ + worldfunc(RCCONTEXT, r); /* else get bin number */ bn = (int)(evalue(mp->binv) + .5); if ((bn < 0) | (bn >= mp->nbins)) { error(WARNING, "bad bin number (ignored)"); return; } - raycontrib(contr, r, PRIMARY); + raycontrib(contr, r, PRIMARY); /* compute coefficient */ if (contrib) - multcolor(contr, r->rcol); + multcolor(contr, r->rcol); /* -> contribution */ addcolor(mp->cbin[bn], contr); } +/* Evaluate irradiance contributions */ static void -rayirrad( /* compute irradiance rather than radiance */ - RAY *r -) +eval_irrad(FVECT org, FVECT dir) { - r->rot = 1e-5; /* pretend we hit surface */ - VSUM(r->rop, r->rorg, r->rdir, r->rot); - r->ron[0] = -r->rdir[0]; - r->ron[1] = -r->rdir[1]; - r->ron[2] = -r->rdir[2]; - r->rod = 1.0; - /* compute result */ - r->revf = raytrace; - (*ofun[Lamb.otype].funp)(&Lamb, r); - r->revf = rayirrad; + RAY thisray; + + 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.rt = thisray.rot = 1e-5; + thisray.rod = 1.0; + VCOPY(thisray.ron, dir); + VSUM(thisray.rop, org, dir, 1e-4); + samplendx++; /* compute result */ + (*ofun[Lamb.otype].funp)(&Lamb, &thisray); } -/* Evaluate ray contributions */ +/* Evaluate radiance contributions */ static void -eval_ray(FVECT org, FVECT dir, double dmax) +eval_rad(FVECT org, FVECT dir, double dmax) { RAY thisray; /* set up ray */ + VCOPY(thisray.rorg, org); + VCOPY(thisray.rdir, dir); + thisray.rmax = dmax; rayorigin(&thisray, PRIMARY, NULL, NULL); - if (imm_irrad) { - 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; - thisray.revf = rayirrad; - } else { - VCOPY(thisray.rorg, org); - VCOPY(thisray.rdir, dir); - thisray.rmax = dmax; - } samplendx++; /* call ray evaluation */ rayvalue(&thisray); } @@ -322,7 +316,7 @@ rcontrib() #endif while (getvec(orig) == 0 && getvec(direc) == 0) { d = normalize(direc); - if (nchild != -1 && (d == 0.0) & (accumulate != 1)) { + if (nchild != -1 && (d == 0.0) & (accumulate == 0)) { if (!ignore_warning_given++) error(WARNING, "dummy ray(s) ignored during accumulation\n"); @@ -332,11 +326,14 @@ rcontrib() lastray = lastdone = 0; ++lastray; if (d == 0.0) { /* zero ==> flush */ - if ((yres <= 0) | (xres <= 0)) - waitflush = 1; /* flush right after */ - account = 1; - } else { /* else compute */ - eval_ray(orig, direc, lim_dist ? d : 0.0); + if ((yres <= 0) | (xres <= 1)) + waitflush = 1; /* flush after */ + if (nchild == -1) + account = 1; + } else if (imm_irrad) { /* else compute */ + eval_irrad(orig, direc); + } else { + eval_rad(orig, direc, lim_dist ? d : 0.0); } done_contrib(); /* accumulate/output */ ++lastdone; @@ -351,7 +348,7 @@ rcontrib() account = 1; /* output accumulated totals */ done_contrib(); } + lu_done(&ofiletab); /* close output files */ if (raysleft) error(USER, "unexpected EOF on input"); - lu_done(&ofiletab); /* close output files */ }