--- ray/src/cv/mgflib/parser.h	1995/02/24 16:50:05	1.17
+++ ray/src/cv/mgflib/parser.h	1995/03/10 15:16:42	1.19
@@ -11,36 +11,37 @@
 			/* Entities (order doesn't really matter) */
 #define MG_E_COMMENT	0
 #define MG_E_COLOR	1
-#define MG_E_CONE	2
-#define MG_E_CMIX	3
-#define MG_E_CSPEC	4
-#define MG_E_CXY	5
-#define MG_E_CYL	6
-#define MG_E_ED		7
-#define MG_E_FACE	8
-#define MG_E_INCLUDE	9
-#define MG_E_IES	10
-#define MG_E_MATERIAL	11
-#define MG_E_NORMAL	12
-#define MG_E_OBJECT	13
-#define MG_E_POINT	14
-#define MG_E_PRISM	15
-#define MG_E_RD		16
-#define MG_E_RING	17
-#define MG_E_RS		18
-#define MG_E_SIDES	19
-#define MG_E_SPH	20
-#define MG_E_TD		21
-#define MG_E_TORUS	22
-#define MG_E_TS		23
-#define MG_E_VERTEX	24
-#define MG_E_XF		25
+#define MG_E_CCT	2
+#define MG_E_CONE	3
+#define MG_E_CMIX	4
+#define MG_E_CSPEC	5
+#define MG_E_CXY	6
+#define MG_E_CYL	7
+#define MG_E_ED		8
+#define MG_E_FACE	9
+#define MG_E_INCLUDE	10
+#define MG_E_IES	11
+#define MG_E_MATERIAL	12
+#define MG_E_NORMAL	13
+#define MG_E_OBJECT	14
+#define MG_E_POINT	15
+#define MG_E_PRISM	16
+#define MG_E_RD		17
+#define MG_E_RING	18
+#define MG_E_RS		19
+#define MG_E_SIDES	20
+#define MG_E_SPH	21
+#define MG_E_TD		22
+#define MG_E_TORUS	23
+#define MG_E_TS		24
+#define MG_E_VERTEX	25
+#define MG_E_XF		26
 
-#define MG_NENTITIES	26
+#define MG_NENTITIES	27
 
-#define MG_NAMELIST	{"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
-			"i","ies","m","n","o","p","prism","rd","ring","rs",\
-			"sides","sph","td","torus","ts","v","xf"}
+#define MG_NAMELIST	{"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
+			"f","i","ies","m","n","o","p","prism","rd","ring",\
+			"rs","sides","sph","td","torus","ts","v","xf"}
 
 #define MG_MAXELEN	6
 
@@ -205,9 +206,9 @@ extern double	normalize(FVECT);	/* normalize a vector 
 
 typedef struct {
 	int	clock;			/* incremented each change */
-	unsigned short	flags;		/* what's been set */
-	unsigned short	ssamp[C_CNSS];	/* spectral samples, min wl to max */
-	unsigned long	ssum;		/* straight sum of spectral values */
+	short	flags;			/* what's been set */
+	short	ssamp[C_CNSS];		/* spectral samples, min wl to max */
+	long	ssum;			/* straight sum of spectral values */
 	float	cx, cy;			/* xy chromaticity value */
 	float	eff;			/* efficacy (lumens/watt) */
 } C_COLOR;
@@ -221,24 +222,6 @@ typedef struct {
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
 			(long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
-
-#define C_CIEX		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
-			{14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
-			320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
-			10622,10026,8544,6424,4479,2835,1649,874,468,227,\
-			114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 }
-
-#define C_CIEY		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
-			{0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
-			5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
-			5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
-			5,2,1,1,0,0}, 106856L, .398, .542, 493.525 }
-
-#define C_CIEZ		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
-			{65,201,679,2074,6456,13856,17471,17721,16692,\
-			12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
-			11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
-			106770L, .147, .077, 54.363 }
 
 #define c_cval(c,l)	((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)