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.39 by greg, Tue Nov 13 19:58:33 2018 UTC vs.
Revision 2.46 by greg, Fri Sep 23 21:53:34 2022 UTC

# Line 57 | Line 57 | typedef struct ray {
57          FULLXF  *rox;           /* object transformation */
58          int     *slights;       /* list of lights to test for scattering */
59          RNUMBER rno;            /* unique ray number */
60 <        int     rlvl;           /* number of reflections for this ray */
60 >        OBJECT  robj;           /* intersected object number */
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 */
68          COLOR   cext;           /* medium extinction coefficient */
69          COLOR   albedo;         /* medium scattering albedo */
70 <        float   gecc;           /* scattering eccentricity coefficient */
71 <        OBJECT  robj;           /* intersected object number */
70 >        short   rflips;         /* surface orientation has been reversed */
71 >        short   rlvl;           /* number of reflections for this ray */
72          short   rtype;          /* ray type */
73          short   crtype;         /* cumulative ray type */
74   }  RAY;
# Line 77 | Line 78 | typedef struct ray {
78   #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((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 */
84  
85   extern CUBE     thescene;       /* our scene */
# Line 94 | Line 97 | extern int     dimlist[];      /* dimension list for distributi
97   extern int      ndims;          /* number of dimensions so far */
98   extern int      samplendx;      /* index for this sample */
99  
97 extern int      ray_savesiz;    /* size of parameter save buffer */
98
100   extern int      do_irrad;       /* compute irradiance? */
101  
102   extern int      rand_samp;      /* pure Monte Carlo sampling? */
# Line 183 | Line 184 | extern void    headclean(void);
184   extern void     openheader(void);
185   extern void     dupheader(void);
186                                          /* defined in persist.c */
187 < extern void persistfile(char *pfn);
187 > extern void     persistfile(char *pfn);
188   extern void     pfdetach(void);
189   extern void     pfclean(void);
190   extern void     pflock(int lf);
# Line 218 | Line 219 | extern int     ray_fifo_flush(void);
219   extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
220   extern void     rayclear(RAY *r);
221   extern void     raytrace(RAY *r);
222 + extern int      rayreject(OBJREC *o, RAY *r, double t);
223   extern void     rayhit(OBJECT *oset, RAY *r);
224   extern void     raycont(RAY *r);
225   extern void     raytrans(RAY *r);
226 + extern int      raytirrad(OBJREC *m, RAY *r);
227   extern int      rayshade(RAY *r, int mod);
228   extern void     rayparticipate(RAY *r);
229   extern void     raytexture(RAY *r, OBJECT mod);
# Line 237 | Line 240 | extern void    print_rdefaults(void);
240                                          /* defined in srcdraw.c */
241   extern void     drawsources(COLOR *pic[], float *zbf[],
242                          int x0, int xsiz, int y0, int ysiz);
243 < extern void init_drawsources(int rad);
243 > extern void     init_drawsources(int rad);
244                                          /* defined in rt/initotypes.c */
245 < extern void initotypes(void);
245 > extern void     initotypes(void);
246                                          /* module main procedures */
247   extern void     rtrace(char *fname, int nproc);
248   extern char     *formstr(int  f);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines