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 1.2 by greg, Wed Oct 23 12:19:24 1991 UTC vs.
Revision 2.8 by greg, Fri Sep 23 19:04:52 2005 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   *  cone.h - header file for cones (cones, cylinders, rings, cups, tubes).
4   *
# Line 12 | Line 9
9   *
10   *     2/12/86
11   */
12 + #ifndef _RAD_CONE_H_
13 + #define _RAD_CONE_H_
14 + #ifdef __cplusplus
15 + extern "C" {
16 + #endif
17  
18   typedef struct cone {
19 <        FLOAT  *ca;             /* cone arguments (o->oargs.farg) */
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 */
20        FVECT  ad;              /* axis direction vector */
21        FLOAT  al;              /* axis length */
22        FLOAT  sl;              /* side length */
23        FLOAT  (*tm)[4];        /* pointer to transformation matrix */
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  
33 < extern CONE  *getcone();
33 >
34 > extern CONE  *getcone(OBJREC *o, int getxf);
35 > extern void  freecone(OBJREC *o);
36 > extern void  conexform(CONE *co);
37 >
38 >
39 > #ifdef __cplusplus
40 > }
41 > #endif
42 > #endif /* _RAD_CONE_H_ */
43 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines