--- ray/src/gen/mkillum2.c 1991/08/23 12:30:33 1.12 +++ ray/src/gen/mkillum2.c 1992/03/11 12:25:47 2.2 @@ -26,8 +26,7 @@ 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->altmat, ob); + printobj(il->altmat, ob); } @@ -88,7 +87,7 @@ char *nm; h = ilhash(dim, 3) + i; multisamp(sp, 2, urand(h)); r1 = (dim[1] + sp[0])/nalt; - r2 = (dim[2] + sp[1])/nazi; + 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]; @@ -120,7 +119,7 @@ char *nm; if (il->sampdens > 0) flatout(il, distarr, nalt, nazi, u, v, fa->norm); illumout(il, ob); - } else if (!(il->flags & IL_LIGHT)) + } else printobj(il->altmat, ob); /* clean up */ freeface(ob); @@ -166,7 +165,7 @@ char *nm; multisamp(sp, 4, urand(ilhash(dim,3)+i)); /* random direction */ r1 = (dim[1] + sp[0])/nalt; - r2 = (dim[2] + sp[1])/nazi; + r2 = (dim[2] + sp[1] - .5)/nazi; rounddir(dir, r1, r2); /* random location */ mkaxes(u, v, dir); /* yuck! */ @@ -191,7 +190,7 @@ char *nm; else objerror(ob, WARNING, "diffuse distribution"); illumout(il, ob); - } else if (!(il->flags & IL_LIGHT)) + } else printobj(il->altmat, ob); /* clean up */ free((char *)distarr); @@ -236,7 +235,7 @@ char *nm; multisamp(sp, 4, urand(ilhash(dim,3)+i)); /* random direction */ r1 = (dim[1] + sp[0])/nalt; - r2 = (dim[2] + sp[1])/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]; @@ -259,7 +258,7 @@ char *nm; if (il->sampdens > 0) flatout(il, distarr, nalt, nazi, u, v, co->ad); illumout(il, ob); - } else if (!(il->flags & IL_LIGHT)) + } else printobj(il->altmat, ob); /* clean up */ freecone(ob); @@ -291,6 +290,7 @@ register struct rtproc *rt; if (rt->nrays <= 0) return; bzero(rt->buf+6*rt->nrays, 6*sizeof(float)); + errno = 0; if ( process(rt->pd, (char *)rt->buf, (char *)rt->buf, 3*sizeof(float)*rt->nrays, 6*sizeof(float)*(rt->nrays+1)) <