--- ray/src/rt/rpict.c	1991/05/21 17:41:35	1.25
+++ ray/src/rt/rpict.c	1991/09/19 13:55:53	1.32
@@ -36,11 +36,13 @@ double  pixaspect = 1.0;		/* pixel aspect ratio */
 int  psample = 4;			/* pixel sample size */
 double  maxdiff = .05;			/* max. difference for interpolation */
 double  dstrpix = 0.67;			/* square pixel distribution */
-int  psuper = 2;			/* pixel super-sampling rate */
 
 double  dstrsrc = 0.0;			/* square source distribution */
 double  shadthresh = .05;		/* shadow threshold */
 double  shadcert = .5;			/* shadow certainty */
+int  directrelay = 0;			/* number of source relays */
+int  vspretest = 512;			/* virtual source pretest density */
+int  directinvis = 0;			/* sources invisible? */
 
 int  maxdepth = 6;			/* maximum recursion depth */
 double  minweight = 5e-3;		/* minimum ray weight */
@@ -65,7 +67,7 @@ extern long  tstart;			/* starting time */
 
 extern long  nrays;			/* number of rays traced */
 
-#define  MAXDIV		32		/* maximum sample size */
+#define  MAXDIV		15		/* maximum sample size */
 
 #define  pixjitter()	(.5+dstrpix*(.5-frandom()))
 
@@ -127,8 +129,12 @@ char  *zfile, *oldfile;
 					/* check sampling */
 	if (psample < 1)
 		psample = 1;
-	else if (psample > MAXDIV)
+	else if (psample > MAXDIV) {
+		sprintf(errmsg, "pixel sampling reduced from %d to %d",
+				psample, MAXDIV);
+		error(WARNING, errmsg);
 		psample = MAXDIV;
+	}
 					/* allocate scanlines */
 	for (i = 0; i <= psample; i++) {
 		scanbar[i] = (COLOR *)malloc(hresolu*sizeof(COLOR));
@@ -161,6 +167,10 @@ char  *zfile, *oldfile;
 	pctdone = 100.0*i/vresolu;
 	if (ralrm > 0)			/* report init stats */
 		report();
+#ifndef  BSD
+	else
+#endif
+	signal(SIGALRM, report);
 	ypos = vresolu-1 - i;
 	fillscanline(scanbar[0], zbar[0], hresolu, ypos, psample);
 	ystep = psample;
@@ -182,6 +192,9 @@ char  *zfile, *oldfile;
 							/* fill bar */
 		fillscanbar(scanbar, zbar, hresolu, ypos, ystep);
 							/* write it out */
+#ifndef  BSD
+		signal(SIGALRM, SIG_IGN);	/* don't interrupt writes */
+#endif
 		for (i = ystep; i > 0; i--) {
 			if (zfd != -1 && write(zfd, (char *)zbar[i],
 					hresolu*sizeof(float))
@@ -196,6 +209,10 @@ char  *zfile, *oldfile;
 		pctdone = 100.0*(vresolu-1-ypos)/vresolu;
 		if (ralrm > 0 && time((long *)0) >= tlastrept+ralrm)
 			report();
+#ifndef  BSD
+		else
+			signal(SIGALRM, report);
+#endif
 	}
 						/* clean up */
 	if (zfd != -1) {
@@ -348,7 +365,7 @@ int  x, y;			/* pixel position */
 
 	rayorigin(&thisray, NULL, PRIMARY, 1.0);
 
-	samplendx = 3*y + x;			/* set pixel index */
+	samplendx = pixnumber(x,y,hresolu,vresolu);	/* set pixel index */
 
 	rayvalue(&thisray);			/* trace ray */
 
@@ -407,4 +424,16 @@ char  *oldfile;
 	return(y);
 writerr:
 	error(SYSTEM, "write error in salvage");
+}
+
+
+int
+pixnumber(x, y, xres, yres)		/* compute pixel index (brushed) */
+register int  x, y;
+int  xres, yres;
+{
+	x -= y;
+	while (x < 0)
+		x += xres;
+	return((((x>>2)*yres + y) << 2) + (x & 3));
 }