--- ray/src/rt/virtuals.c	1991/07/17 12:38:52	1.18
+++ ray/src/rt/virtuals.c	1995/11/07 12:40:25	2.5
@@ -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";
@@ -19,8 +19,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "random.h"
 
-#define  MINSAMPLES	5		/* minimum number of pretest samples */
-#define  STESTMAX	30		/* maximum seeks per sample */
+#define  MINSAMPLES	16		/* minimum number of pretest samples */
+#define  STESTMAX	32		/* maximum seeks per sample */
 
 
 double  getdisk();
@@ -41,11 +41,13 @@ markvirtuals()			/* find and mark virtual sources */
 		o = objptr(i);
 		if (!issurface(o->otype) || o->omod == OVOID)
 			continue;
-		if (!isvlight(objptr(o->omod)->otype))
+		if (!isvlight(vsmaterial(o)->otype))
 			continue;
 		if (sfun[o->otype].of == NULL ||
-				sfun[o->otype].of->getpleq == NULL)
-			objerror(o, USER, "illegal material");
+				sfun[o->otype].of->getpleq == NULL) {
+			objerror(o,WARNING,"secondary sources not supported");
+			continue;
+		}
 		if (nvobjects == 0)
 			vobject = (OBJECT *)malloc(sizeof(OBJECT));
 		else
@@ -99,7 +101,7 @@ int  n;
 	if (o == source[sn].so)	/* objects cannot project themselves */
 		return;
 				/* get virtual source material */
-	vsmat = sfun[objptr(o->omod)->otype].mf;
+	vsmat = sfun[vsmaterial(o)->otype].mf;
 				/* project virtual sources */
 	for (i = 0; i < vsmat->nproj; i++)
 		if ((*vsmat->vproj)(proj, o, &source[sn], i))
@@ -113,6 +115,23 @@ int  n;
 }
 
 
+OBJREC *
+vsmaterial(o)			/* get virtual source material pointer */
+OBJREC  *o;
+{
+	register int  i;
+	register OBJREC  *m;
+
+	i = o->omod;
+	m = objptr(i);
+	if (m->otype != MAT_ILLUM || m->oargs.nsargs < 1 ||
+			!strcmp(m->oargs.sarg[0], VOIDID) ||
+			(i = modifier(m->oargs.sarg[0])) == OVOID)
+		return(m);		/* direct modifier */
+	return(objptr(i));		/* illum alternate */
+}
+
+
 int
 makevsrc(op, sn, pm)		/* make virtual source if reasonable */
 OBJREC  *op;
@@ -138,10 +157,14 @@ MAT4  pm;
 		normalize(nsloc);
 		VCOPY(ourspot.aim, ocent);
 		ourspot.siz = PI*maxrad2;
-		ourspot.flen = 0.;
+		ourspot.flen = -1.;
 		if (source[sn].sflags & SSPOT) {
-			copystruct(&theirspot, source[sn].sl.s);
 			multp3(theirspot.aim, source[sn].sl.s->aim, pm);
+						/* adjust for source size */
+			d = sqrt(dist2(ourspot.aim, theirspot.aim));
+			d = sqrt(source[sn].sl.s->siz/PI) + d*source[sn].srad;
+			theirspot.siz = PI*d*d;
+			ourspot.flen = theirspot.flen = source[sn].sl.s->flen;
 			d = ourspot.siz;
 			if (!commonbeam(&ourspot, &theirspot, nsloc))
 				return(-1);	/* no overlap */
@@ -164,8 +187,10 @@ MAT4  pm;
 		if (source[sn].sflags & SPROX && d > source[sn].sl.prox)
 			return(-1);		/* too far away */
 		ourspot.flen = 0.;
-		if (d*d > maxrad2)
-			ourspot.siz = 2.*PI*(1. - sqrt(1.-maxrad2/(d*d)));
+						/* adjust for source size */
+		d = (sqrt(maxrad2) + source[sn].srad) / d;
+		if (d < 1.-FTINY)
+			ourspot.siz = 2.*PI*(1. - sqrt(1.-d*d));
 		else
 			nsflags &= ~SSPOT;
 		if (source[sn].sflags & SSPOT) {
@@ -195,7 +220,7 @@ MAT4  pm;
 		if (source[sn].sflags & SFLAT) {	/* behind source? */
 			multv3(nsnorm, source[sn].snorm, pm);
 			normalize(nsnorm);
-			if (!checkspot(&ourspot, nsnorm))
+			if (nsflags & SSPOT && !checkspot(&ourspot, nsnorm))
 				return(-1);
 		}
 	}
@@ -208,9 +233,14 @@ MAT4  pm;
 		goto memerr;
 	source[i].sflags = nsflags;
 	VCOPY(source[i].sloc, nsloc);
+	multv3(source[i].ss[SU], source[sn].ss[SU], pm);
+	multv3(source[i].ss[SV], source[sn].ss[SV], pm);
 	if (nsflags & SFLAT)
 		VCOPY(source[i].snorm, nsnorm);
-	source[i].ss = source[sn].ss; source[i].ss2 = source[sn].ss2;
+	else
+		multv3(source[i].ss[SW], source[sn].ss[SW], pm);
+	source[i].srad = source[sn].srad;
+	source[i].ss2 = source[sn].ss2;
 	if (nsflags & SSPOT) {
 		if ((source[i].sl.s = (SPOT *)malloc(sizeof(SPOT))) == NULL)
 			goto memerr;
@@ -269,8 +299,8 @@ register int  sn;	/* target source number */
 	RAY  sr;
 	FVECT  onorm;
 	FVECT  offsdir;
+	SRCINDEX  si;
 	double  or, d;
-	int  infront;
 	int  stestlim, ssn;
 	int  nhit, nok;
 	register int  i, n;
@@ -281,14 +311,16 @@ register int  sn;	/* target source number */
 	getplaneq(onorm, o);
 				/* set number of rays to sample */
 	if (source[sn].sflags & SDISTANT) {
-		n = (2./3.*PI*PI)*or2/(thescene.cusize*thescene.cusize)*
-				vspretest + .5;
-		infront = DOT(onorm, source[sn].sloc) > 0.;
+					/* 32. == heuristic constant */
+		n = 32.*or2/(thescene.cusize*thescene.cusize)*vspretest + .5;
 	} else {
 		for (i = 0; i < 3; i++)
 			offsdir[i] = source[sn].sloc[i] - oc[i];
-		n = or2/DOT(offsdir,offsdir)*vspretest + .5;
-		infront = DOT(onorm, offsdir) > 0.;
+		d = DOT(offsdir,offsdir);
+		if (d <= FTINY)
+			n = 2.*PI * vspretest + .5;
+		else
+			n = 2.*PI * (1.-sqrt(1./(1.+or2/d)))*vspretest + .5;
 	}
 	if (n < MINSAMPLES) n = MINSAMPLES;
 #ifdef DEBUG
@@ -300,6 +332,7 @@ register int  sn;	/* target source number */
 	stestlim = n*STESTMAX;
 	ssn = 0;
 	nhit = nok = 0;
+	initsrcindex(&si);
 	while (n-- > 0) {
 					/* get sample point */
 		do {
@@ -309,35 +342,33 @@ register int  sn;	/* target source number */
 #endif
 				return(f);	/* too small a target! */
 			}
+			multisamp(offsdir, 3, urand(sn*931+5827+ssn));
 			for (i = 0; i < 3; i++)
-				offsdir[i] = or*(1. -
-					2.*urand(urind(931*i+5827,ssn)));
+				offsdir[i] = or*(1. - 2.*offsdir[i]);
 			ssn++;
-			for (i = 0; i < 3; i++)
-				sr.rorg[i] = oc[i] + offsdir[i];
-			d = DOT(offsdir,onorm);
-			if (infront)
-				for (i = 0; i < 3; i++) {
-					sr.rorg[i] -= (d-.0001)*onorm[i];
-					sr.rdir[i] = -onorm[i];
-				}
-			else
-				for (i = 0; i < 3; i++) {
-					sr.rorg[i] -= (d+.0001)*onorm[i];
-					sr.rdir[i] = onorm[i];
-				}
+			d = 1. - DOT(offsdir, onorm);
+			for (i = 0; i < 3; i++) {
+				sr.rorg[i] = oc[i] + offsdir[i] + d*onorm[i];
+				sr.rdir[i] = -onorm[i];
+			}
+			sr.rmax = 0.0;
 			rayorigin(&sr, NULL, PRIMARY, 1.0);
 		} while (!(*ofun[o->otype].funp)(o, &sr));
 					/* check against source */
+		VCOPY(sr.rorg, sr.rop);	/* starting from intersection */
 		samplendx++;
-		if (srcray(&sr, NULL, sn) == 0.)
-			continue;
+		if (si.sp >= si.np-1 ||
+				!srcray(&sr, NULL, &si) || sr.rsrc != sn) {
+			si.sn = sn-1;		/* reset index to our source */
+			si.np = 0;
+			if (!srcray(&sr, NULL, &si) || sr.rsrc != sn)
+				continue;	/* can't get there from here */
+		}
 		sr.revf = srcvalue;
-		rayvalue(&sr);
+		rayvalue(&sr);			/* check sample validity */
 		if (bright(sr.rcol) <= FTINY)
 			continue;
-		nok++;
-					/* check against obstructions */
+		nok++;			/* got sample; check obstructions */
 		rayclear(&sr);
 		sr.revf = raytrace;
 		rayvalue(&sr);