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.19 by greg, Fri Mar 10 15:16:42 1995 UTC vs.
Revision 1.24 by greg, Thu May 11 20:17:36 1995 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1994 Regents of the University of California */
1 > /* Copyright (c) 1995 Regents of the University of California */
2  
3   /* SCCSid "$SunId$ LBL" */
4  
# Line 9 | Line 9
9   /* must include stdio.h before us */
10  
11                          /* Entities (order doesn't really matter) */
12 < #define MG_E_COMMENT    0
13 < #define MG_E_COLOR      1
14 < #define MG_E_CCT        2
15 < #define MG_E_CONE       3
16 < #define MG_E_CMIX       4
17 < #define MG_E_CSPEC      5
18 < #define MG_E_CXY        6
19 < #define MG_E_CYL        7
20 < #define MG_E_ED         8
21 < #define MG_E_FACE       9
22 < #define MG_E_INCLUDE    10
23 < #define MG_E_IES        11
24 < #define MG_E_MATERIAL   12
25 < #define MG_E_NORMAL     13
26 < #define MG_E_OBJECT     14
27 < #define MG_E_POINT      15
28 < #define MG_E_PRISM      16
29 < #define MG_E_RD         17
30 < #define MG_E_RING       18
31 < #define MG_E_RS         19
32 < #define MG_E_SIDES      20
33 < #define MG_E_SPH        21
34 < #define MG_E_TD         22
35 < #define MG_E_TORUS      23
36 < #define MG_E_TS         24
37 < #define MG_E_VERTEX     25
38 < #define MG_E_XF         26
12 > #define MG_E_COMMENT    0               /* #            */
13 > #define MG_E_COLOR      1               /* c            */
14 > #define MG_E_CCT        2               /* cct          */
15 > #define MG_E_CONE       3               /* cone         */
16 > #define MG_E_CMIX       4               /* cmix         */
17 > #define MG_E_CSPEC      5               /* cspec        */
18 > #define MG_E_CXY        6               /* cxy          */
19 > #define MG_E_CYL        7               /* cyl          */
20 > #define MG_E_ED         8               /* ed           */
21 > #define MG_E_FACE       9               /* f            */
22 > #define MG_E_INCLUDE    10              /* i            */
23 > #define MG_E_IES        11              /* ies          */
24 > #define MG_E_IR         12              /* ir           */
25 > #define MG_E_MATERIAL   13              /* m            */
26 > #define MG_E_NORMAL     14              /* n            */
27 > #define MG_E_OBJECT     15              /* o            */
28 > #define MG_E_POINT      16              /* p            */
29 > #define MG_E_PRISM      17              /* prism        */
30 > #define MG_E_RD         18              /* rd           */
31 > #define MG_E_RING       19              /* ring         */
32 > #define MG_E_RS         20              /* rs           */
33 > #define MG_E_SIDES      21              /* sides        */
34 > #define MG_E_SPH        22              /* sph          */
35 > #define MG_E_TD         23              /* td           */
36 > #define MG_E_TORUS      24              /* torus        */
37 > #define MG_E_TS         25              /* ts           */
38 > #define MG_E_VERTEX     26              /* v            */
39 > #define MG_E_XF         27              /* xf           */
40  
41 < #define MG_NENTITIES    27
41 > #define MG_NENTITIES    28              /* total # entities */
42  
43   #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
44 <                        "f","i","ies","m","n","o","p","prism","rd","ring",\
45 <                        "rs","sides","sph","td","torus","ts","v","xf"}
44 >                        "f","i","ies","ir","m","n","o","p","prism","rd",\
45 >                        "ring","rs","sides","sph","td","torus","ts","v","xf"}
46  
47   #define MG_MAXELEN      6
48  
49   extern char     mg_ename[MG_NENTITIES][MG_MAXELEN];
50  
51 <                        /* Handler routines for each entity */
51 >                        /* Handler routines for each entity and unknown ones */
52  
53   #ifdef NOPROTO
54   extern int      (*mg_ehand[MG_NENTITIES])();
55 + extern int      (*mg_uhand)();
56 + extern int      mg_defuhand();
57   #else
58   extern int      (*mg_ehand[MG_NENTITIES])(int argc, char **argv);
59 + extern int      (*mg_uhand)(int argc, char **argv);
60 + extern int      mg_defuhand(int, char **);
61   #endif
62  
63 + extern unsigned mg_nunknown;            /* count of unknown entities */
64 +
65                          /* Error codes */
66   #define MG_OK           0               /* normal return value */
67   #define MG_EUNK         1               /* unknown entity */
# Line 70 | Line 77 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
77  
78   #define MG_NERRS        11
79  
80 < extern char     *mg_err[MG_NERRS];
80 > extern char     *mg_err[MG_NERRS];      /* list of error messages */
81  
82   /*
83   * The general process for running the parser is to fill in the mg_ehand
# Line 86 | Line 93 | extern char    *mg_err[MG_NERRS];
93   * (The first argument to mg_handle is the entity #, or -1.)
94   * To free any data structures and clear the parser, use mg_clear.
95   * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
96 < * mg_rewind will return an error from the list above.  In addition,
96 > * mg_fgoto will return an error from the list above.  In addition,
97   * mg_load will report the error to stderr.  The mg_read routine
98   * returns 0 when the end of file has been reached.
99   */
# Line 149 | Line 156 | extern int     mg_nqcdivs;             /* divisions per quarter circl
156   extern int mg_entity();                 /* get entity number from its name */
157   extern int isint();                     /* non-zero if integer format */
158   extern int isflt();                     /* non-zero if floating point format */
159 + extern int isname();                    /* non-zero if legal identifier name */
160   #else
161   extern int mg_entity(char *);           /* get entity number from its name */
162   extern int isint(char *);               /* non-zero if integer format */
163   extern int isflt(char *);               /* non-zero if floating point format */
164 + extern int isname(char *);              /* non-zero if legal identifier name */
165   #endif
166  
167   /************************************************************************
# Line 225 | Line 234 | typedef struct {
234  
235   #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
236  
237 + #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
238 +
239   typedef struct {
240          int     clock;          /* incremented each change -- resettable */
241          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
242 +        float   nr, ni;         /* index of refraction, real and imaginary */
243          float   rd;             /* diffuse reflectance */
244          C_COLOR rd_c;           /* diffuse reflectance color */
245          float   td;             /* diffuse transmittance */
# Line 247 | Line 259 | typedef struct {
259          FVECT   p, n;           /* point and normal */
260   } C_VERTEX;             /* vertex context */
261  
262 < #define C_DEFMATERIAL   {1,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
262 > #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
263                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
264   #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
265  
# Line 335 | Line 347 | struct xf_array {
347  
348   typedef struct xf_spec {
349          long    xid;                    /* unique transform id */
350 <        short   xav0;                   /* zeroeth argument in xf_argv array */
339 <        short   xac;                    /* transform argument count */
350 >        short   xac;                    /* context argument count */
351          short   rev;                    /* boolean true if vertices reversed */
352          XF      xf;                     /* cumulative transformation */
353          struct xf_array *xarr;          /* transformation array pointer */
354          struct xf_spec  *prev;          /* previous transformation context */
355   } XF_SPEC;                      /* followed by argument buffer */
356  
357 < extern int      xf_argc;                        /* total # transform args. */
358 < extern char     **xf_argv;                      /* transform arguments */
359 < extern XF_SPEC  *xf_context;                    /* current context */
357 > extern XF_SPEC  *xf_context;                    /* current transform context */
358 > extern char     **xf_argend;                    /* last transform argument */
359 >
360 > #define xf_ac(xf)       ((xf)->xac)
361 > #define xf_av(xf)       (xf_argend - (xf)->xac)
362 >
363 > #define xf_argc         (xf_context==NULL ? 0 : xf_ac(xf_context))
364 > #define xf_argv         xf_av(xf_context)
365  
366   /*
367   * The transformation handler should do most of the work that needs

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines