--- ray/src/common/image.c	1998/10/27 08:44:29	2.14
+++ ray/src/common/image.c	2006/11/19 01:14:31	2.33
@@ -1,28 +1,30 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: image.c,v 2.33 2006/11/19 01:14:31 greg Exp $";
 #endif
-
 /*
  *  image.c - routines for image generation.
+ *
+ *  External symbols declared in view.h
  */
 
-#include  "standard.h"
+#include "copyright.h"
 
+#include  <ctype.h>
+#include  "rtio.h"
+#include  "rtmath.h"
+#include  "paths.h"
 #include  "view.h"
 
-#include  "resolu.h"
 
-#include  "paths.h"
-
 #define  FEQ(x,y)	(fabs((x)-(y)) <= FTINY)
 #define  VEQ(v,w)	(FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
 				&& FEQ((v)[2],(w)[2]))
 
 VIEW  stdview = STDVIEW;		/* default view parameters */
 
+static gethfunc gethview;
 
+
 char *
 setview(v)		/* set hvec and vvec, return message on error */
 register VIEW  *v;
@@ -30,11 +32,13 @@ register VIEW  *v;
 	static char  ill_horiz[] = "illegal horizontal view size";
 	static char  ill_vert[] = "illegal vertical view size";
 	
-	if (v->vfore < -FTINY || v->vaft < -FTINY ||
-			(v->vaft > FTINY && v->vaft <= v->vfore))
+	if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
 		return("illegal fore/aft clipping plane");
 
-	if (normalize(v->vdir) == 0.0)		/* normalize direction */
+	if (v->vdist <= FTINY)
+		return("illegal view distance");
+	v->vdist *= normalize(v->vdir);		/* normalize direction */
+	if (v->vdist == 0.0)
 		return("zero view direction");
 
 	if (normalize(v->vup) == 0.0)		/* normalize view up */
@@ -109,6 +113,7 @@ register VIEW  *v;
 }
 
 
+void
 normaspect(va, ap, xp, yp)		/* fix pixel aspect or resolution */
 double  va;			/* view aspect ratio */
 double  *ap;			/* pixel aspect in (or out if 0) */
@@ -200,6 +205,7 @@ double  x, y;
 }
 
 
+void
 viewloc(ip, v, p)		/* find image location for point */
 FVECT  ip;
 register VIEW  *v;
@@ -246,8 +252,7 @@ FVECT  p;
 		d = 1.0/sqrt(d*d + d2*d2);
 		ip[1] = DOT(disp,v->vvec)*d/v->vn2 + 0.5 - v->voff;
 		ip[2] = VLEN(disp);
-		if (v->vfore > FTINY)
-			ip[2] *= (1.0 - v->vfore*d);
+		ip[2] *= (1.0 - v->vfore*d);
 		return;
 	case VT_ANG:			/* angular fisheye */
 		ip[0] = 0.5 - v->hoff;
@@ -270,29 +275,31 @@ FVECT  p;
 }
 
 
+void
 pix2loc(loc, rp, px, py)	/* compute image location from pixel pos. */
-FLOAT  loc[2];
+RREAL  loc[2];
 register RESOLU  *rp;
 int  px, py;
 {
 	register int  x, y;
 
-	if (rp->or & YMAJOR) {
+	if (rp->rt & YMAJOR) {
 		x = px;
 		y = py;
 	} else {
 		x = py;
 		y = px;
 	}
-	if (rp->or & XDECR)
+	if (rp->rt & XDECR)
 		x = rp->xr-1 - x;
-	if (rp->or & YDECR)
+	if (rp->rt & YDECR)
 		y = rp->yr-1 - y;
 	loc[0] = (x+.5)/rp->xr;
 	loc[1] = (y+.5)/rp->yr;
 }
 
 
+void
 loc2pix(pp, rp, lx, ly)		/* compute pixel pos. from image location */
 int  pp[2];
 register RESOLU  *rp;
@@ -302,11 +309,11 @@ double  lx, ly;
 
 	x = lx * rp->xr;
 	y = ly * rp->yr;
-	if (rp->or & XDECR)
+	if (rp->rt & XDECR)
 		x = rp->xr-1 - x;
-	if (rp->or & YDECR)
+	if (rp->rt & YDECR)
 		y = rp->yr-1 - y;
-	if (rp->or & YMAJOR) {
+	if (rp->rt & YMAJOR) {
 		pp[0] = x;
 		pp[1] = y;
 	} else {
@@ -345,6 +352,7 @@ register char  *av[];
 		v->vdir[0] = atof(av[1]);
 		v->vdir[1] = atof(av[2]);
 		v->vdir[2] = atof(av[3]);
+		v->vdist = 1.;
 		return(3);
 	case 'u':			/* up */
 		check(3,"fff");
@@ -393,15 +401,17 @@ register char  *s;
 	int  na;
 	int  nvopts = 0;
 
-	if (*s != '-')
-		s = sskip2(s,1);
+	while (isspace(*s))
+		if (!*s++)
+			return(0);
 	while (*s) {
 		ac = 0;
 		do {
-			av[ac++] = s;
-			while (*s && *s != ' ')
+			if (ac || *s == '-')
+				av[ac++] = s;
+			while (*s && !isspace(*s))
 				s++;
-			while (*s == ' ')
+			while (isspace(*s))
 				s++;
 		} while (*s && ac < 4);
 		if ((na = getviewopt(vp, ac, av)) >= 0) {
@@ -415,13 +425,16 @@ register char  *s;
 }
 
 
+void
 fprintview(vp, fp)			/* write out view parameters */
 register VIEW  *vp;
 FILE  *fp;
 {
 	fprintf(fp, " -vt%c", vp->type);
 	fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
-	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
+	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
+						vp->vdir[1]*vp->vdist,
+						vp->vdir[2]*vp->vdist);
 	fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
 	fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
 	fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
@@ -436,6 +449,7 @@ register VIEW  *vp;
 	static char  vwstr[128];
 	register char  *cp = vwstr;
 
+	*cp = '\0';
 	if (vp->type != stdview.type) {
 		sprintf(cp, " -vt%c", vp->type);
 		cp += strlen(cp);
@@ -445,9 +459,11 @@ register VIEW  *vp;
 				vp->vp[0], vp->vp[1], vp->vp[2]);
 		cp += strlen(cp);
 	}
-	if (!VEQ(vp->vdir,stdview.vdir)) {
+	if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
 		sprintf(cp, " -vd %.6g %.6g %.6g",
-				vp->vdir[0], vp->vdir[1], vp->vdir[2]);
+				vp->vdir[0]*vp->vdist,
+				vp->vdir[1]*vp->vdist,
+				vp->vdir[2]*vp->vdist);
 		cp += strlen(cp);
 	}
 	if (!VEQ(vp->vup,stdview.vup)) {
@@ -487,7 +503,7 @@ int
 isview(s)				/* is this a view string? */
 char  *s;
 {
-	static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
+	static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
 	extern char  *progname;
 	register char  *cp;
 	register char  **an;
@@ -519,12 +535,13 @@ struct myview {
 
 
 static int
-gethview(s, v)				/* get view from header */
-char  *s;
-register struct myview  *v;
+gethview(				/* get view from header */
+	char  *s,
+	void  *v
+)
 {
-	if (isview(s) && sscanview(v->hv, s) > 0)
-		v->ok++;
+	if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
+		((struct myview*)v)->ok++;
 	return(0);
 }
 
@@ -538,7 +555,9 @@ RESOLU  *rp;
 	struct myview	mvs;
 	FILE  *fp;
 
-	if ((fp = fopen(fname, "r")) == NULL)
+	if (fname == NULL || !strcmp(fname, "-"))
+		fp = stdin;
+	else if ((fp = fopen(fname, "r")) == NULL)
 		return(-1);
 
 	mvs.hv = vp;