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.28 by greg, Tue Jun 21 15:06:50 2005 UTC vs.
Revision 2.29 by greg, Fri Sep 23 19:04:53 2005 UTC

# Line 28 | Line 28 | extern "C" {
28                                  /* reflected ray types */
29   #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
30  
31 + /* Arrange so double's come first for optimal alignment */
32 + /* Pointers and long's come second for 64-bit mode */
33 + /* Int's next (unknown length), then floats, followed by short's & char's */
34   typedef struct ray {
32        unsigned long  rno;     /* unique ray number */
33        int     rlvl;           /* number of reflections for 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        const struct ray  *parent;      /* ray this originated from */
35          FVECT   rorg;           /* origin of ray */
36          FVECT   rdir;           /* normalized direction of ray */
37 <        double  rmax;           /* maximum distance (aft clipping plane) */
38 <        int     rsrc;           /* source we're aiming for */
37 >        RREAL   rmax;           /* maximum distance (aft clipping plane) */
38 >        RREAL   rot;            /* distance to object */
39 >        FVECT   rop;            /* intersection point */
40 >        FVECT   ron;            /* intersection surface normal */
41 >        RREAL   rod;            /* -DOT(rdir, ron) */
42 >        RREAL   uv[2];          /* local coordinates */
43 >        FVECT   pert;           /* surface normal perturbation */
44 >        RREAL   rt;             /* returned effective ray length */
45 >        const struct ray  *parent;      /* ray this originated from */
46          OBJECT  *clipset;       /* set of objects currently clipped */
47          OBJECT  *newcset;       /* next clipset, used for transmission */
48          void    (*revf)(struct ray *);  /* ray evaluation function */
49          void    (*hitf)(OBJECT *, struct ray *);        /* custom hit test */
47        OBJECT  robj;           /* intersected object number */
50          OBJREC  *ro;            /* intersected object (one with material) */
49        double  rot;            /* distance to object */
50        FVECT   rop;            /* intersection point */
51        FVECT   ron;            /* intersection surface normal */
52        double  rod;            /* -DOT(rdir, ron) */
51          FULLXF  *rox;           /* object transformation */
52 <        RREAL   uv[2];          /* local coordinates */
53 <        FVECT   pert;           /* surface normal perturbation */
52 >        int     *slights;       /* list of lights to test for scattering */
53 >        unsigned long  rno;     /* unique ray number */
54 >        int     rlvl;           /* number of reflections for this ray */
55 >        int     rsrc;           /* source we're aiming for */
56 >        float   rweight;        /* cumulative weight (for termination) */
57 >        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
58          COLOR   pcol;           /* pattern color */
59          COLOR   rcol;           /* returned radiance value */
58        double  rt;             /* returned effective ray length */
60          COLOR   cext;           /* medium extinction coefficient */
61          COLOR   albedo;         /* medium scattering albedo */
62          float   gecc;           /* scattering eccentricity coefficient */
63 <        int     *slights;       /* list of lights to test for scattering */
63 >        OBJECT  robj;           /* intersected object number */
64 >        short   rtype;          /* ray type */
65 >        short   crtype;         /* cumulative ray type */
66   }  RAY;
67  
68   #define  rayvalue(r)    (*(r)->revf)(r)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines