--- ray/src/rt/rview.c	1991/05/03 15:22:24	1.12
+++ ray/src/rt/rview.c	1991/07/18 14:42:58	1.19
@@ -10,10 +10,8 @@ static char SCCSid[] = "$SunId$ LBL";
  *     3/24/87
  */
 
-#include  "standard.h"
+#include  "ray.h"
 
-#include  "color.h"
-
 #include  "rpaint.h"
 
 #include  <signal.h>
@@ -23,6 +21,10 @@ static char SCCSid[] = "$SunId$ LBL";
 VIEW  ourview = STDVIEW;		/* viewing parameters */
 int  hresolu, vresolu;			/* image resolution */
 
+int  dimlist[MAXDIM];			/* sampling dimensions */
+int  ndims = 0;				/* number of sampling dimensions */
+int  samplendx = 0;			/* index for this sample */
+
 int  psample = 8;			/* pixel sample size */
 double  maxdiff = .15;			/* max. sample difference */
 
@@ -31,6 +33,9 @@ double  exposure = 1.0;			/* exposure for scene */
 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 = 128;			/* virtual source pretest density */
+int  directinvis = 0;			/* sources invisible? */
 
 int  maxdepth = 4;			/* maximum recursion depth */
 double  minweight = 1e-2;		/* minimum ray weight */
@@ -116,15 +121,15 @@ rview()				/* do a view */
 	char  buf[32];
 
 	devopen(devname);		/* open device */
-	newimage();			/* set up image */
+	newimage();			/* start image (calls fillreserves) */
 
 	for ( ; ; ) {			/* quit in command() */
-		while (hresolu <= 1<<pdepth &&
-				vresolu <= 1<<pdepth)
+		while (hresolu <= 1<<pdepth && vresolu <= 1<<pdepth)
 			command("done: ");
-
-		if (hresolu <= psample<<pdepth &&
-				vresolu <= psample<<pdepth) {
+		while (reserve_mem == NULL)
+			command("out of memory: ");
+		errno = 0;
+		if (hresolu <= psample<<pdepth && vresolu <= psample<<pdepth) {
 			sprintf(buf, "%d sampling...\n", 1<<pdepth);
 			(*dev->comout)(buf);
 			rsample();
@@ -133,33 +138,30 @@ rview()				/* do a view */
 			(*dev->comout)(buf);
 			refine(&ptrunk, 0, 0, hresolu, vresolu, pdepth+1);
 		}
-		if (dev->inpready)
+		if (errno == ENOMEM)		/* ran out of memory */
+			freereserves();
+		else if (dev->inpready)		/* noticed some input */
 			command(": ");
-		else
+		else				/* finished this depth */
 			pdepth++;
 	}
 }
 
 
-memreserve()			/* fill memory reserves */
+fillreserves()			/* fill memory reserves */
 {
 	if (reserve_mem != NULL)
-		return;			/* got some already */
+		return;
 	reserve_mem = malloc(RESERVE_AMT);
 }
 
 
-memerror(detail)		/* try and rescue a memory error */
-char	*detail;
+freereserves()			/* free memory reserves */
 {
-	if (reserve_mem == NULL) {
-		sprintf(errmsg, "out of memory %s", detail);
-		error(SYSTEM, errmsg);
-	}
+	if (reserve_mem == NULL)
+		return;
 	free(reserve_mem);
 	reserve_mem = NULL;
-	for ( ; ; )
-		command("out of memory: ");
 }
 
 
@@ -295,10 +297,10 @@ rsample()			/* sample the image */
 	ysiz = (((pframe.u-pframe.d)<<pdepth)+vresolu-1) / vresolu;
 	rl = (RECT *)malloc(xsiz*sizeof(RECT));
 	if (rl == NULL)
-		memerror("in rsample");
+		return;
 	pl = (PNODE **)malloc(xsiz*sizeof(PNODE *));
 	if (pl == NULL)
-		memerror("in rsample");
+		return;
 	/*
 	 * Initialize the bottom row.
 	 */
@@ -385,7 +387,7 @@ int  pd;
 	if (p->kid == NULL) {			/* subdivide */
 
 		if ((p->kid = newptree()) == NULL)
-			memerror("in refine");
+			return(growth);
 		/*
 		 *  The following paint order can leave a black pixel
 		 *  when redraw() is called in (*dev->paintr)().