--- ray/src/common/image.c	1996/01/17 10:55:40	2.12
+++ ray/src/common/image.c	2008/03/11 02:21:46	2.34
@@ -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.34 2008/03/11 02:21:46 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 */
@@ -89,10 +93,20 @@ register VIEW  *v;
 		v->hn2 = 2.0 * sin(v->horiz*(PI/180.0/2.0));
 		v->vn2 = 2.0 * sin(v->vert*(PI/180.0/2.0));
 		break;
+	case VT_PLS:				/* planispheric fisheye */
+		if (v->horiz >= 360.0-FTINY)
+			return(ill_horiz);
+		if (v->vert >= 360.0-FTINY)
+			return(ill_vert);
+		v->hn2 = 2.*sin(v->horiz*(PI/180.0/2.0)) /
+				(1.0 + cos(v->horiz*(PI/180.0/2.0)));
+		v->vn2 = 2.*sin(v->vert*(PI/180.0/2.0)) /
+				(1.0 + cos(v->vert*(PI/180.0/2.0)));
+		break;
 	default:
 		return("unknown view type");
 	}
-	if (v->type != VT_ANG) {
+	if (v->type != VT_ANG && v->type != VT_PLS) {
 		if (v->type != VT_CYL) {
 			v->hvec[0] *= v->hn2;
 			v->hvec[1] *= v->hn2;
@@ -109,6 +123,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) */
@@ -178,14 +193,14 @@ double  x, y;
 		d = normalize(direc);
 		return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0);
 	case VT_ANG:			/* angular fisheye */
-		x *= v->horiz/180.0;
-		y *= v->vert/180.0;
+		x *= (1.0/180.0)*v->horiz;
+		y *= (1.0/180.0)*v->vert;
 		d = x*x + y*y;
 		if (d > 1.0)
 			return(-1.0);
 		d = sqrt(d);
 		z = cos(PI*d);
-		d = d <= FTINY ? PI : sqrt(1 - z*z)/d;
+		d = d <= FTINY ? PI : sqrt(1.0 - z*z)/d;
 		x *= d;
 		y *= d;
 		direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
@@ -195,22 +210,36 @@ double  x, y;
 		orig[1] = v->vp[1] + v->vfore*direc[1];
 		orig[2] = v->vp[2] + v->vfore*direc[2];
 		return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
+	case VT_PLS:			/* planispheric fisheye */
+		x *= sqrt(v->hn2);
+		y *= sqrt(v->vn2);
+		d = x*x + y*y;
+		z = (1. - d)/(1. + d);
+		d = d <= FTINY*FTINY ? PI : sqrt((1.0 - z*z)/d);
+		x *= d;
+		y *= d;
+		direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
+		direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
+		direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
+		orig[0] = v->vp[0] + v->vfore*direc[0];
+		orig[1] = v->vp[1] + v->vfore*direc[1];
+		orig[2] = v->vp[2] + v->vfore*direc[2];
+		return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
 	}
 	return(-1.0);
 }
 
 
+void
 viewloc(ip, v, p)		/* find image location for point */
 FVECT  ip;
 register VIEW  *v;
 FVECT  p;
 {
-	double  d;
+	double  d, d2;
 	FVECT  disp;
 
-	disp[0] = p[0] - v->vp[0];
-	disp[1] = p[1] - v->vp[1];
-	disp[2] = p[2] - v->vp[2];
+	VSUB(disp, p, v->vp);
 
 	switch (v->type) {
 	case VT_PAR:			/* parallel view */
@@ -218,7 +247,7 @@ FVECT  p;
 		break;
 	case VT_PER:			/* perspective view */
 		d = DOT(disp,v->vdir);
-		ip[2] = sqrt(DOT(disp,disp));
+		ip[2] = VLEN(disp);
 		if (d < 0.0) {		/* fold pyramid */
 			ip[2] = -ip[2];
 			d = -d;
@@ -240,15 +269,13 @@ FVECT  p;
 		ip[2] -= v->vfore;
 		break;
 	case VT_CYL:			/* cylindrical panorama */
-		ip[2] = DOT(disp,v->vdir);
 		d = DOT(disp,v->hvec);
-		ip[0] = 180.0/PI * atan2(d,ip[2]) / v->horiz + 0.5 - v->hoff;
-		ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
-		if (v->vfore > FTINY)
-			ip[2] = sqrt(DOT(disp,disp)) *
-				(1.0 - v->vfore/sqrt(d*d + ip[2]*ip[2]));
-		else
-			ip[2] = sqrt(DOT(disp,disp));
+		d2 = DOT(disp,v->vdir);
+		ip[0] = 180.0/PI * atan2(d,d2) / v->horiz + 0.5 - v->hoff;
+		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);
+		ip[2] *= (1.0 - v->vfore*d);
 		return;
 	case VT_ANG:			/* angular fisheye */
 		ip[0] = 0.5 - v->hoff;
@@ -261,39 +288,54 @@ FVECT  p;
 			ip[0] += 180.0/v->horiz;
 			return;
 		}
-		d = acos(d)/PI / sqrt(1.0 - d*d);
-		ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz;
-		ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert;
+		d = (180.0/PI)*acos(d) / sqrt(1.0 - d*d);
+		ip[0] += DOT(disp,v->hvec)*d/v->horiz;
+		ip[1] += DOT(disp,v->vvec)*d/v->vert;
 		return;
+	case VT_PLS:			/* planispheric fisheye */
+		ip[0] = 0.5 - v->hoff;
+		ip[1] = 0.5 - v->voff;
+		ip[2] = normalize(disp) - v->vfore;
+		d = DOT(disp,v->vdir);
+		if (d >= 1.0-FTINY)
+			return;
+		if (d <= -(1.0-FTINY))
+			return;		/* really an error */
+		d = sqrt(1.0 - d*d) / (1.0 + d);
+		ip[0] += DOT(disp,v->hvec)*d/sqrt(v->hn2);
+		ip[1] += DOT(disp,v->vvec)*d/sqrt(v->vn2);
+		return;
 	}
 	ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
 	ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
 }
 
 
+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;
@@ -303,11 +345,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 {
@@ -346,6 +388,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");
@@ -394,15 +437,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) {
@@ -416,13 +461,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);
@@ -437,6 +485,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);
@@ -446,9 +495,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)) {
@@ -488,7 +539,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,13 +570,15 @@ struct myview {
 };
 
 
-static
-gethview(s, v)				/* get view from header */
-char  *s;
-register struct myview  *v;
+static int
+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 +591,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;