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.1 by greg, Thu Feb 2 10:34:15 1989 UTC vs.
Revision 2.3 by greg, Tue Feb 25 02:47:21 2003 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 13 | Line 10
10   *     2/12/86
11   */
12  
13 + #include "copyright.h"
14 +
15   typedef struct cone {
16 <        double  *ca;            /* cone arguments (o->oargs.farg) */
16 >        FLOAT  *ca;             /* cone arguments (o->oargs.farg) */
17          char  p0, p1;           /* indices for endpoints */
18          char  r0, r1;           /* indices for radii */
19          FVECT  ad;              /* axis direction vector */
20 <        double  al;             /* axis length */
21 <        double  sl;             /* side length */
22 <        double  (*tm)[4];       /* pointer to transformation matrix */
20 >        FLOAT  al;              /* axis length */
21 >        FLOAT  sl;              /* side length */
22 >        FLOAT  (*tm)[4];        /* pointer to transformation matrix */
23   }  CONE;
24  
25   #define  CO_R0(co)      ((co)->ca[(co)->r0])
# Line 28 | Line 27 | typedef struct cone {
27   #define  CO_P0(co)      ((co)->ca+(co)->p0)
28   #define  CO_P1(co)      ((co)->ca+(co)->p1)
29  
30 + #ifdef NOPROTO
31 +
32   extern CONE  *getcone();
33 + extern void  freecone();
34 + extern void  conexform();
35 +
36 + #else
37 +
38 + extern CONE  *getcone(OBJREC *o, int getxf);
39 + extern void  freecone(OBJREC *o);
40 + extern void  conexform(CONE *co);
41 +
42 + #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines