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.8 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.14 by greg, Fri Oct 24 05:29:42 2003 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 fvect.h
6   *  Includes resolu.h
7   */
8 + #ifndef _RAD_VIEW_H_
9 + #define _RAD_VIEW_H_
10  
11 < #include "copyright.h"
10 <
11 > #include  <time.h>
12   #include  "resolu.h"
13  
14 + #ifdef __cplusplus
15 + extern "C" {
16 + #endif
17 +
18                                  /* view types */
19   #define  VT_PER         'v'             /* perspective */
20   #define  VT_PAR         'l'             /* parallel */
# Line 45 | Line 50 | extern VIEW  stdview;
50   #define  VIEWSTR        "VIEW="
51   #define  VIEWSTRL       5
52  
48 #ifdef NOPROTO
53  
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
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(FLOAT loc[2], RESOLU *rp, int px, int py);
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);
# Line 75 | Line 64 | extern char    *viewopt(VIEW *vp);
64   extern int      isview(char *s);
65   extern int      viewfile(char *fname, VIEW *vp, RESOLU *rp);
66  
67 +
68 + #ifdef __cplusplus
69 + }
70   #endif
71 + #endif /* _RAD_VIEW_H_ */
72 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines