--- ray/src/rt/virtuals.c	1991/08/13 12:16:43	1.23
+++ ray/src/rt/virtuals.c	1991/10/22 11:23:51	1.29
@@ -143,8 +143,9 @@ MAT4  pm;
 		ourspot.flen = 0.;
 		if (source[sn].sflags & SSPOT) {
 			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].ss;
+			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;
@@ -169,7 +170,8 @@ MAT4  pm;
 		if (source[sn].sflags & SPROX && d > source[sn].sl.prox)
 			return(-1);		/* too far away */
 		ourspot.flen = 0.;
-		d = (sqrt(maxrad2) + source[sn].ss) / 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
@@ -214,9 +216,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;
@@ -275,6 +282,7 @@ register int  sn;	/* target source number */
 	RAY  sr;
 	FVECT  onorm;
 	FVECT  offsdir;
+	SRCINDEX  si;
 	double  or, d;
 	int  infront;
 	int  stestlim, ssn;
@@ -287,7 +295,8 @@ register int  sn;	/* target source number */
 	getplaneq(onorm, o);
 				/* set number of rays to sample */
 	if (source[sn].sflags & SDISTANT) {
-		n = 4.*or2/(thescene.cusize*thescene.cusize)*vspretest + .5;
+					/* 32. == heuristic constant */
+		n = 32.*or2/(thescene.cusize*thescene.cusize)*vspretest + .5;
 		infront = DOT(onorm, source[sn].sloc) > 0.;
 	} else {
 		for (i = 0; i < 3; i++)
@@ -318,7 +327,7 @@ register int  sn;	/* target source number */
 #endif
 				return(f);	/* too small a target! */
 			}
-			peano(offsdir, 3, urand(931*i+5827+ssn), .005);
+			multisamp(offsdir, 3, urand(sn*931+5827+ssn));
 			for (i = 0; i < 3; i++)
 				offsdir[i] = or*(1. - 2.*offsdir[i]);
 			ssn++;
@@ -338,8 +347,11 @@ register int  sn;	/* target source number */
 			rayorigin(&sr, NULL, PRIMARY, 1.0);
 		} while (!(*ofun[o->otype].funp)(o, &sr));
 					/* check against source */
+		initsrcindex(&si);
+		si.sn = sn;
+		nopart(&si, sr.rorg);
 		samplendx++;
-		if (srcray(&sr, NULL, sn) == 0.)
+		if (!srcray(&sr, NULL, &si) || sr.rsrc != sn)
 			continue;
 		sr.revf = srcvalue;
 		rayvalue(&sr);