ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/cone.h
(Generate patch)

Comparing ray/src/common/cone.h (file contents):
Revision 2.6 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.8 by greg, Fri Sep 23 19:04:52 2005 UTC

# Line 16 | Line 16 | extern "C" {
16   #endif
17  
18   typedef struct cone {
19        RREAL  *ca;             /* cone arguments (o->oargs.farg) */
20        char  p0, p1;           /* indices for endpoints */
21        char  r0, r1;           /* indices for radii */
19          FVECT  ad;              /* axis direction vector */
20          RREAL  al;              /* axis length */
21          RREAL  sl;              /* side length */
22 +        RREAL  *ca;             /* cone arguments (o->oargs.farg) */
23          RREAL  (*tm)[4];        /* pointer to transformation matrix */
24 +        char  p0, p1;           /* indices for endpoints */
25 +        char  r0, r1;           /* indices for radii */
26   }  CONE;
27  
28 < #define  CO_R0(co)      ((co)->ca[(co)->r0])
29 < #define  CO_R1(co)      ((co)->ca[(co)->r1])
28 > #define  CO_R0(co)      ((co)->ca[(int)((co)->r0)])
29 > #define  CO_R1(co)      ((co)->ca[(int)((co)->r1)])
30   #define  CO_P0(co)      ((co)->ca+(co)->p0)
31   #define  CO_P1(co)      ((co)->ca+(co)->p1)
32  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines