--- ray/src/rt/rview.c	1991/06/24 16:10:49	1.17
+++ ray/src/rt/rview.c	1991/12/23 23:18:29	2.4
@@ -34,7 +34,9 @@ double  dstrsrc = 0.0;			/* square source distribution
 double  shadthresh = .1;		/* shadow threshold */
 double  shadcert = .25;			/* shadow certainty */
 int  directrelay = 0;			/* number of source relays */
-int  vspretest = 32;			/* virtual source pretest density */
+int  vspretest = 128;			/* virtual source pretest density */
+int  directinvis = 0;			/* sources invisible? */
+double  srcsizerat = 0.;		/* maximum ratio source size/dist. */
 
 int  maxdepth = 4;			/* maximum recursion depth */
 double  minweight = 1e-2;		/* minimum ray weight */
@@ -61,9 +63,9 @@ int  pdepth;				/* image depth in current frame */
 
 static char  *reserve_mem = NULL;	/* pre-allocated reserve memory */
 
-#define RESERVE_AMT	8192		/* amount of memory to reserve */
+#define RESERVE_AMT	32768		/* amount of memory to reserve */
 
-#define  CTRL(c)	('c'-'@')
+#define  CTRL(c)	((c)-'@')
 
 
 quit(code)			/* quit program */
@@ -168,7 +170,6 @@ command(prompt)			/* get/execute command */
 char  *prompt;
 {
 #define  badcom(s)	strncmp(s, inpbuf, args-inpbuf-1)
-	double  atof();
 	char  inpbuf[256];
 	char  *args;
 again:
@@ -221,7 +222,16 @@ again:
 		break;
 	case 'm':				/* move camera */
 		if (badcom("move"))
+#ifdef  MSTATS
+		{
+			if (badcom("memory"))
+				goto commerr;
+			printmemstats(stderr);
+			break;
+		}
+#else
 			goto commerr;
+#endif
 		getmove(args);
 		break;
 	case 'r':				/* rotate/repaint */
@@ -238,7 +248,7 @@ again:
 			goto commerr;
 		getpivot(args);
 		break;
-	case CTRL(R):				/* redraw */
+	case CTRL('R'):				/* redraw */
 		redraw();
 		break;
 	case 'w':				/* write */
@@ -250,10 +260,10 @@ again:
 		if (badcom("quit"))
 			goto commerr;
 		quit(0);
-	case CTRL(C):				/* interrupt */
+	case CTRL('C'):				/* interrupt */
 		goto again;
 #ifdef  SIGTSTP
-	case CTRL(Z):				/* stop */
+	case CTRL('Z'):				/* stop */
 		devclose();
 		kill(0, SIGTSTP);
 		/* pc stops here */
@@ -315,7 +325,7 @@ rsample()			/* sample the image */
 						/* sample the image */
 	for (y = 0; /* y < ysiz */ ; y++) {
 		for (x = 0; x < xsiz-1; x++) {
-			if (dev->inpready)
+			if (dev->inpready || errno == ENOMEM)
 				goto escape;
 			/*
 			 * Test super-pixel to the right.
@@ -331,7 +341,7 @@ rsample()			/* sample the image */
 		if (y >= ysiz-1)
 			break;
 		for (x = 0; x < xsiz; x++) {
-			if (dev->inpready)
+			if (dev->inpready || errno == ENOMEM)
 				goto escape;
 			/*
 			 * Find super-pixel at this position in next row.
@@ -386,7 +396,7 @@ int  pd;
 	if (p->kid == NULL) {			/* subdivide */
 
 		if ((p->kid = newptree()) == NULL)
-			return(growth);
+			return(0);
 		/*
 		 *  The following paint order can leave a black pixel
 		 *  when redraw() is called in (*dev->paintr)().