ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/cone.h

Comparing ray/src/common/cone.h (file contents):
Revision 1.1 by greg, Thu Feb 2 10:34:15 1989 UTC vs.
Revision 2.4 by schorsch, Fri Jun 6 16:38:47 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 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	+	#include "copyright.h"
19	+
20		typedef struct cone {
21	<	double  *ca;            /* cone arguments (o->oargs.farg) */
21	>	FLOAT  *ca;             /* cone arguments (o->oargs.farg) */
22		char  p0, p1;           /* indices for endpoints */
23		char  r0, r1;           /* indices for radii */
24		FVECT  ad;              /* axis direction vector */
25	<	double  al;             /* axis length */
26	<	double  sl;             /* side length */
27	<	double  (*tm)[4];       /* pointer to transformation matrix */
25	>	FLOAT  al;              /* axis length */
26	>	FLOAT  sl;              /* side length */
27	>	FLOAT  (*tm)[4];        /* pointer to transformation matrix */
28		}  CONE;
29
30		#define  CO_R0(co)      ((co)->ca[(co)->r0])
#	Line 28 | Line 32 | typedef struct cone {
32		#define  CO_P0(co)      ((co)->ca+(co)->p0)
33		#define  CO_P1(co)      ((co)->ca+(co)->p1)
34
35	<	extern CONE  *getcone();
35	>
36	>	extern CONE  *getcone(OBJREC *o, int getxf);
37	>	extern void  freecone(OBJREC *o);
38	>	extern void  conexform(CONE *co);
39	>
40	>
41	>	#ifdef __cplusplus
42	>	}
43	>	#endif
44	>	#endif /* _RAD_CONE_H_ */
45	>

Diff Legend

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