--- ray/src/rt/m_mirror.c 1995/07/26 16:53:25 2.4 +++ ray/src/rt/m_mirror.c 1995/09/15 15:47:29 2.6 @@ -1,4 +1,4 @@ -/* Copyright (c) 1991 Regents of the University of California */ +/* Copyright (c) 1995 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -36,6 +36,7 @@ register RAY *r; { COLOR mcolor; RAY nr; + int rpure = 1; register int i; /* check arguments */ if (m->oargs.nfargs != 3 || m->oargs.nsargs > 1) @@ -76,17 +77,22 @@ register RAY *r; if (rayorigin(&nr, r, REFLECTED, bright(mcolor)) < 0) return(1); - pdot = raynormal(pnorm, r); /* use textures */ - for (i = 0; i < 3; i++) - nr.rdir[i] = r->rdir[i] + 2.*pdot*pnorm[i]; + if (DOT(r->pert,r->pert) > FTINY*FTINY) { + pdot = raynormal(pnorm, r); /* use textures */ + for (i = 0; i < 3; i++) + nr.rdir[i] = r->rdir[i] + 2.*pdot*pnorm[i]; + rpure = 0; + } /* check for penetration */ - if (DOT(nr.rdir, r->ron) <= FTINY) + if (rpure || DOT(nr.rdir, r->ron) <= FTINY) for (i = 0; i < 3; i++) nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i]; } rayvalue(&nr); multcolor(nr.rcol, mcolor); addcolor(r->rcol, nr.rcol); + if (rpure && r->ro != NULL && isflat(r->ro->otype)) + r->rt = r->rot + nr.rt; return(1); } @@ -97,12 +103,21 @@ register OBJREC *o; SRCREC *s; int n; { - FVECT nv; + FVECT nv, sc; double od; + register int i, j; /* get surface normal and offset */ od = getplaneq(nv, o); - /* check for behind */ - if (DOT(s->sloc, nv) <= (s->sflags & SDISTANT ? FTINY : od+FTINY)) + /* check for extreme point for behind */ + VCOPY(sc, s->sloc); + for (i = s->sflags & SFLAT ? SV : SW; i >= 0; i--) + if (DOT(nv, s->ss[i]) > 0.) + for (j = 0; j < 3; j++) + sc[j] += s->ss[i][j]; + else + for (j = 0; j < 3; j++) + sc[j] -= s->ss[i][j]; + if (DOT(sc, nv) <= (s->sflags & SDISTANT ? FTINY : od+FTINY)) return(0); /* everything OK -- compute projection */ mirrorproj(pm, nv, od);