--- ray/src/rt/rv2.c	2004/03/30 16:13:01	2.43
+++ ray/src/rt/rv2.c	2005/06/16 01:55:44	2.52
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rv2.c,v 2.43 2004/03/30 16:13:01 schorsch Exp $";
+static const char	RCSid[] = "$Id: rv2.c,v 2.52 2005/06/16 01:55:44 greg Exp $";
 #endif
 /*
  *  rv2.c - command routines used in tracing a view.
@@ -14,6 +14,7 @@ static const char	RCSid[] = "$Id: rv2.c,v 2.43 2004/03
 
 #include  "platform.h"
 #include  "ray.h"
+#include  "source.h"
 #include  "ambient.h"
 #include  "otypes.h"
 #include  "rpaint.h"
@@ -68,12 +69,11 @@ getview(				/* get/show view parameters */
 	char  buf[128];
 	char  *fname;
 	int  change = 0;
-	VIEW  nv;
+	VIEW  nv = ourview;
 
 	while (isspace(*s))
 		s++;
 	if (*s == '-') {			/* command line parameters */
-		nv = ourview;
 		if (sscanview(&nv, s))
 			newview(&nv);
 		else
@@ -101,8 +101,7 @@ getview(				/* get/show view parameters */
 	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 +109,17 @@ getview(				/* get/show view parameters */
 	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 +127,6 @@ getview(				/* get/show view parameters */
 	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 +134,6 @@ getview(				/* get/show view parameters */
 	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 +141,6 @@ getview(				/* get/show view parameters */
 	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,9 +148,6 @@ getview(				/* get/show view parameters */
 	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);
 }
@@ -286,23 +274,52 @@ 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);
 }
 
 
 extern void
+getfocus(				/* set focus distance */
+	char *s
+)
+{
+	FVECT  vc;
+	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;
+}
+
+
+extern void
 getmove(				/* move camera */
 	char  *s
 )
@@ -321,7 +338,7 @@ getrotate(				/* rotate camera */
 	char  *s
 )
 {
-	VIEW  nv;
+	VIEW  nv = ourview;
 	FVECT  v1;
 	double  angle, elev, zfact;
 	
@@ -330,18 +347,12 @@ getrotate(				/* rotate camera */
 		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;
 	zoomview(&nv, zfact);
 	newview(&nv);
 }
@@ -511,11 +522,15 @@ setparam(				/* get/set program parameter */
 	
 	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 sj 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 */
@@ -708,17 +723,31 @@ char  *s;
 		return;
 	}
 
-	rayorigin(&thisray, NULL, PRIMARY, 1.0);
+	rayorigin(&thisray, PRIMARY, NULL, NULL);
 	
 	rayvalue(&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];
+		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)