--- ray/src/gen/mkillum2.c 1992/08/13 10:03:19 2.4 +++ ray/src/gen/mkillum2.c 1994/01/07 14:51:46 2.6 @@ -71,11 +71,12 @@ char *nm; 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 (DOT(u,u) >= fa->area-FTINY) + if ((r1 = DOT(u,u)) >= fa->area-FTINY) break; } if (i < fa->nv) { /* got one! -- let's align our axes */ - normalize(u); + 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); @@ -259,7 +260,7 @@ char *nm; r1 = r3*cos(r2); r2 = r3*sin(r2); for (j = 0; j < 3; j++) - org[j] = CO_P0(co)[j] + r1*u[j] + r1*v[j] + + org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j] + .001*co->ad[j]; /* send sample */