--- ray/src/gen/mkillum2.c 1991/07/24 13:32:05 1.3 +++ ray/src/gen/mkillum2.c 2004/09/19 08:42:22 2.17 @@ -1,75 +1,65 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: mkillum2.c,v 2.17 2004/09/19 08:42:22 greg Exp $"; #endif - /* - * Routines to do the actual calcultion and output for mkillum + * Routines to do the actual calculation for mkillum */ -#include "mkillum.h" +#include +#include "mkillum.h" #include "face.h" - #include "cone.h" - #include "random.h" +#include "selcall.h" -printobj(mod, obj) /* print out an object */ -char *mod; -register OBJREC *obj; -{ - register int i; +static void mkaxes(FVECT u, FVECT v, FVECT n); +static void rounddir(FVECT dv, double alt, double azi); +static void flatdir(FVECT dv, double alt, double azi); - printf("\n%s %s %s", mod, ofun[obj->otype].funame, obj->oname); - printf("\n%d", obj->oargs.nsargs); - for (i = 0; i < obj->oargs.nsargs; i++) - printf(" %s", obj->oargs.sarg[i]); -#ifdef IARGS - printf("\n%d", obj->oargs.niargs); - for (i = 0; i < obj->oargs.niargs; i++) - printf(" %d", obj->oargs.iarg[i]); -#else - printf("\n0"); -#endif - printf("\n%d", obj->oargs.nfargs); - for (i = 0; i < obj->oargs.nfargs; i++) { - if (i%3 == 0) - putchar('\n'); - printf(" %18.12g", obj->oargs.farg[i]); - } - putchar('\n'); + +static void +rayclean( /* finish all pending rays */ + struct rtproc *rt0 +) +{ + rayflush(rt0, 1); + while (raywait(rt0) != NULL) + ; } -o_default(ob, il, rt, nm) /* default illum action */ -OBJREC *ob; -struct illum_args *il; -struct rtproc *rt; -char *nm; +int /* XXX type conflict with otypes.h */ +o_default( /* default illum action */ + OBJREC *ob, + struct illum_args *il, + struct rtproc *rt0, + char *nm +) { sprintf(errmsg, "(%s): cannot make illum for %s \"%s\"", nm, ofun[ob->otype].funame, ob->oname); error(WARNING, errmsg); - if (!(il->flags & IL_LIGHT)) - printobj(il->altname, ob); + printobj(il->altmat, ob); + return(1); } -o_face(ob, il, rt, nm) /* make an illum face */ -OBJREC *ob; -struct illum_args *il; -struct rtproc *rt; -char *nm; +int +o_face( /* make an illum face */ + OBJREC *ob, + struct illum_args *il, + struct rtproc *rt0, + char *nm +) { #define MAXMISS (5*n*il->nsamps) - int dim[4]; - int n, nalt, nazi; + int dim[3]; + int n, nalt, nazi, h; float *distarr; - double r1, r2; - FVECT dn, pos, dir; + double sp[2], r1, r2; + FVECT dn, org, dir; FVECT u, v; double ur[2], vr[2]; int nmisses; @@ -79,18 +69,35 @@ char *nm; fa = getface(ob); if (fa->area == 0.0) { freeface(ob); - o_default(ob, il, rt, nm); - return; + return(o_default(ob, il, rt0, nm)); } /* set up sampling */ - n = PI * il->sampdens; - nalt = sqrt(n/PI) + .5; - nazi = PI*nalt + .5; + if (il->sampdens <= 0) + nalt = nazi = 1; + else { + n = PI * il->sampdens; + nalt = sqrt(n/PI) + .5; + nazi = PI*nalt + .5; + } n = nalt*nazi; distarr = (float *)calloc(n, 3*sizeof(float)); if (distarr == NULL) error(SYSTEM, "out of memory in o_face"); - mkaxes(u, v, fa->norm); + /* take first edge longer than sqrt(area) */ + for (j = fa->nv-1, i = 0; i < fa->nv; j = i++) { + u[0] = VERTEX(fa,i)[0] - VERTEX(fa,j)[0]; + u[1] = VERTEX(fa,i)[1] - VERTEX(fa,j)[1]; + u[2] = VERTEX(fa,i)[2] - VERTEX(fa,j)[2]; + if ((r1 = DOT(u,u)) >= fa->area-FTINY) + break; + } + if (i < fa->nv) { /* got one! -- let's align our axes */ + r2 = 1.0/sqrt(r1); + u[0] *= r2; u[1] *= r2; u[2] *= r2; + fcross(v, fa->norm, u); + } else /* oh well, we'll just have to wing it */ + mkaxes(u, v, fa->norm); + /* now, find limits in (u,v) coordinates */ ur[0] = vr[0] = FHUGE; ur[1] = vr[1] = -FHUGE; for (i = 0; i < fa->nv; i++) { @@ -108,68 +115,76 @@ char *nm; for (dim[2] = 0; dim[2] < nazi; dim[2]++) for (i = 0; i < il->nsamps; i++) { /* random direction */ - dim[3] = 1; - r1 = (dim[1]+urand(urind(ilhash(dim,4),i)))/nalt; - dim[3] = 2; - r2 = (dim[2]+urand(urind(ilhash(dim,4),i)))/nalt; + h = ilhash(dim, 3) + i; + multisamp(sp, 2, urand(h)); + r1 = (dim[1] + sp[0])/nalt; + r2 = (dim[2] + sp[1] - .5)/nazi; flatdir(dn, r1, r2); for (j = 0; j < 3; j++) - dir[j] = dn[0]*u[j] + dn[1]*v[j] - dn[2]*fa->norm[j]; + dir[j] = -dn[0]*u[j] - dn[1]*v[j] - dn[2]*fa->norm[j]; /* random location */ do { - dim[3] = 3; - r1 = ur[0] + - (ur[1]-ur[0])*urand(urind(ilhash(dim,4),i)); - dim[3] = 4; - r2 = vr[0] + - (vr[1]-vr[0])*urand(urind(ilhash(dim,4),i)); + multisamp(sp, 2, urand(h+4862+nmisses)); + r1 = ur[0] + (ur[1]-ur[0]) * sp[0]; + r2 = vr[0] + (vr[1]-vr[0]) * sp[1]; for (j = 0; j < 3; j++) org[j] = r1*u[j] + r2*v[j] + fa->offset*fa->norm[j]; } while (!inface(org, fa) && nmisses++ < MAXMISS); if (nmisses > MAXMISS) { objerror(ob, WARNING, "bad aspect"); - rt->nrays = 0; + rayclean(rt0); freeface(ob); - free((char *)distarr); - o_default(ob, il, rt, nm); - return; + free((void *)distarr); + return(o_default(ob, il, rt0, nm)); } for (j = 0; j < 3; j++) org[j] += .001*fa->norm[j]; /* send sample */ - raysamp(distarr+dim[1]*nazi+dim[2], org, dir, rt); + raysamp(distarr+3*(dim[1]*nazi+dim[2]), org, dir, rt0); } - rayflush(rt); - /* write out the distribution */ - flatdist(distarr, nalt, nazi, il, ob); + rayclean(rt0); + /* write out the face and its distribution */ + if (average(il, distarr, nalt*nazi)) { + if (il->sampdens > 0) + flatout(il, distarr, nalt, nazi, u, v, fa->norm); + illumout(il, ob); + } else + printobj(il->altmat, ob); /* clean up */ freeface(ob); - free((char *)distarr); + free((void *)distarr); + return(0); #undef MAXMISS } -o_sphere(ob, il, rt, nm) /* make an illum sphere */ -register OBJREC *ob; -struct illum_args *il; -struct rtproc *rt; -char *nm; +int +o_sphere( /* make an illum sphere */ + register OBJREC *ob, + struct illum_args *il, + struct rtproc *rt0, + char *nm +) { - int dim[4]; + int dim[3]; int n, nalt, nazi; float *distarr; - double r1, r2; - FVECT pos, dir; + double sp[4], r1, r2, r3; + FVECT org, dir; FVECT u, v; register int i, j; /* check arguments */ if (ob->oargs.nfargs != 4) objerror(ob, USER, "bad # of arguments"); /* set up sampling */ - n = 4.*PI * il->sampdens; - nalt = sqrt(n/PI) + .5; - nazi = PI*nalt + .5; + if (il->sampdens <= 0) + nalt = nazi = 1; + else { + n = 4.*PI * il->sampdens; + nalt = sqrt(2./PI*n) + .5; + nazi = PI/2.*nalt + .5; + } n = nalt*nazi; distarr = (float *)calloc(n, 3*sizeof(float)); if (distarr == NULL) @@ -179,54 +194,69 @@ char *nm; for (dim[1] = 0; dim[1] < nalt; dim[1]++) for (dim[2] = 0; dim[2] < nazi; dim[2]++) for (i = 0; i < il->nsamps; i++) { + /* next sample point */ + multisamp(sp, 4, urand(ilhash(dim,3)+i)); /* random direction */ - dim[3] = 1; - r1 = (dim[1]+urand(urind(ilhash(dim,4),i)))/nalt; - dim[3] = 2; - r2 = (dim[2]+urand(urind(ilhash(dim,4),i)))/nalt; + r1 = (dim[1] + sp[0])/nalt; + r2 = (dim[2] + sp[1] - .5)/nazi; rounddir(dir, r1, r2); /* random location */ mkaxes(u, v, dir); /* yuck! */ - dim[3] = 3; - r1 = sqrt(urand(urind(ilhash(dim,4),i))); - dim[3] = 4; - r2 = 2.*PI*urand(urind(ilhash(dim,4),i)); - for (j = 0; j < 3; j++) - org[j] = obj->oargs.farg[j] + obj->oargs.farg[3] * - ( r1*cos(r2)*u[j] + r1*sin(r2)*v[j] - - sqrt(1.01-r1*r1)*dir[j] ); - + r3 = sqrt(sp[2]); + r2 = 2.*PI*sp[3]; + r1 = r3*ob->oargs.farg[3]*cos(r2); + r2 = r3*ob->oargs.farg[3]*sin(r2); + r3 = ob->oargs.farg[3]*sqrt(1.01-r3*r3); + for (j = 0; j < 3; j++) { + org[j] = ob->oargs.farg[j] + r1*u[j] + r2*v[j] + + r3*dir[j]; + dir[j] = -dir[j]; + } /* send sample */ - raysamp(distarr+dim[1]*nazi+dim[2], org, dir, rt); + raysamp(distarr+3*(dim[1]*nazi+dim[2]), org, dir, rt0); } - rayflush(rt); - /* write out the distribution */ - rounddist(distarr, nalt, nazi, il, ob); + rayclean(rt0); + /* write out the sphere and its distribution */ + if (average(il, distarr, nalt*nazi)) { + if (il->sampdens > 0) + roundout(il, distarr, nalt, nazi); + else + objerror(ob, WARNING, "diffuse distribution"); + illumout(il, ob); + } else + printobj(il->altmat, ob); /* clean up */ - free((char *)distarr); + free((void *)distarr); + return(1); } -o_ring(ob, il, rt, nm) /* make an illum ring */ -OBJREC *ob; -struct illum_args *il; -struct rtproc *rt; -char *nm; +int +o_ring( /* make an illum ring */ + OBJREC *ob, + struct illum_args *il, + struct rtproc *rt0, + char *nm +) { - int dim[4]; + int dim[3]; int n, nalt, nazi; float *distarr; - double r1, r2; - FVECT dn, pos, dir; + double sp[4], r1, r2, r3; + FVECT dn, org, dir; FVECT u, v; register CONE *co; register int i, j; /* get/check arguments */ co = getcone(ob, 0); /* set up sampling */ - n = PI * il->sampdens; - nalt = sqrt(n/PI) + .5; - nazi = PI*nalt + .5; + if (il->sampdens <= 0) + nalt = nazi = 1; + else { + n = PI * il->sampdens; + nalt = sqrt(n/PI) + .5; + nazi = PI*nalt + .5; + } n = nalt*nazi; distarr = (float *)calloc(n, 3*sizeof(float)); if (distarr == NULL) @@ -237,73 +267,191 @@ char *nm; for (dim[1] = 0; dim[1] < nalt; dim[1]++) for (dim[2] = 0; dim[2] < nazi; dim[2]++) for (i = 0; i < il->nsamps; i++) { + /* next sample point */ + multisamp(sp, 4, urand(ilhash(dim,3)+i)); /* random direction */ - dim[3] = 1; - r1 = (dim[1]+urand(urind(ilhash(dim,4),i)))/nalt; - dim[3] = 2; - r2 = (dim[2]+urand(urind(ilhash(dim,4),i)))/nalt; + r1 = (dim[1] + sp[0])/nalt; + r2 = (dim[2] + sp[1] - .5)/nazi; flatdir(dn, r1, r2); for (j = 0; j < 3; j++) - dir[j] = dn[0]*u[j] + dn[1]*v[j] - dn[2]*co->ad[j]; + dir[j] = -dn[0]*u[j] - dn[1]*v[j] - dn[2]*co->ad[j]; /* random location */ - dim[3] = 3; - r1 = sqrt(CO_R0(co)*CO_R0(co) + - urand(urind(ilhash(dim,4),i))* - (CO_R1(co)*CO_R1(co) - CO_R0(co)*CO_R0(co))); - dim[3] = 4; - r2 = 2.*PI*urand(urind(ilhash(dim,4),i)); + r3 = sqrt(CO_R0(co)*CO_R0(co) + + sp[2]*(CO_R1(co)*CO_R1(co) - CO_R0(co)*CO_R0(co))); + r2 = 2.*PI*sp[3]; + r1 = r3*cos(r2); + r2 = r3*sin(r2); for (j = 0; j < 3; j++) - org[j] = CO_P0(co)[j] + - r1*cos(r2)*u[j] + r1*sin(r2)*v[j] - + .001*co->ad[j]; + org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j] + + .001*co->ad[j]; /* send sample */ - raysamp(distarr+dim[1]*nazi+dim[2], org, dir, rt); + raysamp(distarr+3*(dim[1]*nazi+dim[2]), org, dir, rt0); } - rayflush(rt); - /* write out the distribution */ - flatdist(distarr, nalt, nazi, il, ob); + rayclean(rt0); + /* write out the ring and its distribution */ + if (average(il, distarr, nalt*nazi)) { + if (il->sampdens > 0) + flatout(il, distarr, nalt, nazi, u, v, co->ad); + illumout(il, ob); + } else + printobj(il->altmat, ob); /* clean up */ freecone(ob); - free((char *)distarr); + free((void *)distarr); + return(1); } -raysamp(res, org, dir, rt) /* compute a ray sample */ -float res[3]; -FVECT org, dir; -register struct rtproc *rt; +void +raysamp( /* queue a ray sample */ + float res[3], + FVECT org, + FVECT dir, + struct rtproc *rt0 +) { + register struct rtproc *rt; register float *fp; - if (rt->nrays == rt->bsiz) - rayflush(rt); - rt->dest[rt->nrays] = res; - fp = rt->buf + 6*rt->nrays++; + for (rt = rt0; rt != NULL; rt = rt->next) + if (rt->nrays < rt->bsiz && rt->dest[rt->nrays] == NULL) + break; + if (rt == NULL) /* need to free up buffer? */ + rt = raywait(rt0); + if (rt == NULL) + error(SYSTEM, "raywait() returned NULL in raysamp()"); + fp = rt->buf + 6*rt->nrays; *fp++ = org[0]; *fp++ = org[1]; *fp++ = org[2]; *fp++ = dir[0]; *fp++ = dir[1]; *fp = dir[2]; + rt->dest[rt->nrays++] = res; + if (rt->nrays == rt->bsiz) + rayflush(rt, 0); } -rayflush(rt) /* flush buffered rays */ -register struct rtproc *rt; +void +rayflush( /* flush queued rays to rtrace */ + register struct rtproc *rt, + int doall +) { - register int i; + int nw; - if (rt->nrays <= 0) - return; - i = 6*rt->nrays + 3; - rt->buf[i++] = 0.; rt->buf[i++] = 0.; rt->buf[i] = 0.; - if ( process(rt->pd, (char *)rt->buf, (char *)rt->buf, - 3*sizeof(float)*rt->nrays, - 6*sizeof(float)*(rt->nrays+1)) < - 3*sizeof(float)*rt->nrays ) - error(SYSTEM, "error reading from rtrace process"); - i = rt->nrays; - while (i--) { - rt->dest[i][0] += rt->buf[3*i]; - rt->dest[i][1] += rt->buf[3*i+1]; - rt->dest[i][2] += rt->buf[3*i+2]; + do { + if (rt->nrays <= 0) + continue; + memset(rt->buf+6*rt->nrays, 0, 6*sizeof(float)); + nw = 6*sizeof(float)*(rt->nrays+1); + errno = 0; + if (writebuf(rt->pd.w, (char *)rt->buf, nw) < nw) + error(SYSTEM, "error writing to rtrace process"); + rt->nrays = 0; /* flag buffer as flushed */ + } while (doall && (rt = rt->next) != NULL); +} + + +struct rtproc * +raywait( /* retrieve rtrace results */ + struct rtproc *rt0 +) +{ + fd_set readset, errset; + int nr; + struct rtproc *rtfree; + register struct rtproc *rt; + register int n; + /* prepare select call */ + FD_ZERO(&readset); FD_ZERO(&errset); n = 0; + nr = 0; + for (rt = rt0; rt != NULL; rt = rt->next) { + if (rt->nrays == 0 && rt->dest[0] != NULL) { + FD_SET(rt->pd.r, &readset); + ++nr; + } + FD_SET(rt->pd.r, &errset); + if (rt->pd.r >= n) + n = rt->pd.r + 1; } - rt->nrays = 0; + if (!nr) /* no rays pending */ + return(NULL); + if (nr > 1) { /* call select for multiple processes */ + errno = 0; + if (select(n, &readset, NULL, &errset, NULL) < 0) + error(SYSTEM, "select call error in raywait()"); + } else + FD_ZERO(&errset); + rtfree = NULL; /* read from ready process(es) */ + for (rt = rt0; rt != NULL; rt = rt->next) { + if (!FD_ISSET(rt->pd.r, &readset) && + !FD_ISSET(rt->pd.r, &errset)) + continue; + for (n = 0; n < rt->bsiz && rt->dest[n] != NULL; n++) + ; + nr = 3*sizeof(float)*(n+1); + if (readbuf(rt->pd.r, (char *)rt->buf, nr) < nr) + error(USER, "rtrace process died"); + while (n-- > 0) { + rt->dest[n][0] += rt->buf[3*n]; + rt->dest[n][1] += rt->buf[3*n+1]; + rt->dest[n][2] += rt->buf[3*n+2]; + rt->dest[n] = NULL; + } + rtfree = rt; + } + return(rtfree); +} + + +static void +mkaxes( /* compute u and v to go with n */ + FVECT u, + FVECT v, + FVECT n +) +{ + register int i; + + v[0] = v[1] = v[2] = 0.0; + for (i = 0; i < 3; i++) + if (n[i] < 0.6 && n[i] > -0.6) + break; + v[i] = 1.0; + fcross(u, v, n); + normalize(u); + fcross(v, n, u); +} + + +static void +rounddir( /* compute uniform spherical direction */ + register FVECT dv, + double alt, + double azi +) +{ + double d1, d2; + + dv[2] = 1. - 2.*alt; + d1 = sqrt(1. - dv[2]*dv[2]); + d2 = 2.*PI * azi; + dv[0] = d1*cos(d2); + dv[1] = d1*sin(d2); +} + + +static void +flatdir( /* compute uniform hemispherical direction */ + register FVECT dv, + double alt, + double azi +) +{ + double d1, d2; + + d1 = sqrt(alt); + d2 = 2.*PI * azi; + dv[0] = d1*cos(d2); + dv[1] = d1*sin(d2); + dv[2] = sqrt(1. - alt); }