--- ray/src/common/image.c	1991/03/18 13:48:05	1.14
+++ ray/src/common/image.c	1995/08/18 10:20:10	2.9
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1994 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -14,6 +14,10 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "view.h"
 
+#include  "resolu.h"
+
+#include  "paths.h"
+
 VIEW  stdview = STDVIEW;		/* default view parameters */
 
 
@@ -24,6 +28,10 @@ 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))
+		return("illegal fore/aft clipping plane");
+
 	if (normalize(v->vdir) == 0.0)		/* normalize direction */
 		return("zero view direction");
 
@@ -55,13 +63,21 @@ register VIEW  *v;
 		v->hn2 = 2.0 * tan(v->horiz*(PI/180.0/2.0));
 		v->vn2 = 2.0 * tan(v->vert*(PI/180.0/2.0));
 		break;
+	case VT_CYL:				/* cylindrical panorama */
+		if (v->horiz > 360.0+FTINY)
+			return(ill_horiz);
+		if (v->vert >= 180.0-FTINY)
+			return(ill_vert);
+		v->hn2 = v->horiz * (PI/180.0);
+		v->vn2 = 2.0 * tan(v->vert*(PI/180.0/2.0));
+		break;
 	case VT_ANG:				/* angular fisheye */
 		if (v->horiz > 360.0+FTINY)
 			return(ill_horiz);
 		if (v->vert > 360.0+FTINY)
 			return(ill_vert);
-		v->hn2 = v->horiz / 90.0;
-		v->vn2 = v->vert / 90.0;
+		v->hn2 = v->horiz * (PI/180.0);
+		v->vn2 = v->vert * (PI/180.0);
 		break;
 	case VT_HEM:				/* hemispherical fisheye */
 		if (v->horiz > 180.0+FTINY)
@@ -75,9 +91,11 @@ register VIEW  *v;
 		return("unknown view type");
 	}
 	if (v->type != VT_ANG) {
-		v->hvec[0] *= v->hn2;
-		v->hvec[1] *= v->hn2;
-		v->hvec[2] *= v->hn2;
+		if (v->type != VT_CYL) {
+			v->hvec[0] *= v->hn2;
+			v->hvec[1] *= v->hn2;
+			v->hvec[2] *= v->hn2;
+		}
 		v->vvec[0] *= v->vn2;
 		v->vvec[1] *= v->vn2;
 		v->vvec[2] *= v->vn2;
@@ -103,6 +121,7 @@ int  *xp, *yp;			/* x and y resolution in (or out if *
 }
 
 
+double
 viewray(orig, direc, v, x, y)		/* compute ray origin and direction */
 FVECT  orig, direc;
 register VIEW  *v;
@@ -115,55 +134,72 @@ double  x, y;
 
 	switch(v->type) {
 	case VT_PAR:			/* parallel view */
-		orig[0] = v->vp[0] + x*v->hvec[0] + y*v->vvec[0];
-		orig[1] = v->vp[1] + x*v->hvec[1] + y*v->vvec[1];
-		orig[2] = v->vp[2] + x*v->hvec[2] + y*v->vvec[2];
+		orig[0] = v->vp[0] + v->vfore*v->vdir[0]
+				+ x*v->hvec[0] + y*v->vvec[0];
+		orig[1] = v->vp[1] + v->vfore*v->vdir[1]
+				+ x*v->hvec[1] + y*v->vvec[1];
+		orig[2] = v->vp[2] + v->vfore*v->vdir[2]
+				+ x*v->hvec[2] + y*v->vvec[2];
 		VCOPY(direc, v->vdir);
-		return(0);
+		return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
 	case VT_PER:			/* perspective view */
-		VCOPY(orig, v->vp);
 		direc[0] = v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
 		direc[1] = v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
 		direc[2] = v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
-		normalize(direc);
-		return(0);
+		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];
+		d = normalize(direc);
+		return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0);
 	case VT_HEM:			/* hemispherical fisheye */
 		z = 1.0 - x*x*v->hn2 - y*y*v->vn2;
 		if (z < 0.0)
-			return(-1);
+			return(-1.0);
 		z = sqrt(z);
-		VCOPY(orig, v->vp);
 		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];
-		return(0);
+		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);
+	case VT_CYL:			/* cylindrical panorama */
+		d = x * v->horiz * (PI/180.0);
+		z = cos(d);
+		x = sin(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];
+		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;
 		d = x*x + y*y;
 		if (d > 1.0)
-			return(-1);
-		VCOPY(orig, v->vp);
-		if (d <= FTINY) {
-			VCOPY(direc, v->vdir);
-			return(0);
-		}
+			return(-1.0);
 		d = sqrt(d);
 		z = cos(PI*d);
-		d = sqrt(1 - z*z)/d;
+		d = d <= FTINY ? PI : sqrt(1 - 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];
-		return(0);
+		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);
+	return(-1.0);
 }
 
 
-viewpixel(xp, yp, zp, v, p)		/* find image location for point */
-double  *xp, *yp, *zp;
+viewloc(ip, v, p)		/* find image location for point */
+FVECT  ip;
 register VIEW  *v;
 FVECT  p;
 {
@@ -176,66 +212,117 @@ FVECT  p;
 
 	switch (v->type) {
 	case VT_PAR:			/* parallel view */
-		if (zp != NULL)
-			*zp = DOT(disp,v->vdir);
+		ip[2] = DOT(disp,v->vdir) - v->vfore;
 		break;
 	case VT_PER:			/* perspective view */
 		d = DOT(disp,v->vdir);
-		if (zp != NULL) {
-			*zp = sqrt(DOT(disp,disp));
-			if (d < 0.0)
-				*zp = -*zp;
-		}
-		if (d < 0.0)		/* fold pyramid */
+		ip[2] = sqrt(DOT(disp,disp));
+		if (d < 0.0) {		/* fold pyramid */
+			ip[2] = -ip[2];
 			d = -d;
+		}
 		if (d > FTINY) {
 			d = 1.0/d;
 			disp[0] *= d;
 			disp[1] *= d;
 			disp[2] *= d;
 		}
+		ip[2] *= (1.0 - v->vfore*d);
 		break;
 	case VT_HEM:			/* hemispherical fisheye */
 		d = normalize(disp);
-		if (zp != NULL) {
-			if (DOT(disp,v->vdir) < 0.0)
-				*zp = -d;
-			else
-				*zp = d;
-		}
+		if (DOT(disp,v->vdir) < 0.0)
+			ip[2] = -d;
+		else
+			ip[2] = d;
+		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(ip[2],d) / 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));
+		return;
 	case VT_ANG:			/* angular fisheye */
-		d = normalize(disp);
-		if (zp != NULL)
-			*zp = d;
-		*xp = 0.5 - v->hoff;
-		*yp = 0.5 - v->voff;
+		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)) {
-			*xp += 180.0/v->horiz;
-			*yp += 180.0/v->vert;
+			ip[0] += 180.0/v->horiz;
 			return;
 		}
 		d = acos(d)/PI / sqrt(1.0 - d*d);
-		*xp += DOT(disp,v->hvec)*d*180.0/v->horiz;
-		*yp += DOT(disp,v->vvec)*d*180.0/v->vert;
+		ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz;
+		ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert;
 		return;
 	}
-	*xp = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
-	*yp = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
+	ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
+	ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
 }
 
 
+pix2loc(loc, rp, px, py)	/* compute image location from pixel pos. */
+FLOAT  loc[2];
+register RESOLU  *rp;
+int  px, py;
+{
+	register int  x, y;
+
+	if (rp->or & YMAJOR) {
+		x = px;
+		y = py;
+	} else {
+		x = py;
+		y = px;
+	}
+	if (rp->or & XDECR)
+		x = rp->xr-1 - x;
+	if (rp->or & YDECR)
+		y = rp->yr-1 - y;
+	loc[0] = (x+.5)/rp->xr;
+	loc[1] = (y+.5)/rp->yr;
+}
+
+
+loc2pix(pp, rp, lx, ly)		/* compute pixel pos. from image location */
+int  pp[2];
+register RESOLU  *rp;
+double  lx, ly;
+{
+	register int  x, y;
+
+	x = lx * rp->xr;
+	y = ly * rp->yr;
+	if (rp->or & XDECR)
+		x = rp->xr-1 - x;
+	if (rp->or & YDECR)
+		y = rp->yr-1 - y;
+	if (rp->or & YMAJOR) {
+		pp[0] = x;
+		pp[1] = y;
+	} else {
+		pp[0] = y;
+		pp[1] = x;
+	}
+}
+
+
 int
 getviewopt(v, ac, av)			/* process view argument */
 register VIEW  *v;
 int  ac;
 register char  *av[];
 {
-#define check(c,n)	if ((av[0][c]&&av[0][c]!=' ') || n>=ac) return(-1)
-	extern double  atof();
+#define check(c,l)	if ((av[0][c]&&av[0][c]!=' ') || \
+			badarg(ac-1,av+1,l)) return(-1)
 
 	if (ac <= 0 || av[0][0] != '-' || av[0][1] != 'v')
 		return(-1);
@@ -243,41 +330,49 @@ register char  *av[];
 	case 't':			/* type */
 		if (!av[0][3] || av[0][3]==' ')
 			return(-1);
-		check(4,0);
+		check(4,"");
 		v->type = av[0][3];
 		return(0);
 	case 'p':			/* point */
-		check(3,3);
+		check(3,"fff");
 		v->vp[0] = atof(av[1]);
 		v->vp[1] = atof(av[2]);
 		v->vp[2] = atof(av[3]);
 		return(3);
 	case 'd':			/* direction */
-		check(3,3);
+		check(3,"fff");
 		v->vdir[0] = atof(av[1]);
 		v->vdir[1] = atof(av[2]);
 		v->vdir[2] = atof(av[3]);
 		return(3);
 	case 'u':			/* up */
-		check(3,3);
+		check(3,"fff");
 		v->vup[0] = atof(av[1]);
 		v->vup[1] = atof(av[2]);
 		v->vup[2] = atof(av[3]);
 		return(3);
 	case 'h':			/* horizontal size */
-		check(3,1);
+		check(3,"f");
 		v->horiz = atof(av[1]);
 		return(1);
 	case 'v':			/* vertical size */
-		check(3,1);
+		check(3,"f");
 		v->vert = atof(av[1]);
 		return(1);
+	case 'o':			/* fore clipping plane */
+		check(3,"f");
+		v->vfore = atof(av[1]);
+		return(1);
+	case 'a':			/* aft clipping plane */
+		check(3,"f");
+		v->vaft = atof(av[1]);
+		return(1);
 	case 's':			/* shift */
-		check(3,1);
+		check(3,"f");
 		v->hoff = atof(av[1]);
 		return(1);
 	case 'l':			/* lift */
-		check(3,1);
+		check(3,"f");
 		v->voff = atof(av[1]);
 		return(1);
 	default:
@@ -297,8 +392,8 @@ register char  *s;
 	int  na;
 	int  nvopts = 0;
 
-	while (*s == ' ')
-		s++;
+	if (*s != '-')
+		s = sskip(s);
 	while (*s) {
 		ac = 0;
 		do {
@@ -328,53 +423,77 @@ FILE  *fp;
 	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
 	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);
 	fprintf(fp, " -vs %.6g -vl %.6g", vp->hoff, vp->voff);
 }
 
 
-static VIEW  *hview;			/* view from header */
-static int  gothview;			/* success indicator */
-static char  *altname[] = {NULL,"rpict","rview","pinterp",VIEWSTR,NULL};
+int
+isview(s)				/* is this a view string? */
+char  *s;
+{
+	static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
+	extern char  *progname;
+	register char  *cp;
+	register char  **an;
+					/* add program name to list */
+	if (altname[0] == NULL) {
+		for (cp = progname; *cp; cp++)
+			;
+		while (cp > progname && !ISDIRSEP(cp[-1]))
+			cp--;
+		altname[0] = cp;
+	}
+					/* skip leading path */
+	cp = s;
+	while (*cp && *cp != ' ')
+		cp++;
+	while (cp > s && !ISDIRSEP(cp[-1]))
+		cp--;
+	for (an = altname; *an != NULL; an++)
+		if (!strncmp(*an, cp, strlen(*an)))
+			return(1);
+	return(0);
+}
 
 
+struct myview {
+	VIEW	*hv;
+	int	ok;
+};
+
+
 static
-gethview(s)				/* get view from header */
+gethview(s, v)				/* get view from header */
 char  *s;
+register struct myview  *v;
 {
-	register char  **an;
-
-	for (an = altname; *an != NULL; an++)
-		if (!strncmp(*an, s, strlen(*an))) {
-			if (sscanview(hview, s+strlen(*an)) > 0)
-				gothview++;
-			return;
-		}
+	if (isview(s) && sscanview(v->hv, s) > 0)
+		v->ok++;
 }
 
 
 int
-viewfile(fname, vp, xp, yp)		/* get view from file */
+viewfile(fname, vp, rp)			/* get view from file */
 char  *fname;
 VIEW  *vp;
-int  *xp, *yp;
+RESOLU  *rp;
 {
-	extern char  *progname;
+	struct myview	mvs;
 	FILE  *fp;
 
 	if ((fp = fopen(fname, "r")) == NULL)
 		return(-1);
 
-	altname[0] = progname;
-	hview = vp;
-	gothview = 0;
+	mvs.hv = vp;
+	mvs.ok = 0;
 
-	getheader(fp, gethview);
+	getheader(fp, gethview, &mvs);
 
-	if (xp != NULL && yp != NULL
-			&& fgetresolu(xp, yp, fp) == -1)
-		gothview = 0;
+	if (rp != NULL && !fgetsresolu(rp, fp))
+		mvs.ok = 0;
 
 	fclose(fp);
 
-	return(gothview);
+	return(mvs.ok);
 }