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.16 by greg, Fri May 9 22:18:03 2003 UTC vs.
Revision 2.29 by greg, Fri Sep 23 19:04:53 2005 UTC

# Line 2 | Line 2
2   /*
3   *  ray.h - header file for routines using rays.
4   */
5 + #ifndef _RAD_RAY_H_
6 + #define _RAD_RAY_H_
7  
6 – #include "copyright.h"
7 –
8   #include  "standard.h"
9 –
9   #include  "octree.h"
11 –
10   #include  "object.h"
13 –
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 27 | Line 28
28                                  /* reflected ray types */
29   #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
30  
31 + /* Arrange so double's come first for optimal alignment */
32 + /* Pointers and long's come second for 64-bit mode */
33 + /* Int's next (unknown length), then floats, followed by short's & char's */
34   typedef struct ray {
31 –        unsigned long  rno;     /* unique ray number */
32 –        int     rlvl;           /* number of reflections for this ray */
33 –        float   rweight;        /* cumulative weight of this ray */
34 –        short   rtype;          /* ray type */
35 –        short   crtype;         /* cumulative ray type */
36 –        struct ray  *parent;    /* ray this originated from */
35          FVECT   rorg;           /* origin of ray */
36          FVECT   rdir;           /* normalized direction of ray */
37 <        double  rmax;           /* maximum distance (aft clipping plane) */
38 <        int     rsrc;           /* source we're aiming for */
37 >        RREAL   rmax;           /* maximum distance (aft clipping plane) */
38 >        RREAL   rot;            /* distance to object */
39 >        FVECT   rop;            /* intersection point */
40 >        FVECT   ron;            /* intersection surface normal */
41 >        RREAL   rod;            /* -DOT(rdir, ron) */
42 >        RREAL   uv[2];          /* local coordinates */
43 >        FVECT   pert;           /* surface normal perturbation */
44 >        RREAL   rt;             /* returned effective ray length */
45 >        const struct ray  *parent;      /* ray this originated from */
46          OBJECT  *clipset;       /* set of objects currently clipped */
47          OBJECT  *newcset;       /* next clipset, used for transmission */
48 <        void    (*revf)();      /* evaluation function for this ray */
49 <        void    (*hitf)();      /* custom hit test for this traversal */
45 <        OBJECT  robj;           /* intersected object number */
48 >        void    (*revf)(struct ray *);  /* ray evaluation function */
49 >        void    (*hitf)(OBJECT *, struct ray *);        /* custom hit test */
50          OBJREC  *ro;            /* intersected object (one with material) */
47 –        double  rot;            /* distance to object */
48 –        FVECT   rop;            /* intersection point */
49 –        FVECT   ron;            /* intersection surface normal */
50 –        double  rod;            /* -DOT(rdir, ron) */
51          FULLXF  *rox;           /* object transformation */
52 <        FLOAT   uv[2];          /* local coordinates */
53 <        FVECT   pert;           /* surface normal perturbation */
52 >        int     *slights;       /* list of lights to test for scattering */
53 >        unsigned long  rno;     /* unique ray number */
54 >        int     rlvl;           /* number of reflections for this ray */
55 >        int     rsrc;           /* source we're aiming for */
56 >        float   rweight;        /* cumulative weight (for termination) */
57 >        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
58          COLOR   pcol;           /* pattern color */
59 <        COLOR   rcol;           /* returned ray value */
56 <        double  rt;             /* returned effective ray length */
59 >        COLOR   rcol;           /* returned radiance value */
60          COLOR   cext;           /* medium extinction coefficient */
61          COLOR   albedo;         /* medium scattering albedo */
62          float   gecc;           /* scattering eccentricity coefficient */
63 <        int     *slights;       /* list of lights to test for scattering */
63 >        OBJECT  robj;           /* intersected object number */
64 >        short   rtype;          /* ray type */
65 >        short   crtype;         /* cumulative ray type */
66   }  RAY;
67  
68   #define  rayvalue(r)    (*(r)->revf)(r)
# Line 83 | Line 88 | extern int     ray_savesiz;    /* size of parameter save buff
88  
89   extern int      do_irrad;       /* compute irradiance? */
90  
91 + extern int      rand_samp;      /* pure Monte Carlo sampling? */
92 +
93   extern double   dstrsrc;        /* square source distribution */
94   extern double   shadthresh;     /* shadow threshold */
95   extern double   shadcert;       /* shadow testing certainty */
# Line 118 | Line 125 | extern int     ambincl;        /* include == 1, exclude == 0 */
125   extern int      ray_pnprocs;    /* number of child processes */
126   extern int      ray_pnidle;     /* number of idle processes */
127  
128 < #define AMBLLEN         128     /* max. ambient list length */
129 < #define AMBWORD         8       /* average word length */
128 > #ifndef AMBLLEN
129 > #define AMBLLEN         512     /* max. ambient list length */
130 > #endif
131 > #define AMBWORD         12      /* average word length */
132  
133   typedef struct {                /* rendering parameter holder */
134          int     do_irrad;
135 +        int     rand_samp;
136          double  dstrsrc;
137          double  shadthresh;
138          double  shadcert;
# Line 155 | Line 165 | typedef struct {               /* rendering parameter holder */
165   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
166                            (char *)NULL : (p)->amblval+(p)->amblndx[i] )
167  
158 – #ifdef NOPROTO
159 –
160 – extern void     headclean();
161 – extern void     openheader();
162 – extern void     dupheader();
163 – extern void     pfdetach();
164 – extern void     pfclean();
165 – extern void     pflock();
166 – extern void     pfhold();
167 – extern void     io_process();
168 – extern int      free_objs();
169 – extern void     free_objmem();
170 – extern int      load_os();
171 – extern void     preload_objs();
172 – extern void     ray_init();
173 – extern void     ray_trace();
174 – extern void     ray_done();
175 – extern void     ray_save();
176 – extern void     ray_restore();
177 – extern void     ray_defaults();
178 – extern void     ray_pinit();
179 – extern void     ray_psend();
180 – extern int      ray_pqueue();
181 – extern int      ray_presult();
182 – extern void     ray_pdone();
183 – extern void     ray_popen();
184 – extern void     ray_pclose();
185 – extern int      rayorigin();
186 – extern void     rayclear();
187 – extern void     raytrace();
188 – extern void     rayhit();
189 – extern void     raycont();
190 – extern void     raytrans();
191 – extern int      rayshade();
192 – extern void     rayparticipate();
193 – extern void     raytexture();
194 – extern int      raymixture();
195 – extern double   raydist();
196 – extern double   raynormal();
197 – extern void     newrayxf();
198 – extern void     flipsurface();
199 – extern int      localhit();
200 – extern int      getrenderopt();
201 – extern void     print_rdefaults();
202 – extern void     drawsources();
203 – extern void     rtrace();
204 – extern void     rview();
205 – extern void     rpict();
206 –
207 – #else
168                                          /* defined in duphead.c */
169   extern void     headclean(void);
170   extern void     openheader(void);
171   extern void     dupheader(void);
172 +                                        /* defined in persist.c */
173 + extern void persistfile(char *pfn);
174   extern void     pfdetach(void);
175   extern void     pfclean(void);
176   extern void     pflock(int lf);
# Line 236 | Line 198 | extern void    ray_pdone(int freall);
198   extern void     ray_popen(int nadd);
199   extern void     ray_pclose(int nsub);
200                                          /* defined in raytrace.c */
201 < extern int      rayorigin(RAY *r, RAY *ro, int rt, double rw);
201 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
202   extern void     rayclear(RAY *r);
203   extern void     raytrace(RAY *r);
204   extern void     rayhit(OBJECT *oset, RAY *r);
# Line 246 | Line 208 | extern int     rayshade(RAY *r, int mod);
208   extern void     rayparticipate(RAY *r);
209   extern void     raytexture(RAY *r, OBJECT mod);
210   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
211 < extern double   raydist(RAY *r, int flags);
211 > extern void     raycontrib(double rc[3], const RAY *r, int flags);
212 > extern double   raydist(const RAY *r, int flags);
213   extern double   raynormal(FVECT norm, RAY *r);
214   extern void     newrayxf(RAY *r);
215   extern void     flipsurface(RAY *r);
# Line 257 | Line 220 | extern void    print_rdefaults(void);
220                                          /* defined in srcdraw.c */
221   extern void     drawsources(COLOR *pic[], float *zbf[],
222                          int x0, int xsiz, int y0, int ysiz);
223 + extern void init_drawsources(int rad);
224 +                                        /* defined in rt/initotypes.c */
225 + extern void initotypes(void);
226                                          /* module main procedures */
227   extern void     rtrace(char *fname);
228 + extern char * formstr(int  f);
229   extern void     rview(void);
230   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
231  
232 +
233 + #ifdef __cplusplus
234 + }
235   #endif
236 + #endif /* _RAD_RAY_H_ */
237 +

Diff Legend

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