--- ray/src/cv/mgflib/parser.h	1994/07/21 14:56:36	1.14
+++ ray/src/cv/mgflib/parser.h	1995/11/29 19:55:42	1.28
@@ -1,4 +1,4 @@
-/* Copyright (c) 1994 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 /* SCCSid "$SunId$ LBL" */
 
@@ -8,52 +8,65 @@
 
 /* must include stdio.h before us */
 
-			/* 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_VMAJOR	1		/* major version number */
+#define MG_VMINOR	1		/* minor version number */
 
-#define MG_NENTITIES	26
+			/* Entities (list is only appended, never modified) */
+#define MG_E_COMMENT	0		/* #		*/
+#define MG_E_COLOR	1		/* c		*/
+#define MG_E_CCT	2		/* cct		*/
+#define MG_E_CONE	3		/* cone		*/
+#define MG_E_CMIX	4		/* cmix		*/
+#define MG_E_CSPEC	5		/* cspec	*/
+#define MG_E_CXY	6		/* cxy		*/
+#define MG_E_CYL	7		/* cyl		*/
+#define MG_E_ED		8		/* ed		*/
+#define MG_E_FACE	9		/* f		*/
+#define MG_E_INCLUDE	10		/* i		*/
+#define MG_E_IES	11		/* ies		*/
+#define MG_E_IR		12		/* ir		*/
+#define MG_E_MATERIAL	13		/* m		*/
+#define MG_E_NORMAL	14		/* n		*/
+#define MG_E_OBJECT	15		/* o		*/
+#define MG_E_POINT	16		/* p		*/
+#define MG_E_PRISM	17		/* prism	*/
+#define MG_E_RD		18		/* rd		*/
+#define MG_E_RING	19		/* ring		*/
+#define MG_E_RS		20		/* rs		*/
+#define MG_E_SIDES	21		/* sides	*/
+#define MG_E_SPH	22		/* sph		*/
+#define MG_E_TD		23		/* td		*/
+#define MG_E_TORUS	24		/* torus	*/
+#define MG_E_TS		25		/* ts		*/
+#define MG_E_VERTEX	26		/* v		*/
+#define MG_E_XF		27		/* xf		*/
+			/* end of Version 1 entities */
 
-#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_NENTITIES	28		/* total # entities */
 
+#define MG_NELIST	{28}		/* entity count for version 1 and up */
+
+#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
 
 extern char	mg_ename[MG_NENTITIES][MG_MAXELEN];
 
-			/* Handler routines for each entity */
-
+			/* Handler routines for each entity and unknown ones */
 #ifdef NOPROTO
 extern int	(*mg_ehand[MG_NENTITIES])();
+extern int	(*mg_uhand)();
+extern int	mg_defuhand();
 #else
 extern int	(*mg_ehand[MG_NENTITIES])(int argc, char **argv);
+extern int	(*mg_uhand)(int argc, char **argv);
+extern int	mg_defuhand(int, char **);
 #endif
 
+extern unsigned	mg_nunknown;		/* count of unknown entities */
+
 			/* Error codes */
 #define MG_OK		0		/* normal return value */
 #define MG_EUNK		1		/* unknown entity */
@@ -66,10 +79,12 @@ extern int	(*mg_ehand[MG_NENTITIES])(int argc, char **
 #define MG_EMEM		8		/* out of memory */
 #define MG_ESEEK	9		/* file seek error */
 #define MG_EBADMAT	10		/* bad material specification */
+#define MG_ELINE	11		/* input line too long */
+#define MG_ECNTXT	12		/* unmatched context close */
 
-#define MG_NERRS	11
+#define MG_NERRS	13
 
-extern char	*mg_err[MG_NERRS];
+extern char	*mg_err[MG_NERRS];	/* list of error messages */
 
 /*
  * The general process for running the parser is to fill in the mg_ehand
@@ -84,13 +99,13 @@ extern char	*mg_err[MG_NERRS];
  * the mg_handle function rather than the mg_ehand routines directly.
  * (The first argument to mg_handle is the entity #, or -1.)
  * To free any data structures and clear the parser, use mg_clear.
- * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
- * will return an error from the list above.  In addition, mg_load
- * will report the error to stderr.  The mg_read routine returns 0
- * when the end of file has been reached.
+ * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
+ * mg_fgoto will return an error from the list above.  In addition,
+ * mg_load will report the error to stderr.  The mg_read routine
+ * 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 {
@@ -148,10 +163,12 @@ extern int	mg_nqcdivs;		/* divisions per quarter circl
 extern int mg_entity();			/* get entity number from its name */
 extern int isint();			/* non-zero if integer format */
 extern int isflt();			/* non-zero if floating point format */
+extern int isname();			/* non-zero if legal identifier name */
 #else
 extern int mg_entity(char *);		/* get entity number from its name */
 extern int isint(char *);		/* non-zero if integer format */
 extern int isflt(char *);		/* non-zero if floating point format */
+extern int isname(char *);		/* non-zero if legal identifier name */
 #endif
 
 /************************************************************************
@@ -195,11 +212,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 +226,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 +237,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_cval(c,l)	((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
 
-#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_1SIDEDTHICK	0.005		/* assumed thickness of 1-sided mat. */
 
-#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)->sum)
-
 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 +266,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.}}
 
@@ -349,18 +354,22 @@ struct xf_array {
 
 typedef struct xf_spec {
 	long	xid;			/* unique transform id */
-	short	xav0;			/* zeroeth argument in xf_argv array */
-	short	xac;			/* transform argument count */
+	short	xac;			/* context argument count */
 	short	rev;			/* boolean true if vertices reversed */
 	XF	xf;			/* cumulative transformation */
 	struct xf_array	*xarr;		/* transformation array pointer */
 	struct xf_spec	*prev;		/* previous transformation context */
 } XF_SPEC;			/* followed by argument buffer */
 
-extern int	xf_argc;			/* total # transform args. */
-extern char	**xf_argv;			/* transform arguments */
-extern XF_SPEC	*xf_context;			/* current context */
+extern XF_SPEC	*xf_context;			/* current transform context */
+extern char	**xf_argend;			/* last transform argument */
 
+#define xf_ac(xf)	((xf)==NULL ? 0 : (xf)->xac)
+#define xf_av(xf)	(xf_argend - (xf)->xac)
+
+#define xf_argc		xf_ac(xf_context)
+#define xf_argv		xf_av(xf_context)
+
 /*
  * The transformation handler should do most of the work that needs
  * doing.  Just pass it any xf entities, then use the associated
@@ -384,6 +393,10 @@ extern void	xf_clear();		/* clear xf stack */
 
 /* The following are support routines you probably won't call directly */
 
+XF_SPEC		*new_xf();		/* allocate new transform */
+void		free_xf();		/* free a transform */
+int		xf_aname();		/* name this instance */
+long		comp_xfid();		/* compute unique ID */
 extern void	multmat4();		/* m4a = m4b X m4c */
 extern void	multv3();		/* v3a = v3b X m4 (vectors) */
 extern void	multp3();		/* p3a = p3b X m4 (points) */
@@ -400,6 +413,10 @@ extern void	xf_clear(void);			/* clear xf stack */
 
 /* The following are support routines you probably won't call directly */
 
+XF_SPEC		*new_xf(int, char **);		/* allocate new transform */
+void		free_xf(XF_SPEC *);		/* free a transform */
+int		xf_aname(struct xf_array *);	/* name this instance */
+long		comp_xfid(MAT4);		/* compute unique ID */
 extern void	multmat4(MAT4, MAT4, MAT4);	/* m4a = m4b X m4c */
 extern void	multv3(FVECT, FVECT, MAT4);	/* v3a = v3b X m4 (vectors) */
 extern void	multp3(FVECT, FVECT, MAT4);	/* p3a = p3b X m4 (points) */