ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.24 by greg, Fri Apr 15 04:44:51 2005 UTC

# Line 41 | Line 41 | typedef struct ray {
41          int     rsrc;           /* source we're aiming for */
42          OBJECT  *clipset;       /* set of objects currently clipped */
43          OBJECT  *newcset;       /* next clipset, used for transmission */
44 –        void    (*revf)(struct ray *);  /* evaluation function for this ray */
44          void    (*hitf)(OBJECT *, struct ray *);        /* custom hit test */
45          OBJECT  robj;           /* intersected object number */
46          OBJREC  *ro;            /* intersected object (one with material) */
# Line 53 | Line 52 | typedef struct ray {
52          RREAL   uv[2];          /* local coordinates */
53          FVECT   pert;           /* surface normal perturbation */
54          COLOR   pcol;           /* pattern color */
55 <        COLOR   rcol;           /* returned ray value */
55 >        COLOR   rcol;           /* returned radiance value */
56          double  rt;             /* returned effective ray length */
57          COLOR   cext;           /* medium extinction coefficient */
58          COLOR   albedo;         /* medium scattering albedo */
# Line 61 | Line 60 | typedef struct ray {
60          int     *slights;       /* list of lights to test for scattering */
61   }  RAY;
62  
64 – #define  rayvalue(r)    (*(r)->revf)(r)
65 –
63   extern char  VersionID[];       /* Radiance version ID string */
64  
65   extern CUBE     thescene;       /* our scene */
# Line 193 | Line 190 | extern void    ray_pclose(int nsub);
190                                          /* defined in raytrace.c */
191   extern int      rayorigin(RAY *r, RAY *ro, int rt, double rw);
192   extern void     rayclear(RAY *r);
193 < extern void     raytrace(RAY *r);
193 > extern void     rayvalue(RAY *r);
194   extern void     rayhit(OBJECT *oset, RAY *r);
195   extern void     raycont(RAY *r);
196   extern void     raytrans(RAY *r);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)