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.1 by greg, Tue Jun 21 14:45:41 1994 UTC vs.
Revision 1.32 by gregl, Fri Jan 16 10:47:27 1998 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 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) */
14 < #define MG_E_COMMENT    0
13 < #define MG_E_COLOR      1
14 < #define MG_E_CONE       2
15 < #define MG_E_CXY        3
16 < #define MG_E_CYL        4
17 < #define MG_E_ED         5
18 < #define MG_E_FACE       6
19 < #define MG_E_INCLUDE    7
20 < #define MG_E_IES        8
21 < #define MG_E_MATERIAL   9
22 < #define MG_E_NORMAL     10
23 < #define MG_E_OBJECT     11
24 < #define MG_E_POINT      12
25 < #define MG_E_RD         13
26 < #define MG_E_RING       14
27 < #define MG_E_RS         15
28 < #define MG_E_SPH        16
29 < #define MG_E_TD         17
30 < #define MG_E_TORUS      18
31 < #define MG_E_TS         19
32 < #define MG_E_VERTEX     20
33 < #define MG_E_XF         21
13 > #define MG_VMAJOR       2               /* major version number */
14 > #define MG_VMINOR       0               /* minor version number */
15  
16 < #define MG_NENTITIES    22
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          */
20 > #define MG_E_CONE       3               /* cone         */
21 > #define MG_E_CMIX       4               /* cmix         */
22 > #define MG_E_CSPEC      5               /* cspec        */
23 > #define MG_E_CXY        6               /* cxy          */
24 > #define MG_E_CYL        7               /* cyl          */
25 > #define MG_E_ED         8               /* ed           */
26 > #define MG_E_FACE       9               /* f            */
27 > #define MG_E_INCLUDE    10              /* i            */
28 > #define MG_E_IES        11              /* ies          */
29 > #define MG_E_IR         12              /* ir           */
30 > #define MG_E_MATERIAL   13              /* m            */
31 > #define MG_E_NORMAL     14              /* n            */
32 > #define MG_E_OBJECT     15              /* o            */
33 > #define MG_E_POINT      16              /* p            */
34 > #define MG_E_PRISM      17              /* prism        */
35 > #define MG_E_RD         18              /* rd           */
36 > #define MG_E_RING       19              /* ring         */
37 > #define MG_E_RS         20              /* rs           */
38 > #define MG_E_SIDES      21              /* sides        */
39 > #define MG_E_SPH        22              /* sph          */
40 > #define MG_E_TD         23              /* td           */
41 > #define MG_E_TORUS      24              /* torus        */
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_NAMELIST     {"#","c","cone","cxy","cyl","ed","f","i","ies",\
38 <        "m","n","o","p","rd","ring","rs","sph","td","torus","ts","v","xf"}
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",\
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 */
45 <
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 60 | Line 83 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
83   #define MG_EINCL        7               /* error in included file */
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        10
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 74 | Line 100 | extern char    *mg_err[MG_NERRS];
100   * To read from standard input, use NULL as the file name.
101   * For additional control over error reporting and file management,
102   * use mg_open, mg_read, mg_parse and mg_close instead of mg_load.
103 + * To pass an entity of your own construction to the parser, use
104 + * the mg_handle function rather than the mg_ehand routines directly.
105 + * (The first argument to mg_handle is the entity #, or -1.)
106   * To free any data structures and clear the parser, use mg_clear.
107 < * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
108 < * will return an error from the list above.  In addition, mg_load
109 < * will report the error to stderr.  The mg_read routine returns 0
110 < * when the end of file has been reached.
107 > * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
108 > * mg_fgoto will return an error from the list above.  In addition,
109 > * mg_load will report the error to stderr.  The mg_read routine
110 > * returns 0 when the end of file has been reached.
111   */
112  
113 < #define MG_MAXLINE      512             /* maximum input line length */
113 > #define MG_MAXLINE      4096            /* maximum input line length */
114   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
115  
116   typedef struct mg_fctxt {
117 <        char    *fname;                         /* file name */
117 >        char    fname[96];                      /* file name */
118          FILE    *fp;                            /* stream pointer */
119 +        int     fid;                            /* unique file context id */
120          char    inpline[MG_MAXLINE];            /* input line */
121          int     lineno;                         /* line number */
122          struct mg_fctxt *prev;                  /* previous context */
123   } MG_FCTXT;
124  
125 + typedef struct {
126 +        int     fid;                            /* file this position is for */
127 +        int     lineno;                         /* line number in file */
128 +        long    offset;                         /* offset from beginning */
129 + } MG_FPOS;
130 +
131   extern MG_FCTXT *mg_file;               /* current file context */
132  
133   #ifdef NOPROTO
# Line 100 | Line 136 | extern int     mg_load();              /* parse a file */
136   extern int      mg_open();              /* open new input file */
137   extern int      mg_read();              /* read next line */
138   extern int      mg_parse();             /* parse current line */
139 < extern int      mg_rewind();            /* rewind input file */
139 > extern void     mg_fgetpos();           /* get position on input file */
140 > extern int      mg_fgoto();             /* go to position on input file */
141   extern void     mg_close();             /* close input file */
142   extern void     mg_clear();             /* clear parser */
143 < extern int      mg_iterate();
143 > extern int      mg_handle();            /* handle an entity */
144   #else
145   extern void     mg_init(void);          /* fill in mg_ehand array */
146   extern int      mg_load(char *);        /* parse a file */
147   extern int      mg_open(MG_FCTXT *, char *);    /* open new input file */
148   extern int      mg_read(void);          /* read next line */
149   extern int      mg_parse(void);         /* parse current line */
150 < extern int      mg_rewind(void);        /* rewind input file */
150 > extern void     mg_fgetpos(MG_FPOS *);  /* get position on input file */
151 > extern int      mg_fgoto(MG_FPOS *);    /* go to position on input file */
152   extern void     mg_close(void);         /* close input file */
153   extern void     mg_clear(void);         /* clear parser */
154 < extern int      mg_iterate(int, char **, int (*)(void));
154 > extern int      mg_handle(int, int, char **);   /* handle an entity */
155   #endif
156  
157   #ifndef MG_NQCD
# Line 129 | 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   /************************************************************************
204   *      Definitions for 3-d vector manipulation functions
205   */
206  
207 < typedef double  FVECT[3];
207 > #ifdef  SMLFLT
208 > #define  FLOAT          float
209 > #define  FTINY          (1e-3)
210 > #else
211 > #define  FLOAT          double
212 > #define  FTINY          (1e-6)
213 > #endif
214 > #define  FHUGE          (1e10)
215  
216 + typedef FLOAT  FVECT[3];
217 +
218 + #define  VCOPY(v1,v2)   ((v1)[0]=(v2)[0],(v1)[1]=(v2)[1],(v1)[2]=(v2)[2])
219 + #define  DOT(v1,v2)     ((v1)[0]*(v2)[0]+(v1)[1]*(v2)[1]+(v1)[2]*(v2)[2])
220 + #define  VSUM(vr,v1,v2,f)       ((vr)[0]=(v1)[0]+(f)*(v2)[0], \
221 +                                (vr)[1]=(v1)[1]+(f)*(v2)[1], \
222 +                                (vr)[2]=(v1)[2]+(f)*(v2)[2])
223 +
224 + #define is0vect(v)      (DOT(v,v) <= FTINY*FTINY)
225 +
226 + #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
227 +
228   #ifdef NOPROTO
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 153 | Line 237 | extern double  normalize(FVECT);       /* normalize a vector
237   *      (materials, colors, vectors)
238   */
239  
240 + #define C_CMINWL        380             /* minimum wavelength */
241 + #define C_CMAXWL        780             /* maximum wavelength */
242 + #define C_CNSS          41              /* number of spectral samples */
243 + #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
244 + #define C_CMAXV         10000           /* nominal maximum sample value */
245 + #define C_CLPWM         (683./C_CMAXV)  /* peak lumens/watt multiplier */
246 +
247 + #define C_CSSPEC        01              /* flag if spectrum is set */
248 + #define C_CDSPEC        02              /* flag if defined w/ spectrum */
249 + #define C_CSXY          04              /* flag if xy is set */
250 + #define C_CDXY          010             /* flag if defined w/ xy */
251 + #define C_CSEFF         020             /* flag if efficacy set */
252 +
253   typedef struct {
254 <        double  cx, cy;         /* XY chromaticity coordinates */
255 < } C_COLOR;              /* color context */
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, 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,\
267 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
268 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
269 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
270 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
271 +                        (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
272 +
273 + #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
274 +
275 + #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
276 +
277   typedef struct {
278 <        double  rd;             /* diffuse reflectance */
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 */
283          C_COLOR rd_c;           /* diffuse reflectance color */
284 <        double  td;             /* diffuse transmittance */
284 >        float   td;             /* diffuse transmittance */
285          C_COLOR td_c;           /* diffuse transmittance color */
286 <        double  ed;             /* diffuse emittance */
286 >        float   ed;             /* diffuse emittance */
287          C_COLOR ed_c;           /* diffuse emittance color */
288 <        double  rs;             /* specular reflectance */
288 >        float   rs;             /* specular reflectance */
289          C_COLOR rs_c;           /* specular reflectance color */
290 <        double  rs_a;           /* specular reflectance roughness */
291 <        double  ts;             /* specular transmittance */
290 >        float   rs_a;           /* specular reflectance roughness */
291 >        float   ts;             /* specular transmittance */
292          C_COLOR ts_c;           /* specular transmittance color */
293 <        double  ts_a;           /* specular transmittance roughness */
293 >        float   ts_a;           /* specular transmittance roughness */
294   } C_MATERIAL;           /* material context */
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_DEFCOLOR      {.333,.333}
303 < #define C_DEFMATERIAL   {0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
304 <                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
182 < #define C_DEFVERTEX     {{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 */
308   extern C_MATERIAL       *c_cmaterial;   /* the current material */
309 + extern char             *c_cmname;      /* current material name */
310   extern C_VERTEX         *c_cvertex;     /* the current vertex */
311 + extern char             *c_cvname;      /* current vertex name */
312  
313   #ifdef NOPROTO
314   extern int      c_hcolor();                     /* handle color entity */
315   extern int      c_hmaterial();                  /* handle material entity */
316   extern int      c_hvertex();                    /* handle vertex entity */
317   extern void     c_clearall();                   /* clear context tables */
318 + extern C_MATERIAL       *c_getmaterial();       /* get a named material */
319   extern C_VERTEX *c_getvert();                   /* get a named vertex */
320 + extern C_COLOR  *c_getcolor();                  /* get a named color */
321 + extern void     c_ccvt();                       /* fix color representation */
322 + extern int      c_isgrey();                     /* check if color is grey */
323   #else
324   extern int      c_hcolor(int, char **);         /* handle color entity */
325   extern int      c_hmaterial(int, char **);      /* handle material entity */
326   extern int      c_hvertex(int, char **);        /* handle vertex entity */
327   extern void     c_clearall(void);               /* clear context tables */
328 + extern C_MATERIAL       *c_getmaterial(char *); /* get a named material */
329   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
330 + extern C_COLOR  *c_getcolor(char *);            /* get a named color */
331 + extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
332 + extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
333   #endif
334  
335   /*************************************************************************
# Line 208 | Line 341 | extern char    **obj_name;             /* names in hierarchy */
341  
342   #ifdef NOPROTO
343   extern int      obj_handler();                  /* handle an object entity */
344 + extern void     obj_clear();                    /* clear object stack */
345   #else
346   extern int      obj_handler(int, char **);      /* handle an object entity */
347 + extern void     obj_clear(void);                /* clear object stack */
348   #endif
349  
350   /**************************************************************************
351   *      Definitions for hierarchical transformation handler
352   */
353  
354 < typedef double  MAT4[4][4];
354 > typedef FLOAT  MAT4[4][4];
355  
356   #ifdef  BSD
357   #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
358   #else
359   #define  copymat4(m4a,m4b)      (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
225 – extern char  *memcpy();
360   #endif
361  
362   #define  MAT4IDENT              { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
# Line 234 | Line 368 | extern MAT4  m4ident;
368  
369                                  /* regular transformation */
370   typedef struct {
371 <        MAT4  xfm;                              /* transform matrix */
372 <        double  sca;                            /* scalefactor */
371 >        MAT4    xfm;                            /* transform matrix */
372 >        FLOAT   sca;                            /* scalefactor */
373   }  XF;
374  
375   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
376  
377 + #define XF_MAXDIM       8               /* maximum array dimensions */
378 +
379 + struct xf_array {
380 +        MG_FPOS spos;                   /* starting position on input */
381 +        int     ndim;                   /* number of array dimensions */
382 +        struct {
383 +                short   i, n;           /* current count and maximum */
384 +                char    arg[8];         /* string argument value */
385 +        } aarg[XF_MAXDIM];
386 + };
387 +
388   typedef struct xf_spec {
389 <        short   xac;            /* transform argument count */
390 <        short   xav0;           /* zeroeth argument in xf_argv array */
391 <        XF      xf;             /* cumulative transformation */
392 <        struct xf_spec  *prev;  /* previous transformation context */
393 < } XF_SPEC;
389 >        long    xid;                    /* unique transform id */
390 >        short   xac;                    /* context argument count */
391 >        short   rev;                    /* boolean true if vertices reversed */
392 >        XF      xf;                     /* cumulative transformation */
393 >        struct xf_array *xarr;          /* transformation array pointer */
394 >        struct xf_spec  *prev;          /* previous transformation context */
395 > } XF_SPEC;                      /* followed by argument buffer */
396  
397 < extern int      xf_argc;                        /* total # transform args. */
398 < extern char     **xf_argv;                      /* transform arguments */
252 < extern XF_SPEC  *xf_context;                    /* current context */
397 > extern XF_SPEC  *xf_context;                    /* current transform context */
398 > extern char     **xf_argend;                    /* last transform argument */
399  
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_ac(xf_context)
404 + #define xf_argv         xf_av(xf_context)
405 +
406   /*
407   * The transformation handler should do most of the work that needs
408   * doing.  Just pass it any xf entities, then use the associated
# Line 270 | Line 422 | extern void    xf_xfmpoint();          /* transform point */
422   extern void     xf_xfmvect();           /* transform vector */
423   extern void     xf_rotvect();           /* rotate vector */
424   extern double   xf_scale();             /* scale a value */
425 + 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 280 | Line 437 | extern int     xf();                   /* interpret transform spec. */
437  
438   #else
439  
440 < extern int      xf_handler();           /* handle xf entity */
441 < extern void     xf_xfmpoint();          /* transform point */
442 < extern void     xf_xfmvect();           /* transform vector */
443 < extern void     xf_rotvect();           /* rotate vector */
444 < extern double   xf_scale();             /* scale a value */
440 > extern int      xf_handler(int, char **);       /* handle xf entity */
441 > extern void     xf_xfmpoint(FVECT, FVECT);      /* transform point */
442 > extern void     xf_xfmvect(FVECT, FVECT);       /* transform vector */
443 > extern void     xf_rotvect(FVECT, FVECT);       /* rotate vector */
444 > extern double   xf_scale(double);               /* scale a value */
445 > 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) */
456 < extern int      xf(XF, int, char **);           /* interpret transform spec. */
456 > extern int      xf(XF *, int, char **);         /* interpret transform spec. */
457  
458   #endif
459  
# Line 299 | Line 461 | extern int     xf(XF, int, char **);           /* interpret transfo
461   *      Miscellaneous definitions
462   */
463  
464 + #ifndef  PI
465   #ifdef  M_PI
466 < #define  PI             M_PI
466 > #define  PI             ((double)M_PI)
467   #else
468   #define  PI             3.14159265358979323846
469   #endif
470 + #endif
471  
472   #ifdef DCL_ATOF
473   extern double   atof();
# Line 316 | Line 480 | extern double  atof();
480   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