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.38 by greg, Tue Feb 24 19:39:27 2015 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 + #include  "pmapparm.h"
13  
14 + #ifdef __cplusplus
15 + extern "C" {
16 + #endif
17 +
18 + #ifndef RNUMBER
19 + #define RNUMBER         unsigned long   /* ray counter (>= sizeof pointer) */
20 + #endif
21 +
22   #define  MAXDIM         32      /* maximum number of dimensions */
23  
24                                  /* ray type flags */
# Line 33 | Line 33 | extern "C" {
33                                  /* reflected ray types */
34   #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
35  
36 + /* Arrange so double's come first for optimal alignment */
37 + /* Pointers and long's come second for 64-bit mode */
38 + /* Int's next (unknown length), then floats, followed by short's & char's */
39   typedef struct ray {
37 –        unsigned long  rno;     /* unique ray number */
38 –        int     rlvl;           /* number of reflections for this ray */
39 –        float   rweight;        /* cumulative weight of this ray */
40 –        short   rtype;          /* ray type */
41 –        short   crtype;         /* cumulative ray type */
42 –        struct ray  *parent;    /* ray this originated from */
40          FVECT   rorg;           /* origin of ray */
41          FVECT   rdir;           /* normalized direction of ray */
42 <        double  rmax;           /* maximum distance (aft clipping plane) */
43 <        int     rsrc;           /* source we're aiming for */
42 >        RREAL   rmax;           /* maximum distance (aft clipping plane) */
43 >        RREAL   rot;            /* distance to object */
44 >        FVECT   rop;            /* intersection point */
45 >        FVECT   ron;            /* intersection surface normal */
46 >        RREAL   rod;            /* -DOT(rdir, ron) */
47 >        RREAL   uv[2];          /* local coordinates */
48 >        FVECT   pert;           /* surface normal perturbation */
49 >        RREAL   rt;             /* returned effective ray length */
50 >        const struct ray  *parent;      /* ray this originated from */
51          OBJECT  *clipset;       /* set of objects currently clipped */
52          OBJECT  *newcset;       /* next clipset, used for transmission */
53 <        void    (*revf)();      /* evaluation function for this ray */
54 <        void    (*hitf)();      /* custom hit test for this traversal */
51 <        OBJECT  robj;           /* intersected object number */
53 >        void    (*revf)(struct ray *);  /* ray evaluation function */
54 >        void    (*hitf)(OBJECT *, struct ray *);        /* custom hit test */
55          OBJREC  *ro;            /* intersected object (one with material) */
53 –        double  rot;            /* distance to object */
54 –        FVECT   rop;            /* intersection point */
55 –        FVECT   ron;            /* intersection surface normal */
56 –        double  rod;            /* -DOT(rdir, ron) */
56          FULLXF  *rox;           /* object transformation */
57 <        FLOAT   uv[2];          /* local coordinates */
58 <        FVECT   pert;           /* surface normal perturbation */
57 >        int     *slights;       /* list of lights to test for scattering */
58 >        RNUMBER rno;            /* unique ray number */
59 >        int     rlvl;           /* number of reflections for this ray */
60 >        int     rsrc;           /* source we're aiming for */
61 >        float   rweight;        /* cumulative weight (for termination) */
62 >        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
63          COLOR   pcol;           /* pattern color */
64 <        COLOR   rcol;           /* returned ray value */
62 <        double  rt;             /* returned effective ray length */
64 >        COLOR   rcol;           /* returned radiance value */
65          COLOR   cext;           /* medium extinction coefficient */
66          COLOR   albedo;         /* medium scattering albedo */
67          float   gecc;           /* scattering eccentricity coefficient */
68 <        int     *slights;       /* list of lights to test for scattering */
68 >        OBJECT  robj;           /* intersected object number */
69 >        short   rtype;          /* ray type */
70 >        short   crtype;         /* cumulative ray type */
71   }  RAY;
72  
73   #define  rayvalue(r)    (*(r)->revf)(r)
# Line 73 | Line 77 | extern char  VersionID[];      /* Radiance version ID strin
77   extern CUBE     thescene;       /* our scene */
78   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
79  
80 < extern unsigned long    raynum; /* next ray ID */
81 < extern unsigned long    nrays;  /* total rays traced so far */
80 > extern RNUMBER  raynum;         /* next ray ID */
81 > extern RNUMBER  nrays;          /* total rays traced so far */
82  
83   extern OBJREC  Lamb;            /* a Lambertian surface */
84   extern OBJREC  Aftplane;        /* aft clipping object */
# Line 89 | Line 93 | extern int     ray_savesiz;    /* size of parameter save buff
93  
94   extern int      do_irrad;       /* compute irradiance? */
95  
96 + extern int      rand_samp;      /* pure Monte Carlo sampling? */
97 +
98   extern double   dstrsrc;        /* square source distribution */
99   extern double   shadthresh;     /* shadow threshold */
100   extern double   shadcert;       /* shadow testing certainty */
# Line 124 | Line 130 | extern int     ambincl;        /* include == 1, exclude == 0 */
130   extern int      ray_pnprocs;    /* number of child processes */
131   extern int      ray_pnidle;     /* number of idle processes */
132  
133 < #define AMBLLEN         128     /* max. ambient list length */
134 < #define AMBWORD         8       /* average word length */
133 > #ifndef AMBLLEN
134 > #define AMBLLEN         512     /* max. ambient list length */
135 > #endif
136 > #define AMBWORD         12      /* average word length */
137  
138   typedef struct {                /* rendering parameter holder */
139          int     do_irrad;
140 +        int     rand_samp;
141          double  dstrsrc;
142          double  shadthresh;
143          double  shadcert;
# Line 156 | Line 165 | typedef struct {               /* rendering parameter holder */
165          int     ambincl;
166          short   amblndx[AMBLLEN+1];
167          char    amblval[AMBLLEN*AMBWORD];
168 +        
169 +        /* PMAP: photon mapping parameters */
170 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
171   } RAYPARAMS;
172  
173   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 165 | Line 177 | typedef struct {               /* rendering parameter holder */
177   extern void     headclean(void);
178   extern void     openheader(void);
179   extern void     dupheader(void);
180 +                                        /* defined in persist.c */
181 + extern void persistfile(char *pfn);
182   extern void     pfdetach(void);
183   extern void     pfclean(void);
184   extern void     pflock(int lf);
# Line 185 | Line 199 | extern void    ray_restore(RAYPARAMS *rp);
199   extern void     ray_defaults(RAYPARAMS *rp);
200                                          /* defined in raypcalls.c */
201   extern void     ray_pinit(char *otnm, int nproc);
202 < extern void     ray_psend(RAY *r);
202 > extern int      ray_psend(RAY *r);
203   extern int      ray_pqueue(RAY *r);
204   extern int      ray_presult(RAY *r, int poll);
205   extern void     ray_pdone(int freall);
206   extern void     ray_popen(int nadd);
207   extern void     ray_pclose(int nsub);
208 +                                        /* defined in ray_fifo.c */
209 + extern int      (*ray_fifo_out)(RAY *r);
210 + extern int      ray_fifo_in(RAY *r);
211 + extern int      ray_fifo_flush(void);
212                                          /* defined in raytrace.c */
213 < extern int      rayorigin(RAY *r, RAY *ro, int rt, double rw);
213 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
214   extern void     rayclear(RAY *r);
215   extern void     raytrace(RAY *r);
216   extern void     rayhit(OBJECT *oset, RAY *r);
# Line 202 | Line 220 | extern int     rayshade(RAY *r, int mod);
220   extern void     rayparticipate(RAY *r);
221   extern void     raytexture(RAY *r, OBJECT mod);
222   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
223 < extern double   raydist(RAY *r, int flags);
223 > extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
224 > extern double   raydist(const RAY *r, int flags);
225   extern double   raynormal(FVECT norm, RAY *r);
226   extern void     newrayxf(RAY *r);
227   extern void     flipsurface(RAY *r);
# Line 213 | Line 232 | extern void    print_rdefaults(void);
232                                          /* defined in srcdraw.c */
233   extern void     drawsources(COLOR *pic[], float *zbf[],
234                          int x0, int xsiz, int y0, int ysiz);
235 + extern void init_drawsources(int rad);
236 +                                        /* defined in rt/initotypes.c */
237 + extern void initotypes(void);
238                                          /* module main procedures */
239 < extern void     rtrace(char *fname);
239 > extern void     rtrace(char *fname, int nproc);
240 > extern char     *formstr(int  f);
241   extern void     rview(void);
242   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
243  
244 + #ifdef __FAST_MATH__
245 + #define checknorm(vn)   (void)normalize(vn)
246 + #else
247 + #define checknorm(vn)
248 + #endif
249  
250   #ifdef __cplusplus
251   }

Diff Legend

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