--- ray/src/rt/source.c	1989/06/07 15:07:31	1.7
+++ ray/src/rt/source.c	1989/06/13 08:20:22	1.11
@@ -286,7 +286,7 @@ register RAY  *r;
 
 static int
 cntcmp(sc1, sc2)			/* contribution compare (descending) */
-register CONTRIB  *sc1, *sc2;
+register CNTPTR  *sc1, *sc2;
 {
 	if (sc1->brt > sc2->brt)
 		return(-1);
@@ -303,24 +303,28 @@ char  *p;			/* data for f */
 {
 	register int  sn;
 	register CONTRIB  *srccnt;
-	double  dtmp, hwt, test2, hit2;
+	register CNTPTR  *cntord;
+	double  prob, ourthresh, hwt, test2, hit2;
 	RAY  sr;
 
-	if ((srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB))) == NULL)
+	srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
+	cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
+	if (srccnt == NULL || cntord == NULL)
 		error(SYSTEM, "out of memory in direct");
+						/* modify threshold */
+	ourthresh = shadthresh / r->rweight;
 						/* potential contributions */
 	for (sn = 0; sn < nsources; sn++) {
-		srccnt[sn].sno = sn;
-		setcolor(srccnt[sn].val, 0.0, 0.0, 0.0);
-		srccnt[sn].brt = 0.0;
+		cntord[sn].sno = sn;
+		cntord[sn].brt = 0.0;
 						/* get source ray */
 		if ((srccnt[sn].dom = srcray(&sr, r, sn)) == 0.0)
 			continue;
 		VCOPY(srccnt[sn].dir, sr.rdir);
 						/* compute coefficient */
 		(*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom);
-		srccnt[sn].brt = bright(srccnt[sn].val);
-		if (srccnt[sn].brt <= FTINY)
+		cntord[sn].brt = bright(srccnt[sn].val);
+		if (cntord[sn].brt <= FTINY)
 			continue;
 						/* compute intersection */
 		if (!( source[sn].sflags & SDISTANT ?
@@ -331,26 +335,26 @@ char  *p;			/* data for f */
 						/* compute contribution */
 		rayshade(&sr, sr.ro->omod);
 		multcolor(srccnt[sn].val, sr.rcol);
-		srccnt[sn].brt = bright(srccnt[sn].val);
+		cntord[sn].brt = bright(srccnt[sn].val);
 	}
 						/* sort contributions */
-	qsort(srccnt, nsources, sizeof(CONTRIB), cntcmp);
-	hit2 = 0.0; test2 = FTINY;
+	qsort(cntord, nsources, sizeof(CNTPTR), cntcmp);
+	hit2 = 0.5; test2 = 1.0;		/* start with prob=.5 */
 						/* test for shadows */
 	for (sn = 0; sn < nsources; sn++) {
 						/* check threshold */
-		if (srccnt[sn].brt <= shadthresh*bright(r->rcol)/r->rweight)
+		if (cntord[sn].brt <= ourthresh*bright(r->rcol))
 			break;
 						/* get statistics */
-		hwt = (double)source[srccnt[sn].sno].nhits /
-				(double)source[srccnt[sn].sno].ntests;
+		hwt = (double)source[cntord[sn].sno].nhits /
+				(double)source[cntord[sn].sno].ntests;
 		test2 += hwt;
-		source[srccnt[sn].sno].ntests++;
+		source[cntord[sn].sno].ntests++;
 						/* test for hit */
 		rayorigin(&sr, r, SHADOW, 1.0);
-		VCOPY(sr.rdir, srccnt[sn].dir);
+		VCOPY(sr.rdir, srccnt[cntord[sn].sno].dir);
 		if (localhit(&sr, &thescene) &&
-				sr.ro != source[srccnt[sn].sno].so) {
+				sr.ro != source[cntord[sn].sno].so) {
 						/* check for transmission */
 			if (sr.clipset != NULL && inset(sr.clipset,sr.ro->omod))
 				raytrans(&sr);		/* object is clipped */
@@ -358,13 +362,15 @@ char  *p;			/* data for f */
 				rayshade(&sr, sr.ro->omod);
 			if (bright(sr.rcol) <= FTINY)
 				continue;	/* missed! */
-			(*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom);
-			multcolor(srccnt[sn].val, sr.rcol);
+			(*f)(srccnt[cntord[sn].sno].val, p,
+					srccnt[cntord[sn].sno].dir,
+					srccnt[cntord[sn].sno].dom);
+			multcolor(srccnt[cntord[sn].sno].val, sr.rcol);
 		}
 						/* add contribution if hit */
-		addcolor(r->rcol, srccnt[sn].val);
+		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
 		hit2 += hwt;
-		source[srccnt[sn].sno].nhits++;
+		source[cntord[sn].sno].nhits++;
 	}
 					/* weighted hit rate */
 	hwt = hit2 / test2;
@@ -374,12 +380,12 @@ char  *p;			/* data for f */
 #endif
 					/* add in untested sources */
 	for ( ; sn < nsources; sn++) {
-		if (srccnt[sn].brt <= 0.0)
+		if (cntord[sn].brt <= 0.0)
 			break;
-		dtmp = hwt * (double)source[srccnt[sn].sno].nhits /
-				(double)source[srccnt[sn].sno].ntests;
-		scalecolor(srccnt[sn].val, dtmp);
-		addcolor(r->rcol, srccnt[sn].val);
+		prob = hwt * (double)source[cntord[sn].sno].nhits /
+				(double)source[cntord[sn].sno].ntests;
+		scalecolor(srccnt[cntord[sn].sno].val, prob);
+		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
 	}
 #ifdef DEBUG
 	fprintf(stderr, "%d tested, %d untested, %f hit rate\n",
@@ -388,6 +394,7 @@ char  *p;			/* data for f */
 #endif
 		
 	free(srccnt);
+	free(cntord);
 }