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

Comparing ray/src/common/view.h (file contents):
Revision 2.8 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.16 by greg, Tue Jun 8 19:48:29 2004 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  
9 – #include "copyright.h"
10 –
11   #include  "resolu.h"
12  
13 + #ifdef __cplusplus
14 + extern "C" {
15 + #endif
16 +
17                                  /* view types */
18   #define  VT_PER         'v'             /* perspective */
19   #define  VT_PAR         'l'             /* parallel */
# Line 45 | Line 49 | extern VIEW  stdview;
49   #define  VIEWSTR        "VIEW="
50   #define  VIEWSTRL       5
51  
48 – #ifdef NOPROTO
52  
50 – extern char     *setview();
51 – extern void     normaspect();
52 – extern double   viewray();
53 – extern void     viewloc();
54 – extern void     pix2loc();
55 – extern void     loc2pix();
56 – extern int      getviewopt();
57 – extern int      sscanview();
58 – extern void     fprintview();
59 – extern char     *viewopt();
60 – extern int      isview();
61 – extern int      viewfile();
62 –
63 – #else
64 –
53   extern char     *setview(VIEW *v);
54   extern void     normaspect(double va, double *ap, int *xp, int *yp);
55   extern double   viewray(FVECT orig, FVECT direc, VIEW *v, double x, double y);
56   extern void     viewloc(FVECT ip, VIEW *v, FVECT p);
57 < extern void     pix2loc(FLOAT loc[2], RESOLU *rp, int px, int py);
57 > extern void     pix2loc(RREAL loc[2], RESOLU *rp, int px, int py);
58   extern void     loc2pix(int pp[2], RESOLU *rp, double lx, double ly);
59   extern int      getviewopt(VIEW *v, int ac, char *av[]);
60   extern int      sscanview(VIEW *vp, char *s);
# Line 75 | Line 63 | extern char    *viewopt(VIEW *vp);
63   extern int      isview(char *s);
64   extern int      viewfile(char *fname, VIEW *vp, RESOLU *rp);
65  
66 +
67 + #ifdef __cplusplus
68 + }
69   #endif
70 + #endif /* _RAD_VIEW_H_ */
71 +

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)