--- ray/src/cv/mgflib/parser.h 1995/11/29 19:55:42 1.28 +++ ray/src/cv/mgflib/parser.h 1998/01/16 10:47:27 1.32 @@ -6,10 +6,12 @@ * Header file for MGF interpreter */ +#ifndef MG_VMAJOR + /* must include stdio.h before us */ -#define MG_VMAJOR 1 /* major version number */ -#define MG_VMINOR 1 /* minor version number */ +#define MG_VMAJOR 2 /* major version number */ +#define MG_VMINOR 0 /* minor version number */ /* Entities (list is only appended, never modified) */ #define MG_E_COMMENT 0 /* # */ @@ -41,14 +43,17 @@ #define MG_E_VERTEX 26 /* v */ #define MG_E_XF 27 /* xf */ /* end of Version 1 entities */ +#define MG_E_FACEH 28 /* fh */ + /* end of Version 2 entities */ -#define MG_NENTITIES 28 /* total # entities */ +#define MG_NENTITIES 29 /* total # entities */ -#define MG_NELIST {28} /* entity count for version 1 and up */ +#define MG_NELIST {28,29} /* 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"} + "ring","rs","sides","sph","td","torus","ts","v","xf",\ + "fh"} #define MG_MAXELEN 6 @@ -162,13 +167,37 @@ extern int mg_nqcdivs; /* divisions per quarter circl #ifdef NOPROTO extern int mg_entity(); /* get entity number from its name */ extern int isint(); /* non-zero if integer format */ +extern int isintd(); /* same with delimiter set */ extern int isflt(); /* non-zero if floating point format */ +extern int isfltd(); /* same with delimiter set */ extern int isname(); /* non-zero if legal identifier name */ +extern int badarg(); /* check argument format */ +extern int e_include(); /* expand include entity */ +extern int e_pipe(); /* expand piped command */ +extern int e_sph(); /* expand sphere as other entities */ +extern int e_torus(); /* expand torus as other entities */ +extern int e_cyl(); /* expand cylinder as other entities */ +extern int e_ring(); /* expand ring as other entities */ +extern int e_cone(); /* expand cone as other entities */ +extern int e_prism(); /* expand prism as other entities */ +extern int e_faceh(); /* expand face w/ holes as face */ #else extern int mg_entity(char *); /* get entity number from its name */ extern int isint(char *); /* non-zero if integer format */ +extern int isintd(char *, char *); /* same with delimiter set */ extern int isflt(char *); /* non-zero if floating point format */ +extern int isfltd(char *, char *); /* same with delimiter set */ extern int isname(char *); /* non-zero if legal identifier name */ +extern int badarg(int, char **, char *);/* check argument format */ +extern int e_include(int, char **); /* expand include entity */ +extern int e_pipe(int, char **); /* expand piped command */ +extern int e_sph(int, char **); /* expand sphere as other entities */ +extern int e_torus(int, char **); /* expand torus as other entities */ +extern int e_cyl(int, char **); /* expand cylinder as other entities */ +extern int e_ring(int, char **); /* expand ring as other entities */ +extern int e_cone(int, char **); /* expand cone as other entities */ +extern int e_prism(int, char **); /* expand prism as other entities */ +extern int e_faceh(int, char **); /* expand face w/ holes as face */ #endif /************************************************************************ @@ -200,6 +229,7 @@ typedef FLOAT FVECT[3]; extern double normalize(); /* normalize a vector */ #else extern double normalize(FVECT); /* normalize a vector */ +extern void fcross(FVECT,FVECT,FVECT);/* cross product of two vectors */ #endif /************************************************************************ @@ -221,15 +251,16 @@ extern double normalize(FVECT); /* normalize a vector #define C_CSEFF 020 /* flag if efficacy set */ typedef struct { - int clock; /* incremented each change */ - 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) */ + int clock; /* incremented each change */ + char *client_data; /* pointer to private client-owned data */ + 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; -#define C_DEFCOLOR { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\ +#define C_DEFCOLOR { 1, NULL, 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,\ @@ -245,6 +276,7 @@ typedef struct { typedef struct { int clock; /* incremented each change -- resettable */ + char *client_data; /* pointer to private client-owned data */ 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 */ @@ -263,12 +295,13 @@ typedef struct { typedef struct { int clock; /* incremented each change -- resettable */ + char *client_data; /* pointer to private client-owned data */ FVECT p, n; /* point and normal */ } C_VERTEX; /* vertex context */ -#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.}} +#define C_DEFMATERIAL {1,NULL,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,\ + C_DEFCOLOR,0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.} +#define C_DEFVERTEX {1,NULL,{0.,0.,0.},{0.,0.,0.}} extern C_COLOR *c_ccolor; /* the current color */ extern char *c_ccname; /* current color name */ @@ -428,11 +461,13 @@ extern int xf(XF *, int, char **); /* interpret trans * Miscellaneous definitions */ +#ifndef PI #ifdef M_PI -#define PI M_PI +#define PI ((double)M_PI) #else #define PI 3.14159265358979323846 #endif +#endif #ifdef DCL_ATOF extern double atof(); @@ -446,3 +481,5 @@ extern MEM_PTR malloc(); extern MEM_PTR calloc(); extern MEM_PTR realloc(); extern void free(); + +#endif /*MG_VMAJOR*/