--- ray/src/common/view.h	2003/02/25 02:47:22	2.8
+++ ray/src/common/view.h	2021/12/03 18:10:48	2.21
@@ -1,20 +1,25 @@
-/* RCSid $Id: view.h,v 2.8 2003/02/25 02:47:22 greg Exp $ */
+/* RCSid $Id: view.h,v 2.21 2021/12/03 18:10:48 greg Exp $ */
 /*
  *  view.h - header file for image generation.
  *
- *  Include after fvect.h
+ *  Include after stdio.h and rtmath.h
  *  Includes resolu.h
  */
+#ifndef _RAD_VIEW_H_
+#define _RAD_VIEW_H_
 
-#include "copyright.h"
-
 #include  "resolu.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 				/* view types */
 #define  VT_PER		'v'		/* perspective */
 #define  VT_PAR		'l'		/* parallel */
 #define  VT_ANG		'a'		/* angular fisheye */
 #define  VT_HEM		'h'		/* hemispherical fisheye */
+#define  VT_PLS		's'		/* planispheric fisheye */
 #define  VT_CYL		'c'		/* cylindrical panorama */
 
 typedef struct {
@@ -22,6 +27,7 @@ typedef struct {
 	FVECT  vp;		/* view origin */
 	FVECT  vdir;		/* view direction */
 	FVECT  vup;		/* view up */
+	double  vdist;		/* view distance */
 	double  horiz;		/* horizontal view size */
 	double  vert;		/* vertical view size */
 	double  hoff;		/* horizontal image offset */
@@ -39,34 +45,25 @@ extern VIEW  stdview;
 #define  viewaspect(v)	sqrt((v)->vn2/(v)->hn2)
 
 #define  STDVIEW	{VT_PER,{0.,0.,0.},{0.,1.,0.},{0.,0.,1.}, \
-				45.,45.,0.,0.,0.,0., \
+				1.,45.,45.,0.,0.,0.,0., \
 				{0.,0.,0.},{0.,0.,0.},0.,0.}
 
 #define  VIEWSTR	"VIEW="
 #define  VIEWSTRL	5
 
-#ifdef NOPROTO
+				/* return values/flags for viewloc() */
+#define VL_BAD		0		/* illegal position (i.e. origin) */
+#define	VL_GOOD		0x1		/* result is valid */
+#define VL_BEHIND	0x2		/* world point is behind fore plane */
+#define VL_OUTSIDE	0x4		/* world point is outside frustum */
+#define VL_BEYOND	0x8		/* point is beyond aft clipping plane */
 
-extern char	*setview();
-extern void	normaspect();
-extern double	viewray();
-extern void	viewloc();
-extern void	pix2loc();
-extern void	loc2pix();
-extern int	getviewopt();
-extern int	sscanview();
-extern void	fprintview();
-extern char	*viewopt();
-extern int	isview();
-extern int	viewfile();
-
-#else
-
 extern char	*setview(VIEW *v);
 extern void	normaspect(double va, double *ap, int *xp, int *yp);
 extern double	viewray(FVECT orig, FVECT direc, VIEW *v, double x, double y);
-extern void	viewloc(FVECT ip, VIEW *v, FVECT p);
-extern void	pix2loc(FLOAT loc[2], RESOLU *rp, int px, int py);
+extern int	jitteraperture(FVECT orig, FVECT direc, VIEW *v, double dia);
+extern int	viewloc(FVECT ip, VIEW *v, FVECT p);
+extern void	pix2loc(RREAL loc[2], RESOLU *rp, int px, int py);
 extern void	loc2pix(int pp[2], RESOLU *rp, double lx, double ly);
 extern int	getviewopt(VIEW *v, int ac, char *av[]);
 extern int	sscanview(VIEW *vp, char *s);
@@ -75,4 +72,9 @@ extern char	*viewopt(VIEW *vp);
 extern int	isview(char *s);
 extern int	viewfile(char *fname, VIEW *vp, RESOLU *rp);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_VIEW_H_ */
+