--- ray/src/common/view.h 2003/10/24 05:29:42 2.14 +++ ray/src/common/view.h 2005/01/18 00:33:16 2.17 @@ -1,14 +1,13 @@ -/* RCSid $Id: view.h,v 2.14 2003/10/24 05:29:42 greg Exp $ */ +/* RCSid $Id: view.h,v 2.17 2005/01/18 00:33:16 greg Exp $ */ /* * view.h - header file for image generation. * - * Include after stdio.h and fvect.h + * Include after stdio.h and rtmath.h * Includes resolu.h */ #ifndef _RAD_VIEW_H_ #define _RAD_VIEW_H_ -#include #include "resolu.h" #ifdef __cplusplus @@ -27,6 +26,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 */ @@ -44,7 +44,7 @@ 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="