--- ray/src/rt/rv2.c	1996/02/14 15:25:34	2.34
+++ ray/src/rt/rv2.c	2013/10/18 17:04:13	2.64
@@ -1,27 +1,29 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: rv2.c,v 2.64 2013/10/18 17:04:13 greg Exp $";
 #endif
-
 /*
  *  rv2.c - command routines used in tracing a view.
  *
- *     3/24/87
+ *  External symbols declared in rpaint.h
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
-#include  "octree.h"
+#include  <ctype.h>
+#include  <string.h>
 
+#include  "platform.h"
+#include  "rtprocess.h"	/* win_popen() */
+#include  "paths.h"
+#include  "ray.h"
+#include  "source.h"
+#include  "ambient.h"
 #include  "otypes.h"
-
 #include  "rpaint.h"
 
-#include  "resolu.h"
+extern int  psample;			/* pixel sample size */
+extern double  maxdiff;			/* max. sample difference */
 
-#include  <ctype.h>
-
 #define  CTRL(c)	((c)-'@')
 
 #ifdef  SMLFLT
@@ -30,19 +32,16 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  sscanvec(s,v)	(sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
 #endif
 
-extern char  *atos();
-
-extern FILE  *popen();
-
 extern char  rifname[128];		/* rad input file name */
 
-extern char  VersionID[];
 extern char  *progname;
 extern char  *octname;
 
 
-getframe(s)				/* get a new frame */
-char  *s;
+void
+getframe(				/* get a new frame */
+	char  *s
+)
 {
 	if (getrect(s, &pframe) < 0)
 		return;
@@ -50,37 +49,40 @@ char  *s;
 }
 
 
-getrepaint(s)				/* get area and repaint */
-char  *s;
+void
+getrepaint(				/* get area and repaint */
+	char  *s
+)
 {
 	RECT  box;
 
 	if (getrect(s, &box) < 0)
 		return;
-	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
+	paintrect(&ptrunk, &box);
 }
 
 
-getview(s)				/* get/show view parameters */
-char  *s;
+void
+getview(				/* get/show/save view parameters */
+	char  *s
+)
 {
 	FILE  *fp;
 	char  buf[128];
 	char  *fname;
 	int  change = 0;
-	VIEW  nv;
+	VIEW  nv = ourview;
 
 	while (isspace(*s))
 		s++;
 	if (*s == '-') {			/* command line parameters */
-		copystruct(&nv, &ourview);
 		if (sscanview(&nv, s))
 			newview(&nv);
 		else
 			error(COMMAND, "bad view option(s)");
 		return;
 	}
-	if (sscanf(s, "%s", buf) == 1) {	/* write parameters to a file */
+	if (nextword(buf, sizeof(buf), s) != NULL) {	/* write to a file */
 		if ((fname = getpath(buf, NULL, 0)) == NULL ||
 				(fp = fopen(fname, "a")) == NULL) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
@@ -101,8 +103,7 @@ char  *s;
 	if (buf[0] && buf[0] != ourview.type) {
 		nv.type = buf[0];
 		change++;
-	} else
-		nv.type = ourview.type;
+	}
 	sprintf(buf, "view point (%.6g %.6g %.6g): ",
 			ourview.vp[0], ourview.vp[1], ourview.vp[2]);
 	(*dev->comout)(buf);
@@ -110,17 +111,17 @@ char  *s;
 	if (buf[0] == CTRL('C')) return;
 	if (sscanvec(buf, nv.vp))
 		change++;
-	else
-		VCOPY(nv.vp, ourview.vp);
 	sprintf(buf, "view direction (%.6g %.6g %.6g): ",
-			ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
+			ourview.vdir[0]*ourview.vdist,
+			ourview.vdir[1]*ourview.vdist,
+			ourview.vdir[2]*ourview.vdist);
 	(*dev->comout)(buf);
 	(*dev->comin)(buf, NULL);
 	if (buf[0] == CTRL('C')) return;
-	if (sscanvec(buf, nv.vdir))
+	if (sscanvec(buf, nv.vdir)) {
+		nv.vdist = 1.;
 		change++;
-	else
-		VCOPY(nv.vdir, ourview.vdir);
+	}
 	sprintf(buf, "view up (%.6g %.6g %.6g): ",
 			ourview.vup[0], ourview.vup[1], ourview.vup[2]);
 	(*dev->comout)(buf);
@@ -128,8 +129,6 @@ char  *s;
 	if (buf[0] == CTRL('C')) return;
 	if (sscanvec(buf, nv.vup))
 		change++;
-	else
-		VCOPY(nv.vup, ourview.vup);
 	sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
 			ourview.horiz, ourview.vert);
 	(*dev->comout)(buf);
@@ -137,9 +136,6 @@ char  *s;
 	if (buf[0] == CTRL('C')) return;
 	if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
 		change++;
-	else {
-		nv.horiz = ourview.horiz; nv.vert = ourview.vert;
-	}
 	sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ",
 			ourview.vfore, ourview.vaft);
 	(*dev->comout)(buf);
@@ -147,9 +143,6 @@ char  *s;
 	if (buf[0] == CTRL('C')) return;
 	if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2)
 		change++;
-	else {
-		nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
-	}
 	sprintf(buf, "view shift and lift (%.6g %.6g): ",
 			ourview.hoff, ourview.voff);
 	(*dev->comout)(buf);
@@ -157,24 +150,23 @@ char  *s;
 	if (buf[0] == CTRL('C')) return;
 	if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
 		change++;
-	else {
-		nv.hoff = ourview.hoff; nv.voff = ourview.voff;
-	}
 	if (change)
 		newview(&nv);
 }
 
 
-lastview(s)				/* return to a previous view */
-char  *s;
+void
+lastview(				/* return to a previous view */
+	char  *s
+)
 {
 	char  buf[128];
 	char  *fname;
 	int  success;
 	VIEW  nv;
-
-	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
-		copystruct(&nv, &stdview);
+					/* get parameters from a file */
+	if (nextword(buf, sizeof(buf), s) != NULL) {
+		nv = stdview;
 		if ((fname = getpath(buf, "", R_OK)) == NULL ||
 				(success = viewfile(fname, &nv, NULL)) == -1) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
@@ -191,15 +183,17 @@ char  *s;
 		error(COMMAND, "no previous view");
 		return;
 	}
-	copystruct(&nv, &ourview);
-	copystruct(&ourview, &oldview);
-	copystruct(&oldview, &nv);
-	newimage();
+	nv = ourview;
+	ourview = oldview;
+	oldview = nv;
+	newimage(NULL);
 }
 
 
-saveview(s)				/* save view to rad file */
-char  *s;
+void
+saveview(				/* save view to rad file */
+	char  *s
+)
 {
 	char  view[64];
 	char  *fname;
@@ -212,11 +206,7 @@ char  *s;
 		}
 		s = sskip(s);
 	}
-	while (isspace(*s))
-		s++;
-	if (*s)
-		atos(rifname, sizeof(rifname), s);
-	else if (rifname[0] == '\0') {
+	if (nextword(rifname, sizeof(rifname), s) == NULL && !rifname[0]) {
 		error(COMMAND, "no previous rad file");
 		return;
 	}
@@ -234,8 +224,10 @@ char  *s;
 }
 
 
-loadview(s)				/* load view from rad file */
-char  *s;
+void
+loadview(				/* load view from rad file */
+	char  *s
+)
 {
 	char  buf[512];
 	char  *fname;
@@ -247,9 +239,7 @@ char  *s;
 		s = sskip(s);
 	else
 		strcat(buf, "1");
-	if (*s)
-		atos(rifname, sizeof(rifname), s);
-	else if (rifname[0] == '\0') {
+	if (nextword(rifname, sizeof(rifname), s) == NULL && !rifname[0]) {
 		error(COMMAND, "no previous rad file");
 		return;
 	}
@@ -266,7 +256,7 @@ char  *s;
 	buf[0] = '\0';
 	fgets(buf, sizeof(buf), fp);
 	pclose(fp);
-	copystruct(&nv, &stdview);
+	nv = stdview;
 	if (!sscanview(&nv, buf)) {
 		error(COMMAND, "rad error -- no such view?");
 		return;
@@ -275,28 +265,63 @@ char  *s;
 }
 
 
-getaim(s)				/* aim camera */
-char  *s;
+void
+getaim(				/* aim camera */
+	char  *s
+)
 {
+	VIEW  nv = ourview;
 	double  zfact;
-	VIEW  nv;
 
 	if (getinterest(s, 1, nv.vdir, &zfact) < 0)
 		return;
-	nv.type = ourview.type;
-	VCOPY(nv.vp, ourview.vp);
-	VCOPY(nv.vup, ourview.vup);
-	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
-	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
-	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
 	zoomview(&nv, zfact);
 	newview(&nv);
 }
 
 
-getmove(s)				/* move camera */
-char  *s;
+void
+getfocus(				/* set focus distance */
+	char *s
+)
 {
+	char  buf[64];
+	double	dist;
+
+	if (sscanf(s, "%lf", &dist) < 1) {
+		int	x, y;
+		RAY	thisray;
+		if (dev->getcur == NULL)
+			return;
+		(*dev->comout)("Pick focus point\n");
+		if ((*dev->getcur)(&x, &y) == ABORT)
+			return;
+		if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
+			&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
+			error(COMMAND, "not on image");
+			return;
+		}
+		rayorigin(&thisray, PRIMARY, NULL, NULL);
+		if (!localhit(&thisray, &thescene)) {
+			error(COMMAND, "not a local object");
+			return;
+		}
+		dist = thisray.rot;
+	} else if (dist <= .0) {
+		error(COMMAND, "focus distance must be positive");
+		return;
+	}
+	ourview.vdist = dist;
+	sprintf(buf, "Focus distance set to %f\n", dist);
+	(*dev->comout)(buf);
+}
+
+
+void
+getmove(				/* move camera */
+	char  *s
+)
+{
 	FVECT  vc;
 	double  mag;
 
@@ -306,11 +331,12 @@ char  *s;
 }
 
 
-getrotate(s)				/* rotate camera */
-char  *s;
+void
+getrotate(				/* rotate camera */
+	char  *s
+)
 {
-	VIEW  nv;
-	FVECT  v1;
+	VIEW  nv = ourview;
 	double  angle, elev, zfact;
 	
 	elev = 0.0; zfact = 1.0;
@@ -318,25 +344,19 @@ char  *s;
 		error(COMMAND, "missing angle");
 		return;
 	}
-	nv.type = ourview.type;
-	VCOPY(nv.vp, ourview.vp);
-	VCOPY(nv.vup, ourview.vup);
-	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
-	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
 	spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
-	if (elev != 0.0) {
-		fcross(v1, nv.vdir, ourview.vup);
-		normalize(v1);
-		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
-	}
-	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
+	if (elev != 0.0)
+		geodesic(nv.vdir, nv.vdir, nv.vup, elev*(PI/180.), GEOD_RAD);
+	
 	zoomview(&nv, zfact);
 	newview(&nv);
 }
 
 
-getpivot(s)				/* pivot viewpoint */
-register char  *s;
+void
+getpivot(				/* pivot viewpoint */
+	char  *s
+)
 {
 	FVECT  vc;
 	double  angle, elev, mag;
@@ -352,14 +372,61 @@ register char  *s;
 }
 
 
-getexposure(s)				/* get new exposure */
-char  *s;
+void
+getorigin(				/* origin viewpoint */
+	char  *s
+)
 {
+	VIEW	nv = ourview;
+	double	d;
+					/* get new view origin */
+	if (!sscanvec(s, nv.vp)) {
+		int	x, y;
+		RAY	thisray;
+		if (dev->getcur == NULL)
+			return;
+		(*dev->comout)("Pick point on surface for new origin\n");
+		if ((*dev->getcur)(&x, &y) == ABORT)
+			return;
+		if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
+			&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
+			error(COMMAND, "not on image");
+			return;
+		}
+		rayorigin(&thisray, PRIMARY, NULL, NULL);
+		if (!localhit(&thisray, &thescene)) {
+			error(COMMAND, "not a local object");
+			return;
+		}
+		if (thisray.rod < 0.0)	/* don't look through other side */
+			flipsurface(&thisray);
+		VSUM(nv.vp, thisray.rop, thisray.ron, 2.0*FTINY);
+		VCOPY(nv.vdir, thisray.ron);
+	} else if (!sscanvec(sskip2(s,3), nv.vdir) || normalize(nv.vdir) == 0.0)
+		VCOPY(nv.vdir, ourview.vdir);
+
+	d = DOT(nv.vdir, nv.vup);	/* need different up vector? */
+	if (d*d >= 1.-2.*FTINY) {
+		int	i;
+		nv.vup[0] = nv.vup[1] = nv.vup[2] = 0.0;
+		for (i = 3; i--; )
+			if (nv.vdir[i]*nv.vdir[i] < 0.34)
+				break;
+		nv.vup[i] = 1.;
+	}
+	newview(&nv);
+}
+
+
+void
+getexposure(				/* get new exposure */
+	char  *s
+)
+{
 	char  buf[128];
-	register char  *cp;
-	RECT  r;
+	char  *cp;
 	int  x, y;
-	register PNODE  *p = &ptrunk;
+	PNODE  *p = &ptrunk;
 	int  adapt = 0;
 	double  e = 1.0;
 
@@ -376,9 +443,7 @@ char  *s;
 		(*dev->comout)("Pick point for exposure\n");
 		if ((*dev->getcur)(&x, &y) == ABORT)
 			return;
-		r.l = r.d = 0;
-		r.r = hresolu; r.u = vresolu;
-		p = findrect(x, y, &ptrunk, &r, -1);
+		p = findrect(x, y, &ptrunk, -1);
 	} else {
 		if (*cp == '=') {	/* absolute setting */
 			p = NULL;
@@ -401,6 +466,7 @@ char  *s;
 			e *= atof(cp);
 	}
 	if (p != NULL) {		/* relative setting */
+		compavg(p);
 		if (bright(p->v) < 1e-15) {
 			error(COMMAND, "cannot normalize to zero");
 			return;
@@ -417,13 +483,18 @@ char  *s;
 	redraw();
 }
 
+typedef union {int i; double d; COLOR C;}	*MyUptr;
+#define  FEQ(x,y)     (fabs((x)-(y)) <= FTINY)
 
-getparam(str, dsc, typ, ptr)		/* get variable from user */
-char  *str, *dsc;
-int  typ;
-register union {int i; double d; COLOR C;}  *ptr;
+int
+getparam(		/* get variable from user */
+	char  *str,
+	char  *dsc,
+	int  typ,
+	void  *p
+)
 {
-	extern char  *index();
+	MyUptr  ptr = (MyUptr)p;
 	int  i0;
 	double  d0, d1, d2;
 	char  buf[48];
@@ -438,8 +509,10 @@ register union {int i; double d; COLOR C;}  *ptr;
 			if (sscanf(buf, "%d", &i0) != 1)
 				return(0);
 		}
+		if (ptr->i == i0)
+			return(0);
 		ptr->i = i0;
-		return(1);
+		break;
 	case 'r':			/* real */
 		if (sscanf(str, "%lf", &d0) != 1) {
 			(*dev->comout)(dsc);
@@ -449,20 +522,26 @@ register union {int i; double d; COLOR C;}  *ptr;
 			if (sscanf(buf, "%lf", &d0) != 1)
 				return(0);
 		}
+		if (FEQ(ptr->d, d0))
+			return(0);
 		ptr->d = d0;
-		return(1);
+		break;
 	case 'b':			/* boolean */
 		if (sscanf(str, "%1s", buf) != 1) {
 			(*dev->comout)(dsc);
 			sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
 			(*dev->comout)(buf);
 			(*dev->comin)(buf, NULL);
-			if (buf[0] == '\0' ||
-					index("yY+1tTnN-0fF", buf[0]) == NULL)
+			if (buf[0] == '\0')
 				return(0);
 		}
-		ptr->i = index("yY+1tT", buf[0]) != NULL;
-		return(1);
+		if (strchr("yY+1tTnN-0fF", buf[0]) == NULL)
+			return(0);
+		i0 = strchr("yY+1tT", buf[0]) != NULL;
+		if (ptr->i == i0)
+			return(0);
+		ptr->i = i0;
+		break;
 	case 'C':			/* color */
 		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
 			(*dev->comout)(dsc);
@@ -475,55 +554,48 @@ register union {int i; double d; COLOR C;}  *ptr;
 			if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
 				return(0);
 		}
+		if (FEQ(colval(ptr->C,RED), d0) &&
+				FEQ(colval(ptr->C,GRN), d1) &&
+				FEQ(colval(ptr->C,BLU), d2))
+			return(0);
 		setcolor(ptr->C, d0, d1, d2);
-		return(1);
+		break;
+	default:
+		return(0);		/* shouldn't happen */
 	}
+	newparam++;
+	return(1);
 }
 
 
-setparam(s)				/* get/set program parameter */
-register char  *s;
+void
+setparam(				/* get/set program parameter */
+	char  *s
+)
 {
-	extern int  psample;
-	extern double  maxdiff;
-	extern double  minweight;
-	extern int  maxdepth;
-	extern double  dstrsrc;
-	extern double  shadthresh;
-	extern double  shadcert;
-	extern COLOR  ambval;
-	extern int  ambvwt;
-	extern double  ambacc;
-	extern int  ambres;
-	extern int  ambdiv;
-	extern int  ambssamp;
-	extern int  ambounce;
-	extern COLOR  cextinction;
-	extern double  salbedo;
-	extern double  seccg;
-	extern double  ssampdist;
-	extern int  directvis;
-	extern double  srcsizerat;
-	extern int  do_irrad;
-	extern double  specjitter;
-	extern double  specthresh;
-	extern int  backvis;
+	int  prev_newp = newparam;
 	char  buf[128];
 	
 	if (s[0] == '\0') {
 		(*dev->comout)(
-		"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: ");
+		"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt ss st u: ");
 		(*dev->comin)(buf, NULL);
 		s = buf;
 	}
 	switch (s[0]) {
+	case 'u':			/* uncorrelated sampling */
+		getparam(s+1, "uncorrelated sampling", 'b',
+				(void *)&rand_samp);
+		break;
 	case 'l':			/* limit */
 		switch (s[1]) {
 		case 'w':			/* weight */
-			getparam(s+2, "limit weight", 'r', &minweight);
+			getparam(s+2, "limit weight", 'r',
+					(void *)&minweight);
 			break;
 		case 'r':			/* reflection */
-			getparam(s+2, "limit reflection", 'i', &maxdepth);
+			getparam(s+2, "limit reflection", 'i',
+					(void *)&maxdepth);
 			break;
 		default:
 			goto badparam;
@@ -532,20 +604,24 @@ register char  *s;
 	case 'd':			/* direct */
 		switch (s[1]) {
 		case 'j':			/* jitter */
-			getparam(s+2, "direct jitter", 'r', &dstrsrc);
+			getparam(s+2, "direct jitter", 'r',
+					(void *)&dstrsrc);
 			break;
 		case 'c':			/* certainty */
-			getparam(s+2, "direct certainty", 'r', &shadcert);
+			getparam(s+2, "direct certainty", 'r',
+					(void *)&shadcert);
 			break;
 		case 't':			/* threshold */
-			getparam(s+2, "direct threshold", 'r', &shadthresh);
+			getparam(s+2, "direct threshold", 'r',
+					(void *)&shadthresh);
 			break;
 		case 'v':			/* visibility */
-			getparam(s+2, "direct visibility",
-					'b', &directvis);
+			getparam(s+2, "direct visibility", 'b',
+					(void *)&directvis);
 			break;
 		case 's':			/* sampling */
-			getparam(s+2, "direct sampling", 'r', &srcsizerat);
+			getparam(s+2, "direct sampling", 'r',
+					(void *)&srcsizerat);
 			break;
 		default:
 			goto badparam;
@@ -554,44 +630,55 @@ register char  *s;
 	case 'b':			/* back faces or black and white */
 		switch (s[1]) {
 		case 'v':			/* back face visibility */
-			getparam(s+2, "back face visibility", 'b', &backvis);
+			getparam(s+2, "back face visibility", 'b',
+					(void *)&backvis);
 			break;
 		case '\0':			/* black and white */
 		case ' ':
 		case 'y': case 'Y': case 't': case 'T': case '1': case '+':
 		case 'n': case 'N': case 'f': case 'F': case '0': case '-':
-			getparam(s+1, "black and white", 'b', &greyscale);
+			getparam(s+1, "black and white", 'b',
+					(void *)&greyscale);
+			newparam = prev_newp;
 			break;
 		default:
 			goto badparam;
 		}
 		break;
 	case 'i':			/* irradiance */
-		getparam(s+1, "irradiance", 'b', &do_irrad);
+		getparam(s+1, "irradiance", 'b',
+				(void *)&do_irrad);
 		break;
 	case 'a':			/* ambient */
 		switch (s[1]) {
 		case 'v':			/* value */
-			getparam(s+2, "ambient value", 'C', (COLOR *)ambval);
+			getparam(s+2, "ambient value", 'C',
+					(void *)ambval);
 			break;
 		case 'w':			/* weight */
-			getparam(s+2, "ambient value weight", 'i', &ambvwt);
+			getparam(s+2, "ambient value weight", 'i',
+					(void *)&ambvwt);
 			break;
 		case 'a':			/* accuracy */
-			if (getparam(s+2, "ambient accuracy", 'r', &ambacc))
+			if (getparam(s+2, "ambient accuracy", 'r',
+					(void *)&ambacc))
 				setambacc(ambacc);
 			break;
 		case 'd':			/* divisions */
-			getparam(s+2, "ambient divisions", 'i', &ambdiv);
+			getparam(s+2, "ambient divisions", 'i',
+					(void *)&ambdiv);
 			break;
 		case 's':			/* samples */
-			getparam(s+2, "ambient super-samples", 'i', &ambssamp);
+			getparam(s+2, "ambient super-samples", 'i',
+					(void *)&ambssamp);
 			break;
 		case 'b':			/* bounces */
-			getparam(s+2, "ambient bounces", 'i', &ambounce);
+			getparam(s+2, "ambient bounces", 'i',
+					(void *)&ambounce);
 			break;
 		case 'r':
-			if (getparam(s+2, "ambient resolution", 'i', &ambres))
+			if (getparam(s+2, "ambient resolution", 'i',
+					(void *)&ambres))
 				setambres(ambres);
 			break;
 		default:
@@ -602,17 +689,19 @@ register char  *s;
 		switch (s[1]) {
 		case 'e':			/* extinction coefficient */
 			getparam(s+2, "extinction coefficient", 'C',
-					(COLOR *)cextinction);
+					(void *)cextinction);
 			break;
 		case 'a':			/* scattering albedo */
-			getparam(s+2, "scattering albedo", 'r', &salbedo);
+			getparam(s+2, "scattering albedo", 'C',
+					(void *)salbedo);
 			break;
 		case 'g':			/* scattering eccentricity */
-			getparam(s+2, "scattering eccentricity", 'r', &seccg);
+			getparam(s+2, "scattering eccentricity", 'r',
+					(void *)&seccg);
 			break;
 		case 's':			/* sampling distance */
 			getparam(s+2, "mist sampling distance", 'r',
-					&ssampdist);
+					(void *)&ssampdist);
 			break;
 		default:
 			goto badparam;
@@ -621,24 +710,29 @@ register char  *s;
 	case 'p':			/* pixel */
 		switch (s[1]) {
 		case 's':			/* sample */
-			if (getparam(s+2, "pixel sample", 'i', &psample))
+			if (getparam(s+2, "pixel sample", 'i',
+					(void *)&psample))
 				pdepth = 0;
 			break;
 		case 't':			/* threshold */
-			if (getparam(s+2, "pixel threshold", 'r', &maxdiff))
+			if (getparam(s+2, "pixel threshold", 'r',
+					(void *)&maxdiff))
 				pdepth = 0;
 			break;
 		default:
 			goto badparam;
 		}
+		newparam = prev_newp;
 		break;
 	case 's':			/* specular */
 		switch (s[1]) {
-		case 'j':			/* jitter */
-			getparam(s+2, "specular jitter", 'r', &specjitter);
+		case 's':			/* sampling */
+			getparam(s+2, "specular sampling", 'r',
+					(void *)&specjitter);
 			break;
 		case 't':			/* threshold */
-			getparam(s+2, "specular threshold", 'r', &specthresh);
+			getparam(s+2, "specular threshold", 'r',
+					(void *)&specthresh);
 			break;
 		default:
 			goto badparam;
@@ -656,17 +750,19 @@ badparam:
 }
 
 
-traceray(s)				/* trace a single ray */
-char  *s;
+void
+traceray(				/* trace a single ray */
+	char  *s
+)
 {
-	char  buf[128];
-	int  x, y;
-	RAY  thisray;
+	RAY	thisray;
+	char	buf[512];
 
 	thisray.rmax = 0.0;
 
 	if (!sscanvec(s, thisray.rorg) ||
 			!sscanvec(sskip2(s,3), thisray.rdir)) {
+		int  x, y;
 
 		if (dev->getcur == NULL)
 			return;
@@ -685,19 +781,36 @@ char  *s;
 		return;
 	}
 
-	rayorigin(&thisray, NULL, PRIMARY, 1.0);
-	
-	rayvalue(&thisray);
+	ray_trace(&thisray);
 
 	if (thisray.ro == NULL)
 		(*dev->comout)("ray hit nothing");
 	else {
-		sprintf(buf, "ray hit %s%s %s \"%s\"",
-				thisray.rod < 0.0 ? "back of " : "",
-				thisray.ro->omod == OVOID ? VOIDID :
-					objptr(thisray.ro->omod)->oname,
+		OBJREC	*mat = NULL;
+		OBJREC	*mod = NULL;
+		char	matspec[256];
+		OBJREC	*ino;
+
+		matspec[0] = '\0';
+		if (thisray.ro->omod != OVOID) {
+			mod = objptr(thisray.ro->omod);
+			mat = findmaterial(mod);
+		}
+		if (thisray.rod < 0.0)
+			strcpy(matspec, "back of ");
+		if (mod != NULL) {
+			strcat(matspec, mod->oname);
+			if (mat != mod && mat != NULL)
+				sprintf(matspec+strlen(matspec),
+					" (%s)", mat->oname);
+		} else
+			strcat(matspec, VOIDID);
+		sprintf(buf, "ray hit %s %s \"%s\"", matspec,
 				ofun[thisray.ro->otype].funame,
 				thisray.ro->oname);
+		if ((ino = objptr(thisray.robj)) != thisray.ro)
+			sprintf(buf+strlen(buf), " in %s \"%s\"",
+					ofun[ino->otype].funame, ino->oname);
 		(*dev->comout)(buf);
 		(*dev->comin)(buf, NULL);
 		if (thisray.rot >= FHUGE)
@@ -709,7 +822,7 @@ char  *s;
 			(*dev->comout)(buf);
 		}
 		(*dev->comin)(buf, NULL);
-		sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)",
+		sprintf(buf, "value (%.5g %.5g %.5g) (%.3gL)",
 				colval(thisray.rcol,RED),
 				colval(thisray.rcol,GRN),
 				colval(thisray.rcol,BLU),
@@ -720,20 +833,18 @@ char  *s;
 }
 
 
-writepict(s)				/* write the picture to a file */
-char  *s;
+void
+writepict(				/* write the picture to a file */
+	char  *s
+)
 {
 	static char  buf[128];
 	char  *fname;
 	FILE  *fp;
 	COLR  *scanline;
 	int  y;
-
-	while (isspace(*s))
-		s++;
-	if (*s)
-		atos(buf, sizeof(buf), s);
-	else if (buf[0] == '\0') {
+				/* XXX relies on words.c 2.11 behavior */
+	if (nextword(buf, sizeof(buf), s) == NULL && !buf[0]) {
 		error(COMMAND, "no file");
 		return;
 	}
@@ -743,9 +854,7 @@ char  *s;
 		error(COMMAND, errmsg);
 		return;
 	}
-#ifdef MSDOS
-	setmode(fileno(fp), O_BINARY);
-#endif
+	SET_FILE_BINARY(fp);
 	(*dev->comout)("writing \"");
 	(*dev->comout)(fname);
 	(*dev->comout)("\"...\n");
@@ -758,6 +867,7 @@ char  *s;
 	else
 		putc('\n', fp);
 	fprintf(fp, "SOFTWARE= %s\n", VersionID);
+	fputnow(fp);
 	if (exposure != 1.0)
 		fputexpos(exposure, fp);
 	if (dev->pixaspect != 1.0)
@@ -778,7 +888,7 @@ char  *s;
 		if (fwritecolrs(scanline, hresolu, fp) < 0)
 			break;
 	}
-	free((char *)scanline);
+	free((void *)scanline);
 	if (fclose(fp) < 0)
 		error(COMMAND, "write error");
 }