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.32 by greg, Sun Dec 13 19:13:04 2009 UTC vs.
Revision 2.60 by greg, Fri Jun 20 16:34:23 2025 UTC

# Line 9 | Line 9
9   #include  "octree.h"
10   #include  "object.h"
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) */
19 > #define RNUMBER         size_t          /* ray counter (>= sizeof pointer) */
20   #endif
21  
22 < #define  MAXDIM         32      /* maximum number of dimensions */
22 > #define  MAXDIM         36      /* maximum number of sampling dimensions */
23 > #define  XTRADIM        3       /* #spare dimensions */
24 > #define  ndims_inc      (ndims -= ndims>=MAXDIM-XTRADIM, ndims++)
25  
26                                  /* ray type flags */
27   #define  PRIMARY        01              /* original ray */
28 < #define  SHADOW         02              /* ray to light source */
28 > #define  RSHADOW        02              /* reflected ray to light source */
29   #define  REFLECTED      04              /* reflected ray */
30   #define  REFRACTED      010             /* refracted (bent) ray */
31   #define  TRANS          020             /* transmitted/transferred ray */
32 < #define  AMBIENT        040             /* ray scattered for interreflection */
33 < #define  SPECULAR       0100            /* ray scattered for specular */
32 > #define  RAMBIENT       040             /* reflected diffuse interreflection */
33 > #define  RSPECULAR      0100            /* reflected specular */
34 > #define  TSHADOW        0200            /* transmitted shadow */
35 > #define  TAMBIENT       0400            /* transmitted ambient */
36 > #define  TSPECULAR      01000           /* transmitted specular */
37 > #define  SHADOW         (RSHADOW|TSHADOW)
38 > #define  AMBIENT        (RAMBIENT|TAMBIENT)
39 > #define  SPECULAR       (RSPECULAR|TSPECULAR)
40  
41                                  /* reflected ray types */
42 < #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
42 > #define  RAYREFL        (RSHADOW|REFLECTED|RAMBIENT|RSPECULAR)
43  
44   /* Arrange so double's come first for optimal alignment */
45   /* Pointers and long's come second for 64-bit mode */
# Line 45 | Line 54 | typedef struct ray {
54          RREAL   rod;            /* -DOT(rdir, ron) */
55          RREAL   uv[2];          /* local coordinates */
56          FVECT   pert;           /* surface normal perturbation */
57 <        RREAL   rt;             /* returned effective ray length */
57 >        RREAL   rmt;            /* returned mirrored ray length */
58 >        RREAL   rxt;            /* returned unmirrored ray length */
59          const struct ray  *parent;      /* ray this originated from */
60          OBJECT  *clipset;       /* set of objects currently clipped */
61          OBJECT  *newcset;       /* next clipset, used for transmission */
# Line 55 | Line 65 | typedef struct ray {
65          FULLXF  *rox;           /* object transformation */
66          int     *slights;       /* list of lights to test for scattering */
67          RNUMBER rno;            /* unique ray number */
68 <        int     rlvl;           /* number of reflections for this ray */
69 <        int     rsrc;           /* source we're aiming for */
68 >        OBJECT  robj;           /* intersected object number */
69 >        int     rsrc;           /* source we're aiming for (or ones to skip) */
70          float   rweight;        /* cumulative weight (for termination) */
71 <        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
72 <        COLOR   pcol;           /* pattern color */
73 <        COLOR   rcol;           /* returned radiance value */
71 >        float   gecc;           /* scattering eccentricity coefficient */
72 >        SCOLOR  rcoef;          /* contribution coefficient w.r.t. parent */
73 >        SCOLOR  pcol;           /* pattern color */
74 >        SCOLOR  mcol;           /* mirrored color contribution */
75 >        SCOLOR  rcol;           /* returned radiance value */
76          COLOR   cext;           /* medium extinction coefficient */
77          COLOR   albedo;         /* medium scattering albedo */
78 <        float   gecc;           /* scattering eccentricity coefficient */
79 <        OBJECT  robj;           /* intersected object number */
78 >        short   rflips;         /* surface orientation has been reversed */
79 >        short   rlvl;           /* number of reflections for this ray */
80          short   rtype;          /* ray type */
81          short   crtype;         /* cumulative ray type */
82   }  RAY;
83  
84   #define  rayvalue(r)    (*(r)->revf)(r)
85  
86 < extern char  VersionID[];       /* Radiance version ID string */
86 > #define  thrudir(r,v)   ((r)->rod > 0 ^ DOT((r)->ron,v) > 0)
87  
88 + #define  raydistance(r) (pbright((r)->mcol) > 0.5*pbright((r)->rcol) ? \
89 +                                (r)->rmt : (r)->rxt)
90 +
91 + #define  rayreorient(r) if ((r)->rflips & 1) flipsurface(r); else
92 +
93 + extern char     VersionID[];    /* Radiance version ID string */
94 + extern char     RFeatureList[]; /* newline-separated feature list */
95 +
96   extern CUBE     thescene;       /* our scene */
97   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
98  
99 < extern unsigned long    raynum; /* next ray ID */
100 < extern unsigned long    nrays;  /* total rays traced so far */
99 > extern RNUMBER  raynum;         /* next ray ID */
100 > extern RNUMBER  nrays;          /* total rays traced so far */
101  
102   extern OBJREC  Lamb;            /* a Lambertian surface */
103   extern OBJREC  Aftplane;        /* aft clipping object */
104  
105 < extern void     (*trace)();     /* global trace reporting callback */
105 > extern void     (*trace)(RAY*); /* global trace reporting callback */
106  
107   extern int      dimlist[];      /* dimension list for distribution */
108   extern int      ndims;          /* number of dimensions so far */
109 < extern int      samplendx;      /* index for this sample */
109 > extern unsigned long
110 >                samplendx;      /* index for this sample */
111  
91 extern int      ray_savesiz;    /* size of parameter save buffer */
92
112   extern int      do_irrad;       /* compute irradiance? */
113  
114   extern int      rand_samp;      /* pure Monte Carlo sampling? */
# Line 164 | Line 183 | typedef struct {               /* rendering parameter holder */
183          int     ambincl;
184          short   amblndx[AMBLLEN+1];
185          char    amblval[AMBLLEN*AMBWORD];
186 +        
187 +        /* PMAP: photon mapping parameters */
188 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
189   } RAYPARAMS;
190  
191   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 174 | Line 196 | extern void    headclean(void);
196   extern void     openheader(void);
197   extern void     dupheader(void);
198                                          /* defined in persist.c */
199 < extern void persistfile(char *pfn);
199 > extern void     persistfile(char *pfn);
200   extern void     pfdetach(void);
201   extern void     pfclean(void);
202   extern void     pflock(int lf);
# Line 186 | Line 208 | extern void    free_objmem(void);
208                                          /* defined in preload.c */
209   extern int      load_os(OBJREC *op);
210   extern void     preload_objs(void);
211 + extern char     *shm_boundary;
212 + extern void     cow_memshare(void);
213 + extern void     cow_doneshare(void);
214                                          /* defined in raycalls.c */
215   extern void     ray_init(char *otnm);
216   extern void     ray_trace(RAY *r);
# Line 193 | Line 218 | extern void    ray_done(int freall);
218   extern void     ray_save(RAYPARAMS *rp);
219   extern void     ray_restore(RAYPARAMS *rp);
220   extern void     ray_defaults(RAYPARAMS *rp);
221 + extern void     reset_random(void);
222                                          /* defined in raypcalls.c */
223   extern void     ray_pinit(char *otnm, int nproc);
224 < extern void     ray_psend(RAY *r);
224 > extern int      ray_psend(RAY *r);
225   extern int      ray_pqueue(RAY *r);
226   extern int      ray_presult(RAY *r, int poll);
227   extern void     ray_pdone(int freall);
# Line 206 | Line 232 | extern int     (*ray_fifo_out)(RAY *r);
232   extern int      ray_fifo_in(RAY *r);
233   extern int      ray_fifo_flush(void);
234                                          /* defined in raytrace.c */
235 < extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
235 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const SCOLOR rc);
236   extern void     rayclear(RAY *r);
237   extern void     raytrace(RAY *r);
238 + extern int      rayreject(OBJREC *o, RAY *r, double t, double rod);
239   extern void     rayhit(OBJECT *oset, RAY *r);
240   extern void     raycont(RAY *r);
241   extern void     raytrans(RAY *r);
242 + extern int      raytirrad(OBJREC *m, RAY *r);
243   extern int      rayshade(RAY *r, int mod);
244   extern void     rayparticipate(RAY *r);
245   extern void     raytexture(RAY *r, OBJECT mod);
246   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
247 < extern void     raycontrib(double rc[3], const RAY *r, int flags);
247 > extern void     raycontrib(SCOLOR rc, const RAY *r, int flags);
248   extern double   raydist(const RAY *r, int flags);
249   extern double   raynormal(FVECT norm, RAY *r);
250   extern void     newrayxf(RAY *r);
251   extern void     flipsurface(RAY *r);
252   extern int      localhit(RAY *r, CUBE *scene);
253                                          /* defined in renderopts.c */
254 + extern int      feature_status(int ac, char *av[]);
255   extern int      getrenderopt(int ac, char *av[]);
256   extern void     print_rdefaults(void);
257                                          /* defined in srcdraw.c */
258 < extern void     drawsources(COLOR *pic[], float *zbf[],
258 > extern void     init_drawsources(int rad);
259 > extern void     drawsources(COLORV *pic[], RGBPRIMP primp, float *zbf[],
260                          int x0, int xsiz, int y0, int ysiz);
231 extern void init_drawsources(int rad);
261                                          /* defined in rt/initotypes.c */
262 < extern void initotypes(void);
262 > extern void     initotypes(void);
263                                          /* module main procedures */
264   extern void     rtrace(char *fname, int nproc);
265 < extern char     *formstr(int  f);
265 > extern const char       *formstr(int  f);
266   extern void     rview(void);
267   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
268  
269 + #ifdef __FAST_MATH__
270 + #define checknorm(vn)   (void)normalize(vn)
271 + #else
272 + #define checknorm(vn)
273 + #endif
274  
275   #ifdef __cplusplus
276   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines