--- ray/src/rt/rpict.c	1993/12/12 13:56:08	2.36
+++ ray/src/rt/rpict.c	1996/02/14 15:18:05	2.44
@@ -1,4 +1,4 @@
-/* Copyright (c) 1993 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -20,7 +20,6 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  <sys/resource.h>
 #else
 #include  <sys/times.h>
-#include  <sys/utsname.h>
 #include  <unistd.h>
 #endif
 #endif
@@ -64,13 +63,21 @@ int  vspretest = 512;			/* virtual source pretest dens
 int  directvis = 1;			/* sources visible? */
 double	srcsizerat = .25;		/* maximum ratio source size/dist. */
 
+COLOR  cextinction = BLKCOLOR;		/* global extinction coefficient */
+double  salbedo = 0.;			/* global scattering albedo */
+double  seccg = 0.;			/* global scattering eccentricity */
+double  ssampdist = 0.;			/* scatter sampling distance */
+
 double	specthresh = .15;		/* specular sampling threshold */
 double	specjitter = 1.;		/* specular sampling jitter */
 
+int  backvis = 1;			/* back face visibility */
+
 int  maxdepth = 6;			/* maximum recursion depth */
 double	minweight = 5e-3;		/* minimum ray weight */
 
 COLOR  ambval = BLKCOLOR;		/* ambient value */
+int  ambvwt = 0;			/* initial weight for ambient value */
 double	ambacc = 0.2;			/* ambient accuracy */
 int  ambres = 32;			/* ambient resolution */
 int  ambdiv = 128;			/* ambient divisions */
@@ -133,15 +140,13 @@ int  code;
 #ifndef NIX
 report()		/* report progress */
 {
+	extern char  *myhostname();
 	double  u, s;
 #ifdef BSD
-	char  hostname[257];
 	struct rusage  rubuf;
 #else
 	struct tms  tbuf;
-	struct utsname  nambuf;
 	double  period;
-#define hostname  nambuf.nodename
 #endif
 
 	tlastrept = time((time_t *)NULL);
@@ -152,7 +157,6 @@ report()		/* report progress */
 	getrusage(RUSAGE_CHILDREN, &rubuf);
 	u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6;
 	s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6;
-	gethostname(hostname, sizeof(hostname));
 #else
 	times(&tbuf);
 #ifdef _SC_CLK_TCK
@@ -162,17 +166,15 @@ report()		/* report progress */
 #endif
 	u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period;
 	s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period;
-	uname(&nambuf);
 #endif
 
 	sprintf(errmsg,
 		"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n",
 			nrays, pctdone, u/3600., s/3600.,
-			(tlastrept-tstart)/3600., hostname);
+			(tlastrept-tstart)/3600., myhostname());
 	eputs(errmsg);
 #ifndef BSD
 	signal(SIGCONT, report);
-#undef hostname
 #endif
 }
 #else
@@ -391,6 +393,8 @@ char  *zfile, *oldfile;
 	fprtresolu(hres, vres, stdout);
 					/* recover file and compute first */
 	i = salvage(oldfile);
+	if (i >= vres)
+		goto alldone;
 	if (zfd != -1 && i > 0 &&
 			lseek(zfd, (long)i*hres*sizeof(float), 0) == -1)
 		error(SYSTEM, "z-file seek error in render");
@@ -446,18 +450,19 @@ char  *zfile, *oldfile;
 	}
 						/* clean up */
 	signal(SIGCONT, SIG_IGN);
-	if (zfd != -1) {
-		if (write(zfd, (char *)zbar[0], hres*sizeof(float))
+	if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float))
 				< hres*sizeof(float))
-			goto writerr;
+		goto writerr;
+	fwritescan(scanbar[0], hres, stdout);
+	if (fflush(stdout) == EOF)
+		goto writerr;
+alldone:
+	if (zfd != -1) {
 		if (close(zfd) == -1)
 			goto writerr;
 		for (i = 0; i <= psample; i++)
 			free((char *)zbar[i]);
 	}
-	fwritescan(scanbar[0], hres, stdout);
-	if (fflush(stdout) == EOF)
-		goto writerr;
 	for (i = 0; i <= psample; i++)
 		free((char *)scanbar[i]);
 	if (sampdens != NULL)
@@ -500,7 +505,7 @@ int  xres, y, xstep;
 			b = fillsample(scanline, zline, 0, y, i, 0, b/2);
 		else
 			b = fillsample(scanline+i-xstep,
-					zline ? zline+i-xstep : NULL,
+					zline ? zline+i-xstep : (float *)NULL,
 					i-xstep, y, xstep, 0, b/2);
 		if (sd) *sd++ = nc & 1 ? bl : b;
 		bl = b;
@@ -528,7 +533,7 @@ int  xres, y, ysize;
 			zline[ysize] = zbar[ysize][i];
 		}
 		
-		b = fillsample(vline, zbar[0] ? zline : NULL,
+		b = fillsample(vline, zbar[0] ? zline : (float *)NULL,
 				i, y, 0, ysize, b/2);
 		
 		for (j = 1; j < ysize; j++)
@@ -586,7 +591,8 @@ int  b;
 							/* recurse */
 	ncut += fillsample(colline, zline, x, y, xlen>>1, ylen>>1, (b-1)/2);
 	
-	ncut += fillsample(colline+(len>>1), zline ? zline+(len>>1) : NULL,
+	ncut += fillsample(colline+(len>>1),
+			zline ? zline+(len>>1) : (float *)NULL,
 			x+(xlen>>1), y+(ylen>>1),
 			xlen-(xlen>>1), ylen-(ylen>>1), b/2);
 
@@ -601,8 +607,8 @@ int  x, y;			/* pixel position */
 {
 	static RAY  thisray;
 
-	if (viewray(thisray.rorg, thisray.rdir, &ourview,
-			(x+pixjitter())/hres, (y+pixjitter())/vres) < 0) {
+	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview,
+			(x+pixjitter())/hres, (y+pixjitter())/vres)) < -FTINY) {
 		setcolor(col, 0.0, 0.0, 0.0);
 		return(0.0);
 	}
@@ -628,12 +634,12 @@ char  *oldfile;
 	int  x, y;
 
 	if (oldfile == NULL)
-		return(0);
-	
+		goto gotzip;
+
 	if ((fp = fopen(oldfile, "r")) == NULL) {
 		sprintf(errmsg, "cannot open recover file \"%s\"", oldfile);
 		error(WARNING, errmsg);
-		return(0);
+		goto gotzip;
 	}
 #ifdef MSDOS
 	setmode(fileno(fp), O_BINARY);
@@ -646,7 +652,7 @@ char  *oldfile;
 				oldfile);
 		error(WARNING, errmsg);
 		fclose(fp);
-		return(0);
+		goto gotzip;
 	}
 
 	if (x != hres || y != vres) {
@@ -670,6 +676,10 @@ char  *oldfile;
 	fclose(fp);
 	unlink(oldfile);
 	return(y);
+gotzip:
+	if (fflush(stdout) == EOF)
+		error(SYSTEM, "error writing picture header");
+	return(0);
 writerr:
 	sprintf(errmsg, "write error during recovery of \"%s\"", oldfile);
 	error(SYSTEM, errmsg);