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.24 by greg, Thu May 11 20:17:36 1995 UTC vs.
Revision 1.31 by gregl, Fri Oct 10 16:45:50 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 and unknown ones */
52 –
63   #ifdef NOPROTO
64   extern int      (*mg_ehand[MG_NENTITIES])();
65   extern int      (*mg_uhand)();
# Line 74 | Line 84 | extern unsigned        mg_nunknown;            /* count of unknown enti
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];      /* list of error messages */
93  
# Line 155 | 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_pipe();                    /* expand piped command */
177 + extern int e_sph();                     /* expand sphere as other entities */
178 + extern int e_torus();                   /* expand torus as other entities */
179 + extern int e_cyl();                     /* expand cylinder as other entities */
180 + extern int e_ring();                    /* expand ring as other entities */
181 + extern int e_cone();                    /* expand cone as other entities */
182 + extern int e_prism();                   /* expand prism as other entities */
183 + extern int e_faceh();                   /* expand face w/ holes as face */
184   #else
185   extern int mg_entity(char *);           /* get entity number from its name */
186   extern int isint(char *);               /* non-zero if integer format */
187 + extern int isintd(char *, char *);      /* same with delimiter set */
188   extern int isflt(char *);               /* non-zero if floating point format */
189 + extern int isfltd(char *, char *);      /* same with delimiter set */
190   extern int isname(char *);              /* non-zero if legal identifier name */
191 + extern int badarg(int, char **, char *);/* check argument format */
192 + extern int e_include(int, char **);     /* expand include entity */
193 + extern int e_pipe(int, char **);        /* expand piped command */
194 + extern int e_sph(int, char **);         /* expand sphere as other entities */
195 + extern int e_torus(int, char **);       /* expand torus as other entities */
196 + extern int e_cyl(int, char **);         /* expand cylinder as other entities */
197 + extern int e_ring(int, char **);        /* expand ring as other entities */
198 + extern int e_cone(int, char **);        /* expand cone as other entities */
199 + extern int e_prism(int, char **);       /* expand prism as other entities */
200 + extern int e_faceh(int, char **);       /* expand face w/ holes as face */
201   #endif
202  
203   /************************************************************************
# Line 193 | Line 229 | typedef FLOAT  FVECT[3];
229   extern double   normalize();            /* normalize a vector */
230   #else
231   extern double   normalize(FVECT);       /* normalize a vector */
232 + extern void     fcross(FVECT,FVECT,FVECT);/* cross product of two vectors */
233   #endif
234  
235   /************************************************************************
# Line 214 | Line 251 | extern double  normalize(FVECT);       /* normalize a vector
251   #define C_CSEFF         020             /* flag if efficacy set */
252  
253   typedef struct {
254 <        int     clock;                  /* incremented each change */
255 <        short   flags;                  /* what's been set */
256 <        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
257 <        long    ssum;                   /* straight sum of spectral values */
258 <        float   cx, cy;                 /* xy chromaticity value */
259 <        float   eff;                    /* efficacy (lumens/watt) */
254 >        int     clock;          /* incremented each change */
255 >        char    *client_data;   /* pointer to private client-owned data */
256 >        short   flags;          /* what's been set */
257 >        short   ssamp[C_CNSS];  /* spectral samples, min wl to max */
258 >        long    ssum;           /* straight sum of spectral values */
259 >        float   cx, cy;         /* xy chromaticity value */
260 >        float   eff;            /* efficacy (lumens/watt) */
261   } C_COLOR;
262  
263 < #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
263 > #define C_DEFCOLOR      { 1, NULL, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
264                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
265                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
266                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 238 | Line 276 | typedef struct {
276  
277   typedef struct {
278          int     clock;          /* incremented each change -- resettable */
279 +        char    *client_data;   /* pointer to private client-owned data */
280          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
281          float   nr, ni;         /* index of refraction, real and imaginary */
282          float   rd;             /* diffuse reflectance */
# Line 256 | Line 295 | typedef struct {
295  
296   typedef struct {
297          int     clock;          /* incremented each change -- resettable */
298 +        char    *client_data;   /* pointer to private client-owned data */
299          FVECT   p, n;           /* point and normal */
300   } C_VERTEX;             /* vertex context */
301  
302 < #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
303 <                                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
304 < #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
302 > #define C_DEFMATERIAL   {1,NULL,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,\
303 >                                C_DEFCOLOR,0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
304 > #define C_DEFVERTEX     {1,NULL,{0.,0.,0.},{0.,0.,0.}}
305  
306   extern C_COLOR          *c_ccolor;      /* the current color */
307   extern char             *c_ccname;      /* current color name */
# Line 357 | Line 397 | typedef struct xf_spec {
397   extern XF_SPEC  *xf_context;                    /* current transform context */
398   extern char     **xf_argend;                    /* last transform argument */
399  
400 < #define xf_ac(xf)       ((xf)->xac)
400 > #define xf_ac(xf)       ((xf)==NULL ? 0 : (xf)->xac)
401   #define xf_av(xf)       (xf_argend - (xf)->xac)
402  
403 < #define xf_argc         (xf_context==NULL ? 0 : xf_ac(xf_context))
403 > #define xf_argc         xf_ac(xf_context)
404   #define xf_argv         xf_av(xf_context)
405  
406   /*
# Line 386 | Line 426 | extern void    xf_clear();             /* clear xf stack */
426  
427   /* The following are support routines you probably won't call directly */
428  
429 + XF_SPEC         *new_xf();              /* allocate new transform */
430 + void            free_xf();              /* free a transform */
431 + int             xf_aname();             /* name this instance */
432 + long            comp_xfid();            /* compute unique ID */
433   extern void     multmat4();             /* m4a = m4b X m4c */
434   extern void     multv3();               /* v3a = v3b X m4 (vectors) */
435   extern void     multp3();               /* p3a = p3b X m4 (points) */
# Line 402 | Line 446 | extern void    xf_clear(void);                 /* clear xf stack */
446  
447   /* The following are support routines you probably won't call directly */
448  
449 + XF_SPEC         *new_xf(int, char **);          /* allocate new transform */
450 + void            free_xf(XF_SPEC *);             /* free a transform */
451 + int             xf_aname(struct xf_array *);    /* name this instance */
452 + long            comp_xfid(MAT4);                /* compute unique ID */
453   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
454   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
455   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
# Line 413 | Line 461 | extern int     xf(XF *, int, char **);         /* interpret trans
461   *      Miscellaneous definitions
462   */
463  
464 + #ifndef  PI
465   #ifdef  M_PI
466   #define  PI             M_PI
467   #else
468   #define  PI             3.14159265358979323846
469   #endif
470 + #endif
471  
472   #ifdef DCL_ATOF
473   extern double   atof();
# Line 431 | Line 481 | extern MEM_PTR malloc();
481   extern MEM_PTR  calloc();
482   extern MEM_PTR  realloc();
483   extern void     free();
484 +
485 + #endif /*MG_VMAJOR*/

Diff Legend

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