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.28 by greg, Wed Nov 29 19:55:42 1995 UTC vs.
Revision 1.33 by greg, Fri Feb 28 20:11:29 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1995 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3   * Header file for MGF interpreter
4   */
5  
6 < /* must include stdio.h before us */
6 > #ifndef MG_VMAJOR
7  
8 < #define MG_VMAJOR       1               /* major version number */
12 < #define MG_VMINOR       1               /* minor version number */
8 > /* must include stdio.h and stdlib.h before us */
9  
10 + #define MG_VMAJOR       2               /* major version number */
11 + #define MG_VMINOR       0               /* minor version number */
12 +
13                          /* Entities (list is only appended, never modified) */
14   #define MG_E_COMMENT    0               /* #            */
15   #define MG_E_COLOR      1               /* c            */
# Line 41 | Line 40
40   #define MG_E_VERTEX     26              /* v            */
41   #define MG_E_XF         27              /* xf           */
42                          /* end of Version 1 entities */
43 + #define MG_E_FACEH      28              /* fh           */
44 +                        /* end of Version 2 entities */
45  
46 < #define MG_NENTITIES    28              /* total # entities */
46 > #define MG_NENTITIES    29              /* total # entities */
47  
48 < #define MG_NELIST       {28}            /* entity count for version 1 and up */
48 > #define MG_NELIST       {28,29}         /* entity count for version 1 and up */
49  
50   #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
51                          "f","i","ies","ir","m","n","o","p","prism","rd",\
52 <                        "ring","rs","sides","sph","td","torus","ts","v","xf"}
52 >                        "ring","rs","sides","sph","td","torus","ts","v","xf",\
53 >                        "fh"}
54  
55   #define MG_MAXELEN      6
56  
# Line 162 | Line 164 | extern int     mg_nqcdivs;             /* divisions per quarter circl
164   #ifdef NOPROTO
165   extern int mg_entity();                 /* get entity number from its name */
166   extern int isint();                     /* non-zero if integer format */
167 + extern int isintd();                    /* same with delimiter set */
168   extern int isflt();                     /* non-zero if floating point format */
169 + extern int isfltd();                    /* same with delimiter set */
170   extern int isname();                    /* non-zero if legal identifier name */
171 + extern int badarg();                    /* check argument format */
172 + extern int e_include();                 /* expand include entity */
173 + extern int e_pipe();                    /* expand piped command */
174 + extern int e_sph();                     /* expand sphere as other entities */
175 + extern int e_torus();                   /* expand torus as other entities */
176 + extern int e_cyl();                     /* expand cylinder as other entities */
177 + extern int e_ring();                    /* expand ring as other entities */
178 + extern int e_cone();                    /* expand cone as other entities */
179 + extern int e_prism();                   /* expand prism as other entities */
180 + extern int e_faceh();                   /* expand face w/ holes as face */
181   #else
182   extern int mg_entity(char *);           /* get entity number from its name */
183   extern int isint(char *);               /* non-zero if integer format */
184 + extern int isintd(char *, char *);      /* same with delimiter set */
185   extern int isflt(char *);               /* non-zero if floating point format */
186 + extern int isfltd(char *, char *);      /* same with delimiter set */
187   extern int isname(char *);              /* non-zero if legal identifier name */
188 + extern int badarg(int, char **, char *);/* check argument format */
189 + extern int e_include(int, char **);     /* expand include entity */
190 + extern int e_pipe(int, char **);        /* expand piped command */
191 + extern int e_sph(int, char **);         /* expand sphere as other entities */
192 + extern int e_torus(int, char **);       /* expand torus as other entities */
193 + extern int e_cyl(int, char **);         /* expand cylinder as other entities */
194 + extern int e_ring(int, char **);        /* expand ring as other entities */
195 + extern int e_cone(int, char **);        /* expand cone as other entities */
196 + extern int e_prism(int, char **);       /* expand prism as other entities */
197 + extern int e_faceh(int, char **);       /* expand face w/ holes as face */
198   #endif
199  
200   /************************************************************************
# Line 200 | Line 226 | typedef FLOAT  FVECT[3];
226   extern double   normalize();            /* normalize a vector */
227   #else
228   extern double   normalize(FVECT);       /* normalize a vector */
229 + extern void     fcross(FVECT,FVECT,FVECT);/* cross product of two vectors */
230   #endif
231  
232   /************************************************************************
# Line 221 | Line 248 | extern double  normalize(FVECT);       /* normalize a vector
248   #define C_CSEFF         020             /* flag if efficacy set */
249  
250   typedef struct {
251 <        int     clock;                  /* incremented each change */
252 <        short   flags;                  /* what's been set */
253 <        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
254 <        long    ssum;                   /* straight sum of spectral values */
255 <        float   cx, cy;                 /* xy chromaticity value */
256 <        float   eff;                    /* efficacy (lumens/watt) */
251 >        int     clock;          /* incremented each change */
252 >        char    *client_data;   /* pointer to private client-owned data */
253 >        short   flags;          /* what's been set */
254 >        short   ssamp[C_CNSS];  /* spectral samples, min wl to max */
255 >        long    ssum;           /* straight sum of spectral values */
256 >        float   cx, cy;         /* xy chromaticity value */
257 >        float   eff;            /* efficacy (lumens/watt) */
258   } C_COLOR;
259  
260 < #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
260 > #define C_DEFCOLOR      { 1, NULL, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
261                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
262                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
263                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 245 | Line 273 | typedef struct {
273  
274   typedef struct {
275          int     clock;          /* incremented each change -- resettable */
276 +        char    *client_data;   /* pointer to private client-owned data */
277          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
278          float   nr, ni;         /* index of refraction, real and imaginary */
279          float   rd;             /* diffuse reflectance */
# Line 263 | Line 292 | typedef struct {
292  
293   typedef struct {
294          int     clock;          /* incremented each change -- resettable */
295 +        char    *client_data;   /* pointer to private client-owned data */
296          FVECT   p, n;           /* point and normal */
297   } C_VERTEX;             /* vertex context */
298  
299 < #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
300 <                                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
301 < #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
299 > #define C_DEFMATERIAL   {1,NULL,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,\
300 >                                C_DEFCOLOR,0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
301 > #define C_DEFVERTEX     {1,NULL,{0.,0.,0.},{0.,0.,0.}}
302  
303   extern C_COLOR          *c_ccolor;      /* the current color */
304   extern char             *c_ccname;      /* current color name */
# Line 428 | Line 458 | extern int     xf(XF *, int, char **);         /* interpret trans
458   *      Miscellaneous definitions
459   */
460  
461 + #ifndef  PI
462   #ifdef  M_PI
463 < #define  PI             M_PI
463 > #define  PI             ((double)M_PI)
464   #else
465   #define  PI             3.14159265358979323846
466   #endif
436 –
437 – #ifdef DCL_ATOF
438 – extern double   atof();
467   #endif
468  
469   #ifndef MEM_PTR
470   #define MEM_PTR         void *
471   #endif
472  
473 < extern MEM_PTR  malloc();
446 < extern MEM_PTR  calloc();
447 < extern MEM_PTR  realloc();
448 < extern void     free();
473 > #endif /*MG_VMAJOR*/

Diff Legend

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