ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/view.h
(Generate patch)

Comparing ray/src/common/view.h (file contents):
Revision 2.9 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.19 by greg, Wed Jan 24 03:34:15 2018 UTC

# Line 2 | Line 2
2   /*
3   *  view.h - header file for image generation.
4   *
5 < *  Include after fvect.h
5 > *  Include after stdio.h and rtmath.h
6   *  Includes resolu.h
7   */
8   #ifndef _RAD_VIEW_H_
9   #define _RAD_VIEW_H_
10 +
11 + #include  "resolu.h"
12 +
13   #ifdef __cplusplus
14   extern "C" {
15   #endif
16  
14 #include "copyright.h"
15
16 #include  "resolu.h"
17
17                                  /* view types */
18   #define  VT_PER         'v'             /* perspective */
19   #define  VT_PAR         'l'             /* parallel */
20   #define  VT_ANG         'a'             /* angular fisheye */
21   #define  VT_HEM         'h'             /* hemispherical fisheye */
22 + #define  VT_PLS         's'             /* planispheric fisheye */
23   #define  VT_CYL         'c'             /* cylindrical panorama */
24  
25   typedef struct {
# Line 27 | Line 27 | typedef struct {
27          FVECT  vp;              /* view origin */
28          FVECT  vdir;            /* view direction */
29          FVECT  vup;             /* view up */
30 +        double  vdist;          /* view distance */
31          double  horiz;          /* horizontal view size */
32          double  vert;           /* vertical view size */
33          double  hoff;           /* horizontal image offset */
# Line 44 | Line 45 | extern VIEW  stdview;
45   #define  viewaspect(v)  sqrt((v)->vn2/(v)->hn2)
46  
47   #define  STDVIEW        {VT_PER,{0.,0.,0.},{0.,1.,0.},{0.,0.,1.}, \
48 <                                45.,45.,0.,0.,0.,0., \
48 >                                1.,45.,45.,0.,0.,0.,0., \
49                                  {0.,0.,0.},{0.,0.,0.},0.,0.}
50  
51   #define  VIEWSTR        "VIEW="
# Line 54 | Line 55 | extern VIEW  stdview;
55   extern char     *setview(VIEW *v);
56   extern void     normaspect(double va, double *ap, int *xp, int *yp);
57   extern double   viewray(FVECT orig, FVECT direc, VIEW *v, double x, double y);
58 < extern void     viewloc(FVECT ip, VIEW *v, FVECT p);
59 < extern void     pix2loc(FLOAT loc[2], RESOLU *rp, int px, int py);
58 > extern int      viewloc(FVECT ip, VIEW *v, FVECT p);
59 > extern void     pix2loc(RREAL loc[2], RESOLU *rp, int px, int py);
60   extern void     loc2pix(int pp[2], RESOLU *rp, double lx, double ly);
61   extern int      getviewopt(VIEW *v, int ac, char *av[]);
62   extern int      sscanview(VIEW *vp, char *s);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines