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.42 by greg, Wed Feb 26 17:58:06 2020 UTC vs.
Revision 2.51 by greg, Wed Nov 15 18:02:53 2023 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 */
# Line 61 | Line 61 | typedef struct ray {
61          int     rsrc;           /* source we're aiming for */
62          float   rweight;        /* cumulative weight (for termination) */
63          float   gecc;           /* scattering eccentricity coefficient */
64 <        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
65 <        COLOR   pcol;           /* pattern color */
66 <        COLOR   mcol;           /* mirrored color contribution */
67 <        COLOR   rcol;           /* returned radiance value */
64 >        SCOLOR  rcoef;          /* contribution coefficient w.r.t. parent */
65 >        SCOLOR  pcol;           /* pattern color */
66 >        SCOLOR  mcol;           /* mirrored color contribution */
67 >        SCOLOR  rcol;           /* returned radiance value */
68          COLOR   cext;           /* medium extinction coefficient */
69          COLOR   albedo;         /* medium scattering albedo */
70          short   rflips;         /* surface orientation has been reversed */
# Line 75 | Line 75 | typedef struct ray {
75  
76   #define  rayvalue(r)    (*(r)->revf)(r)
77  
78 < #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((r)->rcol) ? \
78 > #define  raydistance(r) (pbright((r)->mcol) > 0.5*pbright((r)->rcol) ? \
79                                  (r)->rmt : (r)->rxt)
80  
81   #define  rayreorient(r) if ((r)->rflips & 1) flipsurface(r); else
82  
83 < extern char  VersionID[];       /* Radiance version ID string */
83 > extern char     VersionID[];    /* Radiance version ID string */
84 > extern char     RFeatureList[]; /* newline-separated feature list */
85  
86   extern CUBE     thescene;       /* our scene */
87   extern OBJECT   nsceneobjs;     /* number of objects in our scene */
# Line 91 | Line 92 | extern RNUMBER nrays;          /* total rays traced so far */
92   extern OBJREC  Lamb;            /* a Lambertian surface */
93   extern OBJREC  Aftplane;        /* aft clipping object */
94  
95 < extern void     (*trace)();     /* global trace reporting callback */
95 > extern void     (*trace)(RAY*); /* global trace reporting callback */
96  
97   extern int      dimlist[];      /* dimension list for distribution */
98   extern int      ndims;          /* number of dimensions so far */
99   extern int      samplendx;      /* index for this sample */
100  
100 extern int      ray_savesiz;    /* size of parameter save buffer */
101
101   extern int      do_irrad;       /* compute irradiance? */
102  
103   extern int      rand_samp;      /* pure Monte Carlo sampling? */
# Line 186 | Line 185 | extern void    headclean(void);
185   extern void     openheader(void);
186   extern void     dupheader(void);
187                                          /* defined in persist.c */
188 < extern void persistfile(char *pfn);
188 > extern void     persistfile(char *pfn);
189   extern void     pfdetach(void);
190   extern void     pfclean(void);
191   extern void     pflock(int lf);
# Line 218 | Line 217 | extern int     (*ray_fifo_out)(RAY *r);
217   extern int      ray_fifo_in(RAY *r);
218   extern int      ray_fifo_flush(void);
219                                          /* defined in raytrace.c */
220 < extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
220 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const SCOLOR rc);
221   extern void     rayclear(RAY *r);
222   extern void     raytrace(RAY *r);
223 + extern int      rayreject(OBJREC *o, RAY *r, double t, double rod);
224   extern void     rayhit(OBJECT *oset, RAY *r);
225   extern void     raycont(RAY *r);
226   extern void     raytrans(RAY *r);
# Line 229 | Line 229 | extern int     rayshade(RAY *r, int mod);
229   extern void     rayparticipate(RAY *r);
230   extern void     raytexture(RAY *r, OBJECT mod);
231   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
232 < extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
232 > extern void     raycontrib(SCOLOR rc, const RAY *r, int flags);
233   extern double   raydist(const RAY *r, int flags);
234   extern double   raynormal(FVECT norm, RAY *r);
235   extern void     newrayxf(RAY *r);
236   extern void     flipsurface(RAY *r);
237   extern int      localhit(RAY *r, CUBE *scene);
238                                          /* defined in renderopts.c */
239 + extern int      feature_status(int ac, char *av[]);
240   extern int      getrenderopt(int ac, char *av[]);
241   extern void     print_rdefaults(void);
242                                          /* defined in srcdraw.c */
243   extern void     drawsources(COLOR *pic[], float *zbf[],
244                          int x0, int xsiz, int y0, int ysiz);
245 < extern void init_drawsources(int rad);
245 > extern void     init_drawsources(int rad);
246                                          /* defined in rt/initotypes.c */
247 < extern void initotypes(void);
247 > extern void     initotypes(void);
248                                          /* module main procedures */
249   extern void     rtrace(char *fname, int nproc);
250 < extern char     *formstr(int  f);
250 > extern const char       *formstr(int  f);
251   extern void     rview(void);
252   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
253  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines