ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/mgflib/parser.h
(Generate patch)

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.21 by greg, Tue May 9 11:47:27 1995 UTC vs.
Revision 1.30 by greg, Tue Mar 18 11:05:40 1997 UTC

# Line 6 | Line 6
6   * Header file for MGF interpreter
7   */
8  
9 + #ifndef MG_VMAJOR
10 +
11   /* must include stdio.h before us */
12  
13 <                        /* Entities (order doesn't really matter) */
13 > #define MG_VMAJOR       2               /* major version number */
14 > #define MG_VMINOR       0               /* minor version number */
15 >
16 >                        /* Entities (list is only appended, never modified) */
17   #define MG_E_COMMENT    0               /* #            */
18   #define MG_E_COLOR      1               /* c            */
19   #define MG_E_CCT        2               /* cct          */
# Line 37 | Line 42
42   #define MG_E_TS         25              /* ts           */
43   #define MG_E_VERTEX     26              /* v            */
44   #define MG_E_XF         27              /* xf           */
45 +                        /* end of Version 1 entities */
46 + #define MG_E_FACEH      28              /* fh           */
47 +                        /* end of Version 2 entities */
48  
49 < #define MG_NENTITIES    28              /* total # entities */
49 > #define MG_NENTITIES    29              /* total # entities */
50  
51 + #define MG_NELIST       {28,29}         /* entity count for version 1 and up */
52 +
53   #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
54                          "f","i","ies","ir","m","n","o","p","prism","rd",\
55 <                        "ring","rs","sides","sph","td","torus","ts","v","xf"}
55 >                        "ring","rs","sides","sph","td","torus","ts","v","xf",\
56 >                        "fh"}
57  
58   #define MG_MAXELEN      6
59  
60   extern char     mg_ename[MG_NENTITIES][MG_MAXELEN];
61  
62 <                        /* Handler routines for each entity */
52 <
62 >                        /* Handler routines for each entity and unknown ones */
63   #ifdef NOPROTO
64   extern int      (*mg_ehand[MG_NENTITIES])();
65 + extern int      (*mg_uhand)();
66 + extern int      mg_defuhand();
67   #else
68   extern int      (*mg_ehand[MG_NENTITIES])(int argc, char **argv);
69 + extern int      (*mg_uhand)(int argc, char **argv);
70 + extern int      mg_defuhand(int, char **);
71   #endif
72  
73 + extern unsigned mg_nunknown;            /* count of unknown entities */
74 +
75                          /* Error codes */
76   #define MG_OK           0               /* normal return value */
77   #define MG_EUNK         1               /* unknown entity */
# Line 68 | Line 84 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
84   #define MG_EMEM         8               /* out of memory */
85   #define MG_ESEEK        9               /* file seek error */
86   #define MG_EBADMAT      10              /* bad material specification */
87 + #define MG_ELINE        11              /* input line too long */
88 + #define MG_ECNTXT       12              /* unmatched context close */
89  
90 < #define MG_NERRS        11
90 > #define MG_NERRS        13
91  
92 < extern char     *mg_err[MG_NERRS];
92 > extern char     *mg_err[MG_NERRS];      /* list of error messages */
93  
94   /*
95   * The general process for running the parser is to fill in the mg_ehand
# Line 149 | Line 167 | extern int     mg_nqcdivs;             /* divisions per quarter circl
167   #ifdef NOPROTO
168   extern int mg_entity();                 /* get entity number from its name */
169   extern int isint();                     /* non-zero if integer format */
170 + extern int isintd();                    /* same with delimiter set */
171   extern int isflt();                     /* non-zero if floating point format */
172 + extern int isfltd();                    /* same with delimiter set */
173 + extern int isname();                    /* non-zero if legal identifier name */
174 + extern int badarg();                    /* check argument format */
175 + extern int e_include();                 /* expand include entity */
176 + extern int e_sph();                     /* expand sphere as other entities */
177 + extern int e_torus();                   /* expand torus as other entities */
178 + extern int e_cyl();                     /* expand cylinder as other entities */
179 + extern int e_ring();                    /* expand ring as other entities */
180 + extern int e_cone();                    /* expand cone as other entities */
181 + extern int e_prism();                   /* expand prism as other entities */
182 + extern int e_faceh();                   /* expand face w/ holes as face */
183   #else
184   extern int mg_entity(char *);           /* get entity number from its name */
185   extern int isint(char *);               /* non-zero if integer format */
186 + extern int isintd(char *, char *);      /* same with delimiter set */
187   extern int isflt(char *);               /* non-zero if floating point format */
188 + extern int isfltd(char *, char *);      /* same with delimiter set */
189 + extern int isname(char *);              /* non-zero if legal identifier name */
190 + extern int badarg(int, char **, char *);/* check argument format */
191 + extern int e_include(int, char **);     /* expand include entity */
192 + extern int e_sph(int, char **);         /* expand sphere as other entities */
193 + extern int e_torus(int, char **);       /* expand torus as other entities */
194 + extern int e_cyl(int, char **);         /* expand cylinder as other entities */
195 + extern int e_ring(int, char **);        /* expand ring as other entities */
196 + extern int e_cone(int, char **);        /* expand cone as other entities */
197 + extern int e_prism(int, char **);       /* expand prism as other entities */
198 + extern int e_faceh(int, char **);       /* expand face w/ holes as face */
199   #endif
200  
201   /************************************************************************
# Line 185 | Line 227 | typedef FLOAT  FVECT[3];
227   extern double   normalize();            /* normalize a vector */
228   #else
229   extern double   normalize(FVECT);       /* normalize a vector */
230 + extern void     fcross(FVECT,FVECT,FVECT);/* cross product of two vectors */
231   #endif
232  
233   /************************************************************************
# Line 339 | Line 382 | struct xf_array {
382  
383   typedef struct xf_spec {
384          long    xid;                    /* unique transform id */
385 <        short   xav0;                   /* zeroeth argument in xf_argv array */
343 <        short   xac;                    /* transform argument count */
385 >        short   xac;                    /* context argument count */
386          short   rev;                    /* boolean true if vertices reversed */
387          XF      xf;                     /* cumulative transformation */
388          struct xf_array *xarr;          /* transformation array pointer */
389          struct xf_spec  *prev;          /* previous transformation context */
390   } XF_SPEC;                      /* followed by argument buffer */
391  
392 < extern int      xf_argc;                        /* total # transform args. */
393 < extern char     **xf_argv;                      /* transform arguments */
352 < extern XF_SPEC  *xf_context;                    /* current context */
392 > extern XF_SPEC  *xf_context;                    /* current transform context */
393 > extern char     **xf_argend;                    /* last transform argument */
394  
395 + #define xf_ac(xf)       ((xf)==NULL ? 0 : (xf)->xac)
396 + #define xf_av(xf)       (xf_argend - (xf)->xac)
397 +
398 + #define xf_argc         xf_ac(xf_context)
399 + #define xf_argv         xf_av(xf_context)
400 +
401   /*
402   * The transformation handler should do most of the work that needs
403   * doing.  Just pass it any xf entities, then use the associated
# Line 374 | Line 421 | extern void    xf_clear();             /* clear xf stack */
421  
422   /* The following are support routines you probably won't call directly */
423  
424 + XF_SPEC         *new_xf();              /* allocate new transform */
425 + void            free_xf();              /* free a transform */
426 + int             xf_aname();             /* name this instance */
427 + long            comp_xfid();            /* compute unique ID */
428   extern void     multmat4();             /* m4a = m4b X m4c */
429   extern void     multv3();               /* v3a = v3b X m4 (vectors) */
430   extern void     multp3();               /* p3a = p3b X m4 (points) */
# Line 390 | Line 441 | extern void    xf_clear(void);                 /* clear xf stack */
441  
442   /* The following are support routines you probably won't call directly */
443  
444 + XF_SPEC         *new_xf(int, char **);          /* allocate new transform */
445 + void            free_xf(XF_SPEC *);             /* free a transform */
446 + int             xf_aname(struct xf_array *);    /* name this instance */
447 + long            comp_xfid(MAT4);                /* compute unique ID */
448   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
449   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
450   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
# Line 401 | Line 456 | extern int     xf(XF *, int, char **);         /* interpret trans
456   *      Miscellaneous definitions
457   */
458  
459 + #ifndef  PI
460   #ifdef  M_PI
461   #define  PI             M_PI
462   #else
463   #define  PI             3.14159265358979323846
464   #endif
465 + #endif
466  
467   #ifdef DCL_ATOF
468   extern double   atof();
# Line 419 | Line 476 | extern MEM_PTR malloc();
476   extern MEM_PTR  calloc();
477   extern MEM_PTR  realloc();
478   extern void     free();
479 +
480 + #endif /*MG_VMAJOR*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines