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.47 by greg, Wed Oct 19 21:25:20 2022 UTC vs.
Revision 2.62 by greg, Fri Jun 20 18:05:30 2025 UTC

# Line 16 | Line 16 | 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 > #define  dec_ndims()    (ndims -= ndims>0)
26  
27                                  /* ray type flags */
28   #define  PRIMARY        01              /* original ray */
29 < #define  SHADOW         02              /* ray to light source */
29 > #define  RSHADOW        02              /* reflected ray to light source */
30   #define  REFLECTED      04              /* reflected ray */
31   #define  REFRACTED      010             /* refracted (bent) ray */
32   #define  TRANS          020             /* transmitted/transferred ray */
33 < #define  AMBIENT        040             /* ray scattered for interreflection */
34 < #define  SPECULAR       0100            /* ray scattered for specular */
33 > #define  RAMBIENT       040             /* reflected diffuse interreflection */
34 > #define  RSPECULAR      0100            /* reflected specular */
35 > #define  TSHADOW        0200            /* transmitted shadow */
36 > #define  TAMBIENT       0400            /* transmitted ambient */
37 > #define  TSPECULAR      01000           /* transmitted specular */
38 > #define  SHADOW         (RSHADOW|TSHADOW)
39 > #define  AMBIENT        (RAMBIENT|TAMBIENT)
40 > #define  SPECULAR       (RSPECULAR|TSPECULAR)
41  
42                                  /* reflected ray types */
43 < #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
43 > #define  RAYREFL        (RSHADOW|REFLECTED|RAMBIENT|RSPECULAR)
44  
45   /* Arrange so double's come first for optimal alignment */
46   /* Pointers and long's come second for 64-bit mode */
# Line 58 | Line 67 | typedef struct ray {
67          int     *slights;       /* list of lights to test for scattering */
68          RNUMBER rno;            /* unique ray number */
69          OBJECT  robj;           /* intersected object number */
70 <        int     rsrc;           /* source we're aiming for */
70 >        int     rsrc;           /* source we're aiming for (or ones to skip) */
71          float   rweight;        /* cumulative weight (for termination) */
72          float   gecc;           /* scattering eccentricity coefficient */
73 <        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
74 <        COLOR   pcol;           /* pattern color */
75 <        COLOR   mcol;           /* mirrored color contribution */
76 <        COLOR   rcol;           /* returned radiance value */
73 >        SCOLOR  rcoef;          /* contribution coefficient w.r.t. parent */
74 >        SCOLOR  pcol;           /* pattern color */
75 >        SCOLOR  mcol;           /* mirrored color contribution */
76 >        SCOLOR  rcol;           /* returned radiance value */
77          COLOR   cext;           /* medium extinction coefficient */
78          COLOR   albedo;         /* medium scattering albedo */
79          short   rflips;         /* surface orientation has been reversed */
# Line 75 | Line 84 | typedef struct ray {
84  
85   #define  rayvalue(r)    (*(r)->revf)(r)
86  
87 < #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((r)->rcol) ? \
87 > #define  thrudir(r,v)   ((r)->rod > 0 ^ DOT((r)->ron,v) > 0)
88 >
89 > #define  raydistance(r) (pbright((r)->mcol) > 0.5*pbright((r)->rcol) ? \
90                                  (r)->rmt : (r)->rxt)
91  
92   #define  rayreorient(r) if ((r)->rflips & 1) flipsurface(r); else
# Line 92 | Line 103 | extern RNUMBER nrays;          /* total rays traced so far */
103   extern OBJREC  Lamb;            /* a Lambertian surface */
104   extern OBJREC  Aftplane;        /* aft clipping object */
105  
106 < extern void     (*trace)();     /* global trace reporting callback */
106 > extern void     (*trace)(RAY*); /* global trace reporting callback */
107  
108   extern int      dimlist[];      /* dimension list for distribution */
109   extern int      ndims;          /* number of dimensions so far */
110 < extern int      samplendx;      /* index for this sample */
110 > extern unsigned long
111 >                samplendx;      /* index for this sample */
112  
113   extern int      do_irrad;       /* compute irradiance? */
114  
# Line 197 | Line 209 | extern void    free_objmem(void);
209                                          /* defined in preload.c */
210   extern int      load_os(OBJREC *op);
211   extern void     preload_objs(void);
212 + extern char     *shm_boundary;
213 + extern void     cow_memshare(void);
214 + extern void     cow_doneshare(void);
215                                          /* defined in raycalls.c */
216   extern void     ray_init(char *otnm);
217   extern void     ray_trace(RAY *r);
# Line 204 | Line 219 | extern void    ray_done(int freall);
219   extern void     ray_save(RAYPARAMS *rp);
220   extern void     ray_restore(RAYPARAMS *rp);
221   extern void     ray_defaults(RAYPARAMS *rp);
222 + extern void     reset_random(void);
223                                          /* defined in raypcalls.c */
224   extern void     ray_pinit(char *otnm, int nproc);
225   extern int      ray_psend(RAY *r);
# Line 217 | Line 233 | extern int     (*ray_fifo_out)(RAY *r);
233   extern int      ray_fifo_in(RAY *r);
234   extern int      ray_fifo_flush(void);
235                                          /* defined in raytrace.c */
236 < extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
236 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const SCOLOR rc);
237   extern void     rayclear(RAY *r);
238   extern void     raytrace(RAY *r);
239 < extern int      rayreject(OBJREC *o, RAY *r, double t);
239 > extern int      rayreject(OBJREC *o, RAY *r, double t, double rod);
240   extern void     rayhit(OBJECT *oset, RAY *r);
241   extern void     raycont(RAY *r);
242   extern void     raytrans(RAY *r);
# Line 229 | Line 245 | extern int     rayshade(RAY *r, int mod);
245   extern void     rayparticipate(RAY *r);
246   extern void     raytexture(RAY *r, OBJECT mod);
247   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
248 < extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
248 > extern void     raycontrib(SCOLOR rc, const RAY *r, int flags);
249   extern double   raydist(const RAY *r, int flags);
250   extern double   raynormal(FVECT norm, RAY *r);
251   extern void     newrayxf(RAY *r);
# Line 240 | Line 256 | extern int     feature_status(int ac, char *av[]);
256   extern int      getrenderopt(int ac, char *av[]);
257   extern void     print_rdefaults(void);
258                                          /* defined in srcdraw.c */
243 extern void     drawsources(COLOR *pic[], float *zbf[],
244                        int x0, int xsiz, int y0, int ysiz);
259   extern void     init_drawsources(int rad);
260 + extern void     drawsources(COLORV *pic[], RGBPRIMP primp, float *zbf[],
261 +                        int x0, int xsiz, int y0, int ysiz);
262                                          /* defined in rt/initotypes.c */
263   extern void     initotypes(void);
264                                          /* module main procedures */
265   extern void     rtrace(char *fname, int nproc);
266 < extern char     *formstr(int  f);
266 > extern const char       *formstr(int  f);
267   extern void     rview(void);
268   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
269  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines