--- ray/src/util/vwrays.c	2019/11/07 23:20:29	3.20
+++ ray/src/util/vwrays.c	2022/04/09 17:18:08	3.24
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: vwrays.c,v 3.20 2019/11/07 23:20:29 greg Exp $";
+static const char	RCSid[] = "$Id: vwrays.c,v 3.24 2022/04/09 17:18:08 greg Exp $";
 #endif
 /*
  * Compute rays corresponding to a given picture or view.
@@ -27,6 +27,8 @@ double	pa = 1.;
 
 double  pj = 0.;
 
+double  pd = 0.;
+
 int	zfd = -1;
 
 int	fromstdin = 0;
@@ -77,7 +79,7 @@ main(
 					fprintf(stderr,
 						"%s: no view in file\n",
 							argv[i]);
-					exit(1);
+					return(1);
 				}
 				break;
 			}
@@ -94,7 +96,7 @@ main(
 			if (rs.xr <= 0) {
 				fprintf(stderr, "%s: bad x resolution\n",
 						progname);
-				exit(1);
+				return(1);
 			}
 			break;
 		case 'y':			/* y resolution */
@@ -102,7 +104,7 @@ main(
 			if (rs.yr <= 0) {
 				fprintf(stderr, "%s: bad y resolution\n",
 						progname);
-				exit(1);
+				return(1);
 			}
 			break;
 		case 'c':			/* repeat count */
@@ -113,6 +115,8 @@ main(
 				pa = atof(argv[++i]);
 			else if (argv[i][2] == 'j')
 				pj = atof(argv[++i]);
+			else if (argv[i][2] == 'd')
+				pd = atof(argv[++i]);
 			else
 				goto userr;
 			break;
@@ -131,35 +135,35 @@ main(
 		rval = viewfile(argv[i], &vw, &rs);
 		if (rval <= 0) {
 			fprintf(stderr, "%s: no view in picture\n", argv[i]);
-			exit(1);
+			return(1);
 		}
-		if (i+1 < argc) {
+		if (!getdim & (i+1 < argc)) {
 			zfd = open_float_depth(argv[i+1], (long)rs.xr*rs.yr);
 			if (zfd < 0)
-				exit(1);
+				return(1);
 		}
 	}
 	if ((err = setview(&vw)) != NULL) {
 		fprintf(stderr, "%s: %s\n", progname, err);
-		exit(1);
+		return(1);
 	}
 	if (i == argc)
 		normaspect(viewaspect(&vw), &pa, &rs.xr, &rs.yr);
 	if (getdim) {
-		printf("-x %d -y %d -ld%c\n", rs.xr, rs.yr,
-				vw.vaft > FTINY ? '+' : '-');
-		exit(0);
+		printf("-x %d -y %d%s\n", rs.xr, rs.yr,
+				(vw.vaft > FTINY) ? " -ld+" : "");
+		return(0);
 	}
 	if (fromstdin)
 		pix2rays(stdin);
 	else
 		putrays();
-	exit(0);
+	return(0);
 userr:
 	fprintf(stderr,
 	"Usage: %s [ -i -u -f{a|f|d} -c rept | -d ] { view opts .. | picture [zbuf] }\n",
 			progname);
-	exit(1);
+	return(1);
 }
 
 
@@ -186,7 +190,7 @@ pix2rays(
 	RREAL	loc[2];
 	int	pp[2];
 	double	d;
-	int	i;
+	int	i, c;
 
 	while (fscanf(fp, "%lf %lf", &px, &py) == 2) {
 		px += .5; py += .5;
@@ -209,20 +213,25 @@ pix2rays(
 				exit(1);
 			}
 		}
-		jitterloc(loc);
-		d = viewray(rorg, rdir, &vw, loc[0], loc[1]);
-		if (d < -FTINY)
-			rorg[0] = rorg[1] = rorg[2] =
-			rdir[0] = rdir[1] = rdir[2] = 0.;
-		else if (zfd >= 0)
-			for (i = 0; i < 3; i++) {
-				rorg[i] += rdir[i]*zval;
-				rdir[i] = -rdir[i];
+		for (c = repeatcnt; c-- > 0; ) {
+			jitterloc(loc);
+			d = viewray(rorg, rdir, &vw, loc[0], loc[1]);
+			if (d < -FTINY || !jitteraperture(rorg, rdir, &vw, pd))
+				rorg[0] = rorg[1] = rorg[2] =
+				rdir[0] = rdir[1] = rdir[2] = 0.;
+			else if (zfd >= 0)
+				for (i = 0; i < 3; i++) {
+					rorg[i] += rdir[i]*zval;
+					rdir[i] = -rdir[i];
+				}
+			else if (d > FTINY) {
+				rdir[0] *= d; rdir[1] *= d; rdir[2] *= d;
 			}
-		else if (d > FTINY) {
-			rdir[0] *= d; rdir[1] *= d; rdir[2] *= d;
+			(*putr)(rorg, rdir);
+			if (c) {
+				loc[0] = px/rs.xr; loc[1] = py/rs.yr;
+			}
 		}
-		(*putr)(rorg, rdir);
 		if (unbuffered)
 			fflush(stdout);
 	}
@@ -264,13 +273,13 @@ putrays(void)
 			pix2loc(loc, &rs, si, sc);
 			jitterloc(loc);
 			d = viewray(rorg, rdir, &vw, loc[0], loc[1]);
-			if (d < -FTINY)
+			if (d < -FTINY || !jitteraperture(rorg, rdir, &vw, pd))
 				rorg[0] = rorg[1] = rorg[2] =
 				rdir[0] = rdir[1] = rdir[2] = 0.;
 			else if (zfd >= 0)
 				for (i = 0; i < 3; i++) {
-					rorg[i] += rdir[i]*zbuf[si];
-					rdir[i] = -rdir[i];
+					rdir[i] = -rdir[i]*zbuf[si];
+					rorg[i] -= rdir[i];
 				}
 			else if (d > FTINY) {
 				rdir[0] *= d; rdir[1] *= d; rdir[2] *= d;