--- ray/src/cv/mgflib/parser.h 1997/03/18 11:05:40 1.30 +++ ray/src/cv/mgflib/parser.h 2003/06/07 01:11:17 1.34 @@ -1,14 +1,17 @@ -/* Copyright (c) 1995 Regents of the University of California */ - -/* SCCSid "$SunId$ LBL" */ - +/* RCSid: $Id: parser.h,v 1.34 2003/06/07 01:11:17 schorsch Exp $ */ /* * Header file for MGF interpreter */ +#ifndef _MGF_PARSER_H_ +#define _MGF_PARSER_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifndef MG_VMAJOR -/* must include stdio.h before us */ +/* must include stdio.h and stdlib.h before us */ #define MG_VMAJOR 2 /* major version number */ #define MG_VMINOR 0 /* minor version number */ @@ -60,15 +63,9 @@ extern char mg_ename[MG_NENTITIES][MG_MAXELEN]; /* 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 */ @@ -130,18 +127,6 @@ typedef struct { extern MG_FCTXT *mg_file; /* current file context */ -#ifdef NOPROTO -extern void mg_init(); /* fill in mg_ehand array */ -extern int mg_load(); /* parse a file */ -extern int mg_open(); /* open new input file */ -extern int mg_read(); /* read next line */ -extern int mg_parse(); /* parse current line */ -extern void mg_fgetpos(); /* get position on input file */ -extern int mg_fgoto(); /* go to position on input file */ -extern void mg_close(); /* close input file */ -extern void mg_clear(); /* clear parser */ -extern int mg_handle(); /* handle an entity */ -#else extern void mg_init(void); /* fill in mg_ehand array */ extern int mg_load(char *); /* parse a file */ extern int mg_open(MG_FCTXT *, char *); /* open new input file */ @@ -152,7 +137,6 @@ extern int mg_fgoto(MG_FPOS *); /* go to position on i extern void mg_close(void); /* close input file */ extern void mg_clear(void); /* clear parser */ extern int mg_handle(int, int, char **); /* handle an entity */ -#endif #ifndef MG_NQCD #define MG_NQCD 5 /* default number of divisions */ @@ -164,23 +148,6 @@ extern int mg_nqcdivs; /* divisions per quarter circl * The following library routines are included for your convenience: */ -#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_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 */ @@ -189,6 +156,7 @@ extern int isfltd(char *, char *); /* same with delimi 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 */ @@ -196,7 +164,6 @@ extern int e_ring(int, char **); /* expand ring as oth 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 /************************************************************************ * Definitions for 3-d vector manipulation functions @@ -223,12 +190,8 @@ typedef FLOAT FVECT[3]; #define round0(x) if (x <= FTINY && x >= -FTINY) x = 0 -#ifdef NOPROTO -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 /************************************************************************ * Definitions for context handling routines @@ -249,15 +212,16 @@ extern void fcross(FVECT,FVECT,FVECT);/* cross product #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,\ @@ -273,6 +237,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 */ @@ -291,12 +256,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 */ @@ -305,17 +271,6 @@ extern char *c_cmname; /* current material name */ extern C_VERTEX *c_cvertex; /* the current vertex */ extern char *c_cvname; /* current vertex name */ -#ifdef NOPROTO -extern int c_hcolor(); /* handle color entity */ -extern int c_hmaterial(); /* handle material entity */ -extern int c_hvertex(); /* handle vertex entity */ -extern void c_clearall(); /* clear context tables */ -extern C_MATERIAL *c_getmaterial(); /* get a named material */ -extern C_VERTEX *c_getvert(); /* get a named vertex */ -extern C_COLOR *c_getcolor(); /* get a named color */ -extern void c_ccvt(); /* fix color representation */ -extern int c_isgrey(); /* check if color is grey */ -#else extern int c_hcolor(int, char **); /* handle color entity */ extern int c_hmaterial(int, char **); /* handle material entity */ extern int c_hvertex(int, char **); /* handle vertex entity */ @@ -325,7 +280,6 @@ extern C_VERTEX *c_getvert(char *); /* get a named ve extern C_COLOR *c_getcolor(char *); /* get a named color */ extern void c_ccvt(C_COLOR *, int); /* fix color representation */ extern int c_isgrey(C_COLOR *); /* check if color is grey */ -#endif /************************************************************************* * Definitions for hierarchical object name handler @@ -334,13 +288,8 @@ extern int c_isgrey(C_COLOR *); /* check if color is extern int obj_nnames; /* depth of name hierarchy */ extern char **obj_name; /* names in hierarchy */ -#ifdef NOPROTO -extern int obj_handler(); /* handle an object entity */ -extern void obj_clear(); /* clear object stack */ -#else extern int obj_handler(int, char **); /* handle an object entity */ extern void obj_clear(void); /* clear object stack */ -#endif /************************************************************************** * Definitions for hierarchical transformation handler @@ -410,28 +359,7 @@ extern char **xf_argend; /* last transform argument * puts the result into the first. */ -#ifdef NOPROTO -extern int xf_handler(); /* handle xf entity */ -extern void xf_xfmpoint(); /* transform point */ -extern void xf_xfmvect(); /* transform vector */ -extern void xf_rotvect(); /* rotate vector */ -extern double xf_scale(); /* scale a value */ -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) */ -extern int xf(); /* interpret transform spec. */ - -#else - extern int xf_handler(int, char **); /* handle xf entity */ extern void xf_xfmpoint(FVECT, FVECT); /* transform point */ extern void xf_xfmvect(FVECT, FVECT); /* transform vector */ @@ -450,7 +378,6 @@ extern void multv3(FVECT, FVECT, MAT4); /* v3a = v3b X extern void multp3(FVECT, FVECT, MAT4); /* p3a = p3b X m4 (points) */ extern int xf(XF *, int, char **); /* interpret transform spec. */ -#endif /************************************************************************ * Miscellaneous definitions @@ -458,23 +385,21 @@ extern int xf(XF *, int, char **); /* interpret trans #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(); -#endif - #ifndef MEM_PTR #define MEM_PTR void * #endif -extern MEM_PTR malloc(); -extern MEM_PTR calloc(); -extern MEM_PTR realloc(); -extern void free(); - #endif /*MG_VMAJOR*/ + + +#ifdef __cplusplus +} +#endif +#endif /* _MGF_PARSER_H_ */ +