--- ray/src/rt/m_mirror.c	2003/02/25 02:47:22	2.9
+++ ray/src/rt/m_mirror.c	2010/09/26 15:51:15	2.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: m_mirror.c,v 2.9 2003/02/25 02:47:22 greg Exp $";
+static const char	RCSid[] = "$Id: m_mirror.c,v 2.13 2010/09/26 15:51:15 greg Exp $";
 #endif
 /*
  * Routines for mirror material supporting virtual light sources
@@ -8,9 +8,8 @@ static const char	RCSid[] = "$Id: m_mirror.c,v 2.9 200
 #include "copyright.h"
 
 #include  "ray.h"
-
 #include  "otypes.h"
-
+#include  "rtotypes.h"
 #include  "source.h"
 
 /*
@@ -24,16 +23,17 @@ static const char	RCSid[] = "$Id: m_mirror.c,v 2.9 200
  * part of the direct calculation.
  */
 
+static int mir_proj(MAT4  pm, OBJREC  *o, SRCREC  *s, int  n);
+static void mirrorproj(MAT4  m, FVECT  nv, double  offs);
 
-static int  mir_proj(), mirrorproj();
-
 VSMATERIAL  mirror_vs = {mir_proj, 1};
 
 
-int
-m_mirror(m, r)			/* shade mirrored ray */
-register OBJREC  *m;
-register RAY  *r;
+extern int
+m_mirror(			/* shade mirrored ray */
+	register OBJREC  *m,
+	register RAY  *r
+)
 {
 	COLOR  mcolor;
 	RAY  nr;
@@ -66,7 +66,7 @@ register RAY  *r;
 	multcolor(mcolor, r->pcol);
 					/* compute reflected ray */
 	if (r->rsrc >= 0) {			/* relayed light source */
-		rayorigin(&nr, r, REFLECTED, 1.);
+		rayorigin(&nr, REFLECTED, r, mcolor);
 					/* ignore textures */
 		for (i = 0; i < 3; i++)
 			nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
@@ -76,7 +76,7 @@ register RAY  *r;
 		FVECT  pnorm;
 		double  pdot;
 
-		if (rayorigin(&nr, r, REFLECTED, bright(mcolor)) < 0)
+		if (rayorigin(&nr, REFLECTED, r, mcolor) < 0)
 			return(1);
 		if (DOT(r->pert,r->pert) > FTINY*FTINY) {
 			pdot = raynormal(pnorm, r);	/* use textures */
@@ -89,8 +89,9 @@ register RAY  *r;
 			for (i = 0; i < 3; i++)
 				nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
 	}
+	checknorm(nr.rdir);
 	rayvalue(&nr);
-	multcolor(nr.rcol, mcolor);
+	multcolor(nr.rcol, nr.rcoef);
 	addcolor(r->rcol, nr.rcol);
 	if (rpure && r->ro != NULL && isflat(r->ro->otype))
 		r->rt = r->rot + nr.rt;
@@ -99,27 +100,35 @@ register RAY  *r;
 
 
 static int
-mir_proj(pm, o, s, n)		/* compute a mirror's projection */
-MAT4  pm;
-register OBJREC  *o;
-SRCREC  *s;
-int  n;
+mir_proj(		/* compute a mirror's projection */
+	MAT4  pm,
+	register OBJREC  *o,
+	SRCREC  *s,
+	int  n
+)
 {
+	double	corr = 1.;
 	FVECT  nv, sc;
-	double  od;
-	register int  i, j;
+	double  od, offs;
+	int  i;
 				/* get surface normal and offset */
-	od = getplaneq(nv, o);
-				/* check for extreme point for behind */
+	offs = od = getplaneq(nv, o);
+	if (s->sflags & SDISTANT)
+		offs = 0.;
+				/* check for extreme point behind */
+	if (s->sflags & SCIR) {
+		if (s->sflags & (SFLAT|SDISTANT))
+			corr = 1.12837917;	/* correct setflatss() */
+		else
+			corr = 1.0/0.7236;	/* correct sphsetsrc() */
+	}
 	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];
+		if (DOT(nv, s->ss[i]) > offs)
+			VSUM(sc, sc, s->ss[i], corr);
 		else
-			for (j = 0; j < 3; j++)
-				sc[j] -= s->ss[i][j];
-	if (DOT(sc, nv) <= (s->sflags & SDISTANT ? FTINY : od+FTINY))
+			VSUM(sc, sc, s->ss[i], -corr);
+	if (DOT(sc, nv) <= offs+FTINY)
 		return(0);
 				/* everything OK -- compute projection */
 	mirrorproj(pm, nv, od);
@@ -127,11 +136,12 @@ int  n;
 }
 
 
-static int
-mirrorproj(m, nv, offs)		/* get mirror projection for surface */
-register MAT4  m;
-FVECT  nv;
-double  offs;
+static void
+mirrorproj(		/* get mirror projection for surface */
+	register MAT4  m,
+	FVECT  nv,
+	double  offs
+)
 {
 	register int  i, j;
 					/* assign matrix */