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.50 by greg, Thu Mar 16 00:25:24 2023 UTC vs.
Revision 2.60 by greg, Fri Jun 20 16:34:23 2025 UTC

# Line 19 | Line 19 | extern "C" {
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 58 | Line 66 | typedef struct ray {
66          int     *slights;       /* list of lights to test for scattering */
67          RNUMBER rno;            /* unique ray number */
68          OBJECT  robj;           /* intersected object number */
69 <        int     rsrc;           /* source we're aiming for */
69 >        int     rsrc;           /* source we're aiming for (or ones to skip) */
70          float   rweight;        /* cumulative weight (for termination) */
71          float   gecc;           /* scattering eccentricity coefficient */
72 <        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
73 <        COLOR   pcol;           /* pattern color */
74 <        COLOR   mcol;           /* mirrored color contribution */
75 <        COLOR   rcol;           /* returned radiance value */
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          short   rflips;         /* surface orientation has been reversed */
# Line 75 | Line 83 | typedef struct ray {
83  
84   #define  rayvalue(r)    (*(r)->revf)(r)
85  
86 < #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((r)->rcol) ? \
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
# Line 96 | Line 106 | extern void    (*trace)(RAY*); /* global trace reporting
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  
112   extern int      do_irrad;       /* compute irradiance? */
113  
# Line 197 | 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 204 | 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 int      ray_psend(RAY *r);
# Line 217 | 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);
# Line 229 | Line 244 | 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(RREAL 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);
# Line 240 | Line 255 | 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 */
243 extern void     drawsources(COLOR *pic[], float *zbf[],
244                        int x0, int xsiz, int y0, int ysiz);
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);
261                                          /* defined in rt/initotypes.c */
262   extern void     initotypes(void);
263                                          /* module main procedures */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines