--- ray/src/gen/mkillum2.c 1991/07/24 13:32:05 1.3 +++ ray/src/gen/mkillum2.c 1991/08/26 10:16:56 1.13 @@ -5,7 +5,7 @@ static char SCCSid[] = "$SunId$ LBL"; #endif /* - * Routines to do the actual calcultion and output for mkillum + * Routines to do the actual calculation for mkillum */ #include "mkillum.h" @@ -17,33 +17,6 @@ static char SCCSid[] = "$SunId$ LBL"; #include "random.h" -printobj(mod, obj) /* print out an object */ -char *mod; -register OBJREC *obj; -{ - register int i; - - 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'); -} - - o_default(ob, il, rt, nm) /* default illum action */ OBJREC *ob; struct illum_args *il; @@ -54,7 +27,7 @@ char *nm; nm, ofun[ob->otype].funame, ob->oname); error(WARNING, errmsg); if (!(il->flags & IL_LIGHT)) - printobj(il->altname, ob); + printobj(il->altmat, ob); } @@ -65,11 +38,11 @@ struct rtproc *rt; 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; @@ -83,9 +56,13 @@ char *nm; return; } /* 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) @@ -108,21 +85,18 @@ 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]; @@ -138,11 +112,16 @@ char *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, rt); } rayflush(rt); - /* write out the distribution */ - flatdist(distarr, nalt, nazi, il, ob); + /* 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 if (!(il->flags & IL_LIGHT)) + printobj(il->altmat, ob); /* clean up */ freeface(ob); free((char *)distarr); @@ -156,20 +135,24 @@ struct illum_args *il; struct rtproc *rt; 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(n/PI) + .5; + nazi = PI*nalt + .5; + } n = nalt*nazi; distarr = (float *)calloc(n, 3*sizeof(float)); if (distarr == NULL) @@ -179,29 +162,37 @@ 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, rt); } rayflush(rt); - /* write out the distribution */ - rounddist(distarr, nalt, nazi, il, ob); + /* 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 if (!(il->flags & IL_LIGHT)) + printobj(il->altmat, ob); /* clean up */ free((char *)distarr); } @@ -213,20 +204,24 @@ struct illum_args *il; struct rtproc *rt; 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,32 +232,35 @@ 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] + r1*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, rt); } rayflush(rt); - /* write out the distribution */ - flatdist(distarr, nalt, nazi, il, ob); + /* 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 if (!(il->flags & IL_LIGHT)) + printobj(il->altmat, ob); /* clean up */ freecone(ob); free((char *)distarr); @@ -292,8 +290,7 @@ register struct rtproc *rt; if (rt->nrays <= 0) return; - i = 6*rt->nrays + 3; - rt->buf[i++] = 0.; rt->buf[i++] = 0.; rt->buf[i] = 0.; + bzero(rt->buf+6*rt->nrays, 6*sizeof(float)); if ( process(rt->pd, (char *)rt->buf, (char *)rt->buf, 3*sizeof(float)*rt->nrays, 6*sizeof(float)*(rt->nrays+1)) < @@ -306,4 +303,48 @@ register struct rtproc *rt; rt->dest[i][2] += rt->buf[3*i+2]; } rt->nrays = 0; +} + + +mkaxes(u, v, n) /* compute u and v to go with n */ +FVECT u, v, 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); +} + + +rounddir(dv, alt, azi) /* compute uniform spherical direction */ +register FVECT dv; +double alt, 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); +} + + +flatdir(dv, alt, azi) /* compute uniform hemispherical direction */ +register FVECT dv; +double alt, 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); }