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

Comparing ray/src/rt/ray.h (file contents):
Revision 2.17 by schorsch, Sat Jun 7 00:54:58 2003 UTC vs.
Revision 2.23 by greg, Fri Nov 5 17:36:55 2004 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_RAY_H_
6   #define _RAD_RAY_H_
7 – #ifdef __cplusplus
8 – extern "C" {
9 – #endif
7  
11 –
12 – #include "copyright.h"
13 –
8   #include  "standard.h"
15 –
9   #include  "octree.h"
17 –
10   #include  "object.h"
19 –
11   #include  "color.h"
12  
13 + #ifdef __cplusplus
14 + extern "C" {
15 + #endif
16 +
17   #define  MAXDIM         32      /* maximum number of dimensions */
18  
19                                  /* ray type flags */
# Line 46 | Line 41 | typedef struct ray {
41          int     rsrc;           /* source we're aiming for */
42          OBJECT  *clipset;       /* set of objects currently clipped */
43          OBJECT  *newcset;       /* next clipset, used for transmission */
44 <        void    (*revf)();      /* evaluation function for this ray */
45 <        void    (*hitf)();      /* custom hit test for this traversal */
44 >        void    (*revf)(struct ray *);  /* evaluation function for this ray */
45 >        void    (*hitf)(OBJECT *, struct ray *);        /* custom hit test */
46          OBJECT  robj;           /* intersected object number */
47          OBJREC  *ro;            /* intersected object (one with material) */
48          double  rot;            /* distance to object */
# Line 55 | Line 50 | typedef struct ray {
50          FVECT   ron;            /* intersection surface normal */
51          double  rod;            /* -DOT(rdir, ron) */
52          FULLXF  *rox;           /* object transformation */
53 <        FLOAT   uv[2];          /* local coordinates */
53 >        RREAL   uv[2];          /* local coordinates */
54          FVECT   pert;           /* surface normal perturbation */
55          COLOR   pcol;           /* pattern color */
56          COLOR   rcol;           /* returned ray value */
# Line 124 | Line 119 | extern int     ambincl;        /* include == 1, exclude == 0 */
119   extern int      ray_pnprocs;    /* number of child processes */
120   extern int      ray_pnidle;     /* number of idle processes */
121  
122 < #define AMBLLEN         128     /* max. ambient list length */
123 < #define AMBWORD         8       /* average word length */
122 > #ifndef AMBLLEN
123 > #define AMBLLEN         512     /* max. ambient list length */
124 > #endif
125 > #define AMBWORD         12      /* average word length */
126  
127   typedef struct {                /* rendering parameter holder */
128          int     do_irrad;
# Line 165 | Line 162 | typedef struct {               /* rendering parameter holder */
162   extern void     headclean(void);
163   extern void     openheader(void);
164   extern void     dupheader(void);
165 +                                        /* defined in persist.c */
166 + extern void persistfile(char *pfn);
167   extern void     pfdetach(void);
168   extern void     pfclean(void);
169   extern void     pflock(int lf);
# Line 213 | Line 212 | extern void    print_rdefaults(void);
212                                          /* defined in srcdraw.c */
213   extern void     drawsources(COLOR *pic[], float *zbf[],
214                          int x0, int xsiz, int y0, int ysiz);
215 + extern void init_drawsources(int rad);
216 +                                        /* defined in rt/initotypes.c */
217 + extern void initotypes(void);
218                                          /* module main procedures */
219   extern void     rtrace(char *fname);
220 + extern char * formstr(int  f);
221   extern void     rview(void);
222   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
223  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines