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

Comparing ray/src/rt/rpaint.h (file contents):
Revision 2.5 by greg, Fri Jun 27 06:53:23 2003 UTC vs.
Revision 2.10 by greg, Wed Oct 5 17:20:55 2011 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_RPAINT_H_
6   #define _RAD_RPAINT_H_
7 +
8 + #include  "driver.h"
9 + #include  "view.h"
10 +
11   #ifdef __cplusplus
12   extern "C" {
13   #endif
14  
15 < #include  "driver.h"
15 > #ifdef _WIN32           /* stupid Windows name collisions */
16 > #undef COORD
17 > #define COORD   radCOORD
18 > #undef RECT
19 > #define RECT    radRECT
20 > #endif
21  
13 #include  "view.h"
14
22   typedef short  COORD;           /* an image coordinate */
23  
24   typedef struct pnode {
25          struct pnode  *kid;             /* children */
26          COORD  x, y;                    /* position */
27 +        COORD  xmin, ymin, xmax, ymax;  /* rectangle */
28          COLOR  v;                       /* value */
29   }  PNODE;                       /* a paint node */
30  
# Line 38 | Line 46 | extern VIEW  ourview;          /* current view parameters */
46   extern VIEW  oldview;           /* previous view parameters */
47   extern int  hresolu, vresolu;   /* image resolution */
48  
49 + extern int  newparam;           /* parameter setting changed */
50 +
51 + extern char  *dvcname;          /* output device name */
52 +
53 + extern char  rifname[];         /* rad input file name */
54 +
55 + extern int  psample;            /* pixel sample size */
56 + extern double  maxdiff;         /* max. sample difference */
57 +
58   extern int  greyscale;          /* map colors to brightness? */
59  
60   extern int  pdepth;             /* image depth in current frame */
# Line 47 | Line 64 | extern double  exposure;       /* exposure for scene */
64  
65   extern struct driver  *dev;     /* driver functions */
66  
67 + extern int  nproc;              /* number of processes */
68 +
69                                  /* defined in rview.c */
70   extern void     devopen(char *dname);
71   extern void     devclose(void);
72   extern void     printdevices(void);
54 extern void     fillreserves(void);
55 extern void     freereserves(void);
73   extern void     command(char *prompt);
74   extern void     rsample(void);
75 < extern int      refine(PNODE *p, int xmin, int ymin,
59 <                                int xmax, int ymax, int pd);
75 > extern int      refine(PNODE *p, int pd);
76                                  /* defined in rv2.c */
77   extern void     getframe(char *s);
78   extern void     getrepaint(char *s);
# Line 64 | Line 80 | extern void    getview(char *s);
80   extern void     lastview(char *s);
81   extern void     saveview(char *s);
82   extern void     loadview(char *s);
83 + extern void     getfocus(char *s);
84   extern void     getaim(char *s);
85   extern void     getmove(char *s);
86   extern void     getrotate(char *s);
# Line 77 | Line 94 | extern void    writepict(char *s);
94   extern int      getrect(char *s, RECT *r);
95   extern int      getinterest(char *s, int direc, FVECT vec, double *mp);
96   extern float    *greyof(COLOR col);
97 < extern void     paint(PNODE *p, int xmin, int ymin, int xmax, int ymax);
98 < extern void     newimage(void);
97 > extern int      paint(PNODE *p);
98 > extern int      waitrays(void);
99 > extern void     newimage(char *s);
100   extern void     redraw(void);
101   extern void     repaint(int xmin, int ymin, int xmax, int ymax);
102 < extern void     paintrect(PNODE *p, int xmin, int ymin,
103 <                                int xmax, int ymax, RECT *r);
104 < extern PNODE    *findrect(int x, int y, PNODE *p, RECT *r, int pd);
102 > extern void     paintrect(PNODE *p, RECT *r);
103 > extern PNODE    *findrect(int x, int y, PNODE *p, int pd);
104 > extern void     compavg(PNODE *p);
105   extern void     scalepict(PNODE *p, double sf);
106   extern void     getpictcolrs(int yoff, COLR *scan, PNODE *p,
107                          int xsiz, int ysiz);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines