--- ray/src/rt/virtuals.c	1991/06/26 08:55:10	1.13
+++ ray/src/rt/virtuals.c	1991/07/17 12:38:52	1.18
@@ -19,7 +19,7 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "random.h"
 
-#define  MINSAMPLES	3		/* minimum number of pretest samples */
+#define  MINSAMPLES	5		/* minimum number of pretest samples */
 #define  STESTMAX	30		/* maximum seeks per sample */
 
 
@@ -104,6 +104,7 @@ int  n;
 	for (i = 0; i < vsmat->nproj; i++)
 		if ((*vsmat->vproj)(proj, o, &source[sn], i))
 			if ((ns = makevsrc(o, sn, proj)) >= 0) {
+				source[ns].sa.sv.pn = i;
 #ifdef DEBUG
 				virtverb(ns, stderr);
 #endif
@@ -134,6 +135,7 @@ MAT4  pm;
 		if (source[sn].sflags & SPROX)
 			return(-1);		/* should never get here! */
 		multv3(nsloc, source[sn].sloc, pm);
+		normalize(nsloc);
 		VCOPY(ourspot.aim, ocent);
 		ourspot.siz = PI*maxrad2;
 		ourspot.flen = 0.;
@@ -161,14 +163,25 @@ MAT4  pm;
 			return(-1);		/* at source!! */
 		if (source[sn].sflags & SPROX && d > source[sn].sl.prox)
 			return(-1);		/* too far away */
-		ourspot.siz = 2.*PI*(1. - d/sqrt(d*d+maxrad2));
 		ourspot.flen = 0.;
+		if (d*d > maxrad2)
+			ourspot.siz = 2.*PI*(1. - sqrt(1.-maxrad2/(d*d)));
+		else
+			nsflags &= ~SSPOT;
 		if (source[sn].sflags & SSPOT) {
 			copystruct(&theirspot, source[sn].sl.s);
 			multv3(theirspot.aim, source[sn].sl.s->aim, pm);
-			d = ourspot.siz;
-			if (!commonspot(&ourspot, &theirspot, nsloc))
-				return(-1);	/* no overlap */
+			normalize(theirspot.aim);
+			if (nsflags & SSPOT) {
+				ourspot.flen = theirspot.flen;
+				d = ourspot.siz;
+				if (!commonspot(&ourspot, &theirspot, nsloc))
+					return(-1);	/* no overlap */
+			} else {
+				nsflags |= SSPOT;
+				copystruct(&ourspot, &theirspot);
+				d = 2.*ourspot.siz;
+			}
 			if (ourspot.siz < d-FTINY) {	/* it shrunk */
 				d = spotdisk(v, op, &ourspot, nsloc);
 				if (d <= FTINY)
@@ -178,10 +191,10 @@ MAT4  pm;
 					VCOPY(ocent, v);
 				}
 			}
-			ourspot.flen = theirspot.flen;
 		}
 		if (source[sn].sflags & SFLAT) {	/* behind source? */
 			multv3(nsnorm, source[sn].snorm, pm);
+			normalize(nsnorm);
 			if (!checkspot(&ourspot, nsnorm))
 				return(-1);
 		}
@@ -198,12 +211,14 @@ MAT4  pm;
 	if (nsflags & SFLAT)
 		VCOPY(source[i].snorm, nsnorm);
 	source[i].ss = source[sn].ss; source[i].ss2 = source[sn].ss2;
-	if ((source[i].sl.s = (SPOT *)malloc(sizeof(SPOT))) == NULL)
-		goto memerr;
-	copystruct(source[i].sl.s, &ourspot);
+	if (nsflags & SSPOT) {
+		if ((source[i].sl.s = (SPOT *)malloc(sizeof(SPOT))) == NULL)
+			goto memerr;
+		copystruct(source[i].sl.s, &ourspot);
+	}
 	if (nsflags & SPROX)
 		source[i].sl.prox = source[sn].sl.prox;
-	source[i].sa.svnext = sn;
+	source[i].sa.sv.sn = sn;
 	source[i].so = op;
 	return(i);
 memerr:
@@ -256,7 +271,7 @@ register int  sn;	/* target source number */
 	FVECT  offsdir;
 	double  or, d;
 	int  infront;
-	int  ssn;
+	int  stestlim, ssn;
 	int  nhit, nok;
 	register int  i, n;
 				/* return if pretesting disabled */
@@ -282,12 +297,13 @@ register int  sn;	/* target source number */
 #endif
 				/* sample */
 	or = sqrt(or2);
-	ssn = STESTMAX*n;
+	stestlim = n*STESTMAX;
+	ssn = 0;
 	nhit = nok = 0;
 	while (n-- > 0) {
 					/* get sample point */
 		do {
-			if (--ssn < 0) {
+			if (ssn >= stestlim) {
 #ifdef DEBUG
 				fprintf(stderr, "\ttoo hard to hit\n");
 #endif
@@ -295,7 +311,8 @@ register int  sn;	/* target source number */
 			}
 			for (i = 0; i < 3; i++)
 				offsdir[i] = or*(1. -
-						2.*urand(931*i+5827+ssn));
+					2.*urand(urind(931*i+5827,ssn)));
+			ssn++;
 			for (i = 0; i < 3; i++)
 				sr.rorg[i] = oc[i] + offsdir[i];
 			d = DOT(offsdir,onorm);
@@ -321,7 +338,8 @@ register int  sn;	/* target source number */
 			continue;
 		nok++;
 					/* check against obstructions */
-		srcray(&sr, NULL, sn);
+		rayclear(&sr);
+		sr.revf = raytrace;
 		rayvalue(&sr);
 		if (bright(sr.rcol) > FTINY)
 			nhit++;
@@ -359,7 +377,7 @@ FILE  *fp;
 	fprintf(fp, "\tat (%f,%f,%f)\n",
 		source[sn].sloc[0], source[sn].sloc[1], source[sn].sloc[2]);
 	fprintf(fp, "\tlinked to source %d (%s)\n",
-		source[sn].sa.svnext, source[source[sn].sa.svnext].so->oname);
+		source[sn].sa.sv.sn, source[source[sn].sa.sv.sn].so->oname);
 	if (source[sn].sflags & SFOLLOW)
 		fprintf(fp, "\talways followed\n");
 	else