--- ray/src/cv/mgflib/parser.h	1994/09/01 09:17:46	1.15
+++ ray/src/cv/mgflib/parser.h	1995/04/13 12:54:23	1.20
@@ -11,36 +11,38 @@
 			/* 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_IR		12
+#define MG_E_MATERIAL	13
+#define MG_E_NORMAL	14
+#define MG_E_OBJECT	15
+#define MG_E_POINT	16
+#define MG_E_PRISM	17
+#define MG_E_RD		18
+#define MG_E_RING	19
+#define MG_E_RS		20
+#define MG_E_SIDES	21
+#define MG_E_SPH	22
+#define MG_E_TD		23
+#define MG_E_TORUS	24
+#define MG_E_TS		25
+#define MG_E_VERTEX	26
+#define MG_E_XF		27
 
-#define MG_NENTITIES	26
+#define MG_NENTITIES	28
 
-#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","ir","m","n","o","p","prism","rd",\
+			"ring","rs","sides","sph","td","torus","ts","v","xf"}
 
 #define MG_MAXELEN	6
 
@@ -90,7 +92,7 @@ extern char	*mg_err[MG_NERRS];
  * returns 0 when the end of file has been reached.
  */
 
-#define MG_MAXLINE	512		/* maximum input line length */
+#define MG_MAXLINE	4096		/* maximum input line length */
 #define MG_MAXARGC	(MG_MAXLINE/4)	/* maximum argument count */
 
 typedef struct mg_fctxt {
@@ -195,11 +197,13 @@ extern double	normalize(FVECT);	/* normalize a vector 
 #define C_CNSS		41		/* number of spectral samples */
 #define C_CWLI		((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
 #define C_CMAXV		10000		/* nominal maximum sample value */
+#define C_CLPWM		(683./C_CMAXV)	/* peak lumens/watt multiplier */
 
 #define C_CSSPEC	01		/* flag if spectrum is set */
 #define C_CDSPEC	02		/* flag if defined w/ spectrum */
 #define C_CSXY		04		/* flag if xy is set */
 #define C_CDXY		010		/* flag if defined w/ xy */
+#define C_CSEFF		020		/* flag if efficacy set */
 
 typedef struct {
 	int	clock;			/* incremented each change */
@@ -207,9 +211,10 @@ typedef struct {
 	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;
 
-#define C_DEFCOLOR	{ 1, C_CDXY|C_CSXY|C_CSSPEC,\
+#define C_DEFCOLOR	{ 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
 			{C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
@@ -217,31 +222,16 @@ 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,\
 			C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
-			(long)C_CNSS*C_CMAXV, 1./3., 1./3. }
+			(long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
 
-#define C_CIEX		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
-			{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, .735, .265 }
-
-#define C_CIEY		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
-			{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, .274, .717 }
-
-#define C_CIEZ		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
-			{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, .167, .009 }
-
 #define c_cval(c,l)	((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
 
+#define C_1SIDEDTHICK	0.005		/* assumed thickness of 1-sided mat. */
+
 typedef struct {
 	int	clock;		/* incremented each change -- resettable */
 	int	sided;		/* 1 if surface is 1-sided, 0 for 2-sided */
+	float	nr, ni;		/* index of refraction, real and imaginary */
 	float	rd;		/* diffuse reflectance */
 	C_COLOR	rd_c;		/* diffuse reflectance color */
 	float	td;		/* diffuse transmittance */
@@ -261,7 +251,7 @@ typedef struct {
 	FVECT	p, n;		/* point and normal */
 } C_VERTEX;		/* vertex context */
 
-#define C_DEFMATERIAL	{1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
+#define C_DEFMATERIAL	{1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
 					0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
 #define C_DEFVERTEX	{1,{0.,0.,0.},{0.,0.,0.}}