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.43 by greg, Mon Jun 15 15:44:03 2020 UTC vs.
Revision 2.57 by greg, Fri Nov 15 20:47:42 2024 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         32      /* maximum number of sampling dimensions */
23  
24                                  /* ray type flags */
25   #define  PRIMARY        01              /* original ray */
26 < #define  SHADOW         02              /* ray to light source */
26 > #define  RSHADOW        02              /* reflected ray to light source */
27   #define  REFLECTED      04              /* reflected ray */
28   #define  REFRACTED      010             /* refracted (bent) ray */
29   #define  TRANS          020             /* transmitted/transferred ray */
30 < #define  AMBIENT        040             /* ray scattered for interreflection */
31 < #define  SPECULAR       0100            /* ray scattered for specular */
30 > #define  RAMBIENT       040             /* reflected diffuse interreflection */
31 > #define  RSPECULAR      0100            /* reflected specular */
32 > #define  TSHADOW        0200            /* transmitted shadow */
33 > #define  TAMBIENT       0400            /* transmitted ambient */
34 > #define  TSPECULAR      01000           /* transmitted specular */
35 > #define  SHADOW         (RSHADOW|TSHADOW)
36 > #define  AMBIENT        (RAMBIENT|TAMBIENT)
37 > #define  SPECULAR       (RSPECULAR|TSPECULAR)
38  
39                                  /* reflected ray types */
40 < #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
40 > #define  RAYREFL        (RSHADOW|REFLECTED|RAMBIENT|RSPECULAR)
41  
42   /* Arrange so double's come first for optimal alignment */
43   /* Pointers and long's come second for 64-bit mode */
# Line 58 | Line 64 | typedef struct ray {
64          int     *slights;       /* list of lights to test for scattering */
65          RNUMBER rno;            /* unique ray number */
66          OBJECT  robj;           /* intersected object number */
67 <        int     rsrc;           /* source we're aiming for */
67 >        int     rsrc;           /* source we're aiming for (or ones to skip) */
68 > #ifdef SSKIPOPT
69 >        float   scorr;          /* correction factor for included sources */
70 > #endif
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
93  
94 < extern char  VersionID[];       /* Radiance version ID string */
94 > extern char     VersionID[];    /* Radiance version ID string */
95 > extern char     RFeatureList[]; /* newline-separated feature list */
96  
97   extern CUBE     thescene;       /* our scene */
98   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
# Line 91 | 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 */
111  
100 extern int      ray_savesiz;    /* size of parameter save buffer */
101
112   extern int      do_irrad;       /* compute irradiance? */
113  
114   extern int      rand_samp;      /* pure Monte Carlo sampling? */
# Line 137 | Line 147 | extern int     ambincl;        /* include == 1, exclude == 0 */
147  
148   extern int      ray_pnprocs;    /* number of child processes */
149   extern int      ray_pnidle;     /* number of idle processes */
140 extern int      ray_pnbatch;    /* throughput over responsiveness? */
150  
151   #ifndef AMBLLEN
152   #define AMBLLEN         512     /* max. ambient list length */
# Line 187 | 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 199 | 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 219 | Line 231 | extern int     (*ray_fifo_out)(RAY *r);
231   extern int      ray_fifo_in(RAY *r);
232   extern int      ray_fifo_flush(void);
233                                          /* defined in raytrace.c */
234 < extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
234 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const SCOLOR rc);
235   extern void     rayclear(RAY *r);
236   extern void     raytrace(RAY *r);
237 + extern int      rayreject(OBJREC *o, RAY *r, double t, double rod);
238   extern void     rayhit(OBJECT *oset, RAY *r);
239   extern void     raycont(RAY *r);
240   extern void     raytrans(RAY *r);
# Line 230 | Line 243 | extern int     rayshade(RAY *r, int mod);
243   extern void     rayparticipate(RAY *r);
244   extern void     raytexture(RAY *r, OBJECT mod);
245   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
246 < extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
246 > extern void     raycontrib(SCOLOR rc, const RAY *r, int flags);
247   extern double   raydist(const RAY *r, int flags);
248   extern double   raynormal(FVECT norm, RAY *r);
249   extern void     newrayxf(RAY *r);
250   extern void     flipsurface(RAY *r);
251   extern int      localhit(RAY *r, CUBE *scene);
252                                          /* defined in renderopts.c */
253 + extern int      feature_status(int ac, char *av[]);
254   extern int      getrenderopt(int ac, char *av[]);
255   extern void     print_rdefaults(void);
256                                          /* defined in srcdraw.c */
257 < extern void     drawsources(COLOR *pic[], float *zbf[],
257 > extern void     init_drawsources(int rad);
258 > extern void     drawsources(COLORV *pic[], RGBPRIMP primp, float *zbf[],
259                          int x0, int xsiz, int y0, int ysiz);
245 extern void init_drawsources(int rad);
260                                          /* defined in rt/initotypes.c */
261 < extern void initotypes(void);
261 > extern void     initotypes(void);
262                                          /* module main procedures */
263   extern void     rtrace(char *fname, int nproc);
264 < extern char     *formstr(int  f);
264 > extern const char       *formstr(int  f);
265   extern void     rview(void);
266   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
267  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines