--- ray/src/rt/rpict.c	1991/04/09 09:31:01	1.24
+++ ray/src/rt/rpict.c	1991/11/11 14:02:45	1.36
@@ -15,15 +15,21 @@ static char SCCSid[] = "$SunId$ LBL";
 #ifdef BSD
 #include  <sys/time.h>
 #include  <sys/resource.h>
-#else
-#include  <signal.h>
 #endif
+
+#include  <signal.h>
 #include  <fcntl.h>
 
 #include  "view.h"
 
+#include  "resolu.h"
+
 #include  "random.h"
 
+int  dimlist[MAXDIM];			/* sampling dimensions */
+int  ndims = 0;				/* number of sampling dimensions */
+int  samplendx;				/* sample index number */
+
 VIEW  ourview = STDVIEW;		/* view parameters */
 int  hresolu = 512;			/* horizontal resolution */
 int  vresolu = 512;			/* vertical resolution */
@@ -36,6 +42,10 @@ double  dstrpix = 0.67;			/* square pixel distribution
 double  dstrsrc = 0.0;			/* square source distribution */
 double  shadthresh = .05;		/* shadow threshold */
 double  shadcert = .5;			/* shadow certainty */
+int  directrelay = 1;			/* number of source relays */
+int  vspretest = 512;			/* virtual source pretest density */
+int  directinvis = 0;			/* sources invisible? */
+double  srcsizerat = .25;		/* maximum ratio source size/dist. */
 
 int  maxdepth = 6;			/* maximum recursion depth */
 double  minweight = 5e-3;		/* minimum ray weight */
@@ -60,7 +70,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()))
 
@@ -115,6 +125,7 @@ char  *zfile, *oldfile;
 	float  *zbar[MAXDIV+1];		/* z values */
 	int  ypos;			/* current scanline */
 	int  ystep;			/* current y step size */
+	int  hstep;			/* h step size */
 	int  zfd;
 	COLOR  *colptr;
 	float  *zptr;
@@ -122,8 +133,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));
@@ -147,7 +162,7 @@ char  *zfile, *oldfile;
 			zbar[i] = NULL;
 	}
 					/* write out boundaries */
-	fputresolu(YMAJOR|YDECR, hresolu, vresolu, stdout);
+	fprtresolu(hresolu, vresolu, stdout);
 					/* recover file and compute first */
 	i = salvage(oldfile);
 	if (zfd != -1 && i > 0 &&
@@ -156,9 +171,14 @@ 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;
+	hstep = (psample*140+49)/99;		/* quincunx sampling */
+	ystep = (psample*99+70)/140;
+	fillscanline(scanbar[0], zbar[0], hresolu, ypos, hstep);
 						/* compute scanlines */
 	for (ypos -= ystep; ypos > -ystep; ypos -= ystep) {
 							/* bottom adjust? */
@@ -173,10 +193,13 @@ char  *zfile, *oldfile;
 		zbar[ystep] = zbar[0];
 		zbar[0] = zptr;
 							/* fill base line */
-		fillscanline(scanbar[0], zbar[0], hresolu, ypos, psample);
+		fillscanline(scanbar[0], zbar[0], hresolu, ypos, hstep);
 							/* 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))
@@ -191,6 +214,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) {
@@ -221,14 +248,15 @@ register COLOR  *scanline;
 register float  *zline;
 int  xres, y, xstep;
 {
+	static int  nc = 0;		/* number of calls */
 	int  b = xstep;
 	double  z;
 	register int  i;
 	
 	z = pixvalue(scanline[0], 0, y);
 	if (zline) zline[0] = z;
-
-	for (i = xstep; i < xres-1+xstep; i += xstep) {
+				/* zig-zag start for quincunx pattern */
+	for (i = nc++ & 1 ? xstep/2 : xstep; i < xres-1+xstep; i += xstep) {
 		if (i >= xres) {
 			xstep += xres-1-i;
 			i = xres-1;
@@ -333,7 +361,7 @@ pixvalue(col, x, y)		/* compute pixel value */
 COLOR  col;			/* returned color */
 int  x, y;			/* pixel position */
 {
-	static RAY  thisray;	/* our ray for this pixel */
+	static RAY  thisray;
 
 	if (viewray(thisray.rorg, thisray.rdir, &ourview,
 			(x+pixjitter())/hresolu, (y+pixjitter())/vresolu) < 0) {
@@ -342,7 +370,9 @@ int  x, y;			/* pixel position */
 	}
 
 	rayorigin(&thisray, NULL, PRIMARY, 1.0);
-	
+
+	samplendx = pixnumber(x,y,hresolu,vresolu);	/* set pixel index */
+
 	rayvalue(&thisray);			/* trace ray */
 
 	copycolor(col, thisray.rcol);		/* return color */
@@ -370,7 +400,7 @@ char  *oldfile;
 				/* discard header */
 	getheader(fp, NULL);
 				/* get picture size */
-	if (fgetresolu(&x, &y, fp) != (YMAJOR|YDECR)) {
+	if (!fscnresolu(&x, &y, fp)) {
 		sprintf(errmsg, "bad recover file \"%s\"", oldfile);
 		error(WARNING, errmsg);
 		fclose(fp);
@@ -400,4 +430,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));
 }