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 1.4 by greg, Mon Jan 8 14:45:51 1990 UTC vs.
Revision 2.10 by schorsch, Thu Jun 26 00:58:09 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1988 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   *  view.h - header file for image generation.
4   *
5 < *     9/19/88
5 > *  Include after fvect.h
6 > *  Includes resolu.h
7   */
8 + #ifndef _RAD_VIEW_H_
9 + #define _RAD_VIEW_H_
10 + #ifdef __cplusplus
11 + extern "C" {
12 + #endif
13  
14 + #include "copyright.h"
15 +
16 + #include  "resolu.h"
17 +
18                                  /* view types */
19   #define  VT_PER         'v'             /* perspective */
20   #define  VT_PAR         'l'             /* parallel */
21 + #define  VT_ANG         'a'             /* angular fisheye */
22 + #define  VT_HEM         'h'             /* hemispherical fisheye */
23 + #define  VT_CYL         'c'             /* cylindrical panorama */
24  
25   typedef struct {
26          int  type;              /* view type */
# Line 21 | Line 31 | typedef struct {
31          double  vert;           /* vertical view size */
32          double  hoff;           /* horizontal image offset */
33          double  voff;           /* vertical image offset */
34 +        double  vfore;          /* fore clipping plane */
35 +        double  vaft;           /* aft clipping plane (<=0 for inf) */
36          FVECT  hvec;            /* computed horizontal image vector */
37          FVECT  vvec;            /* computed vertical image vector */
38          double  hn2;            /* DOT(hvec,hvec) */
# Line 29 | Line 41 | typedef struct {
41  
42   extern VIEW  stdview;
43  
44 < extern char  *setview();
44 > #define  viewaspect(v)  sqrt((v)->vn2/(v)->hn2)
45  
46 < extern double  sqrt();
46 > #define  STDVIEW        {VT_PER,{0.,0.,0.},{0.,1.,0.},{0.,0.,1.}, \
47 >                                45.,45.,0.,0.,0.,0., \
48 >                                {0.,0.,0.},{0.,0.,0.},0.,0.}
49  
50 < #define  viewaspect(v)  sqrt((v)->vn2/(v)->hn2)
50 > #define  VIEWSTR        "VIEW="
51 > #define  VIEWSTRL       5
52  
38 #define  copyview(d,s)  bcopy((char *)(s),(char *)(d),sizeof(VIEW))
53  
54 < #define  STDVIEW        {VT_PER,0.,0.,0.,0.,1.,0.,0.,0.,1.,45.,45.,0.,0.}
54 > extern char     *setview(VIEW *v);
55 > extern void     normaspect(double va, double *ap, int *xp, int *yp);
56 > extern double   viewray(FVECT orig, FVECT direc, VIEW *v, double x, double y);
57 > extern void     viewloc(FVECT ip, VIEW *v, FVECT p);
58 > extern void     pix2loc(RREAL loc[2], RESOLU *rp, int px, int py);
59 > extern void     loc2pix(int pp[2], RESOLU *rp, double lx, double ly);
60 > extern int      getviewopt(VIEW *v, int ac, char *av[]);
61 > extern int      sscanview(VIEW *vp, char *s);
62 > extern void     fprintview(VIEW *vp, FILE *fp);
63 > extern char     *viewopt(VIEW *vp);
64 > extern int      isview(char *s);
65 > extern int      viewfile(char *fname, VIEW *vp, RESOLU *rp);
66  
67 < #define  VIEWSTR        "VIEW="
67 >
68 > #ifdef __cplusplus
69 > }
70 > #endif
71 > #endif /* _RAD_VIEW_H_ */
72 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines