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.23 by greg, Fri Nov 5 17:36:55 2004 UTC vs.
Revision 2.25 by greg, Tue Apr 19 01:15:06 2005 UTC

# Line 31 | Line 31 | extern "C" {
31   typedef struct ray {
32          unsigned long  rno;     /* unique ray number */
33          int     rlvl;           /* number of reflections for this ray */
34 <        float   rweight;        /* cumulative weight of this ray */
34 >        float   rweight;        /* cumulative weight (for termination) */
35 >        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
36          short   rtype;          /* ray type */
37          short   crtype;         /* cumulative ray type */
38 <        struct ray  *parent;    /* ray this originated from */
38 >        const struct ray  *parent;      /* ray this originated from */
39          FVECT   rorg;           /* origin of ray */
40          FVECT   rdir;           /* normalized direction of ray */
41          double  rmax;           /* maximum distance (aft clipping plane) */
42          int     rsrc;           /* source we're aiming for */
43          OBJECT  *clipset;       /* set of objects currently clipped */
44          OBJECT  *newcset;       /* next clipset, used for transmission */
44 –        void    (*revf)(struct ray *);  /* evaluation function for this ray */
45          void    (*hitf)(OBJECT *, struct ray *);        /* custom hit test */
46          OBJECT  robj;           /* intersected object number */
47          OBJREC  *ro;            /* intersected object (one with material) */
# Line 53 | Line 53 | typedef struct ray {
53          RREAL   uv[2];          /* local coordinates */
54          FVECT   pert;           /* surface normal perturbation */
55          COLOR   pcol;           /* pattern color */
56 <        COLOR   rcol;           /* returned ray value */
56 >        COLOR   rcol;           /* returned radiance value */
57          double  rt;             /* returned effective ray length */
58          COLOR   cext;           /* medium extinction coefficient */
59          COLOR   albedo;         /* medium scattering albedo */
# Line 61 | Line 61 | typedef struct ray {
61          int     *slights;       /* list of lights to test for scattering */
62   }  RAY;
63  
64 – #define  rayvalue(r)    (*(r)->revf)(r)
65 –
64   extern char  VersionID[];       /* Radiance version ID string */
65  
66   extern CUBE     thescene;       /* our scene */
# Line 191 | Line 189 | extern void    ray_pdone(int freall);
189   extern void     ray_popen(int nadd);
190   extern void     ray_pclose(int nsub);
191                                          /* defined in raytrace.c */
192 < extern int      rayorigin(RAY *r, RAY *ro, int rt, double rw);
192 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
193   extern void     rayclear(RAY *r);
194 < extern void     raytrace(RAY *r);
194 > extern void     rayvalue(RAY *r);
195   extern void     rayhit(OBJECT *oset, RAY *r);
196   extern void     raycont(RAY *r);
197   extern void     raytrans(RAY *r);
# Line 201 | Line 199 | extern int     rayshade(RAY *r, int mod);
199   extern void     rayparticipate(RAY *r);
200   extern void     raytexture(RAY *r, OBJECT mod);
201   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
202 < extern double   raydist(RAY *r, int flags);
202 > extern void     raycontrib(COLOR rc, const RAY *r, int flags);
203 > extern double   raydist(const RAY *r, int flags);
204   extern double   raynormal(FVECT norm, RAY *r);
205   extern void     newrayxf(RAY *r);
206   extern void     flipsurface(RAY *r);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines